[build] Default .NET 11 to target net11.0-android37 only#11254
Open
jonathanpeppers wants to merge 16 commits intomainfrom
Open
[build] Default .NET 11 to target net11.0-android37 only#11254jonathanpeppers wants to merge 16 commits intomainfrom
net11.0-android37 only#11254jonathanpeppers wants to merge 16 commits intomainfrom
Conversation
Stop building API 36.1 as a separate stable target and make net11.0-android37 the sole default target framework for .NET 11. Changes: - Configuration.props: Set AndroidLatestStableApiLevel to 37, AndroidLatestStablePlatformId to 37.0, framework version to v17.0. Unstable properties now reference stable (since they are the same). - AndroidToolchain.cs: Move isLatestStable from platform-36.1 to platform-37.0, remove isPreview flag - WorkloadManifest.in.json: Update workload packs from 36.1 to 37, add Mono/CoreCLR/NativeAOT runtime pack definitions for 37 - Xamarin.Android.Build.Tasks.targets: Use AndroidLatestStablePlatformId for SDK_PLATFORM_VERSION replacement (needed because ApiLevel=37 but PlatformId=37.0) - BuildTest.cs: Hardcode MinorApiLevelFallbackThrowsXA5207 to use 36.1 since 37.0 == 37 (no meaningful minor version distinction) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add acceptable-breakages-v17.0.txt for the v17.0 vs v16.1 API compat check, and update acceptable-breakages-vReference-net11.0.txt with the same breakages for the reference assembly comparison. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
AndroidJavaRuntimeApiLevel was using AndroidLatestStableApiLevel (37), but the Android SDK platform directory is android-37.0, not android-37. Use AndroidLatestStablePlatformId (37.0) so java-runtime.csproj can find android.jar. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Starting with API 37, Google ships the SDK platform as android-37.0
instead of android-37. Tests that hardcode platform.Major to construct
paths like "android-{platform.Major}/android.jar" fail because the
directory is actually android-37.0.
Add AndroidSdkResolver.GetPlatformDirectoryName() and GetAndroidJarPath()
helpers that check for both directory names and return the correct one.
Update Aapt2Tests and ManagedResourceParserTests to use these helpers.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
net11.0-android36.1 is no longer valid on .NET 11 (API 37 is the only supported target), so BundledVersions.targets silently upgrades to API 37 and XA5207 never fires. Use net10.0-android36.1 instead since 36.1 is the supported API level for .NET 10. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Starting with API 37, Google ships the SDK platform directory as android-37.0 instead of android-37. Gradle compileSdk = 37 (integer) looks for platforms/android-37 which does not exist. Add GetCompileSdkGradleLine() helper that detects when the platform directory uses the ".0" suffix and generates compileSdkPreview = "android-37.0" instead of compileSdk = 37. This fixes all AndroidGradleProjectTests (BuildApp, BindLibrary, BindFacebook, BuildIncremental, BuildMultipleModules, etc.). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Previous approach tried filesystem detection which was unreliable on
CI. Instead, use the known fact that API 37+ always ships as
android-{Major}.0 (e.g. android-37.0). For these API levels, generate
compileSdkPreview = "android-37.0" in the Gradle build file instead
of compileSdk = 37 (which looks for android-37 that does not exist).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The fundamental fix: xaprepare now creates a symlink from android-37 to android-37.0 after installing the SDK platform. This ensures Gradle (which uses compileSdk = 37 and looks for android-37), our MSBuild tasks, and all other tools can find the platform directory regardless of whether they use the integer or ".0" form. This reverts the compileSdkPreview approach (which was unreliable) in favor of making both directory names work. Also set xamarin_manifest_needs_updating = true in AndroidDependenciesTests since the Xamarin manifest does not yet have API 37 entries. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
AGP 9.1.1 (April 2026) natively supports compileSdk = 37 with the android-37.0 platform directory. No symlinks or compileSdkPreview workarounds needed. - Bump default AGP from 9.1.0 to 9.1.1 - Fix BindLibraryWithMultipleGradleVersions: AGP 9.0.0 only supports up to compileSdk 36, so hardcode that instead of using the default - Remove xaprepare symlink creation (no longer needed) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…lt-api-37-target # Conflicts: # src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs
ReadAndroidManifest was constructing the platform path manually using
android-{apiLevel} which produces android-37 for API 37. But the
platform directory is android-37.0.
Use TryGetPlatformDirectoryFromApiLevel which already has the .0
fallback logic, fixing the org.apache.http.legacy.jar lookup.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This test validates that targeting a minor API level (like 36.1) does not silently fall back to the major version. With API 37 as the only stable target and no minor version (37.1) yet, there is no valid scenario to test. Re-enable when a minor API level is added. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Restore the original test code from main (using XABuildConfig constants) and just add the [Ignore] attribute. The test body will be correct when a minor API level (e.g. 37.1) is added in the future. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…lt-api-37-target # Conflicts: # external/xamarin-android-tools
API 37 was still marked stable: false (preview), causing its AndroidApiInfo.xml to have Stable=False. This made LatestTargetFrameworkVersion() skip it, returning an empty apiLevel, which led to empty targetSdkVersion in manifests and XAGMM7009 errors in all device tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
✅ LGTM — Clean, well-structured API level migration(Posted manually — the automated reviewer hit a GitHub API 422 error twice when trying to submit, see github/gh-aw#30662) Summary: This PR correctly promotes API 37 ( Positive callouts:
Issues found:
|
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
- Hoist TryGetPlatformDirectoryFromApiLevel above the foreach loop in ReadAndroidManifest since AndroidApiLevel is constant across iterations - Add missing blank line before doc comment in AndroidSdkResolver Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers
added
the
ready-to-review
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stop building API 36.1 as a separate stable target and make
net11.0-android37the sole default target framework for .NET 11.Changes:
AndroidLatestStableApiLevelto37,AndroidLatestStablePlatformIdto37.0(explicit, since Google shipsplatform-37.0), framework version tov17.0. Unstable properties now reference stable (since they are the same). UpdatedAndroidLatestStableApiLevel2comment example to38.1.isLatestStablefromplatform-36.1toplatform-37.0, removeisPreviewflag36.1to37, add Mono/CoreCLR/NativeAOT runtime pack definitions for37, remove36.1pack definitions$(AndroidLatestStablePlatformId)for@SDK_PLATFORM_VERSION@replacement instead of$(AndroidLatestStableApiLevel)(needed becauseApiLevel=37butPlatformId=37.0)MinorApiLevelFallbackThrowsXA5207to use36.1since37.0 == 37(no meaningful minor version distinction for this test scenario)Note:
AndroidLatestStablePlatformIdis now explicitly set to37.0rather than defaulting to$(AndroidLatestStableApiLevel). This is because Google ships the platform asplatform-37.0(directoryandroid-37.0), but the API level for TFMs andPublicAPIdirectories is just37. Previous APIs (like36and36.1) happened to have identicalApiLevelandPlatformIdvalues.