Unify Android minimum API level to 24 for all runtimes

Configuration.props

@@ -22,11 +22,9 @@
     <_StandardLibraryPath Condition=" '$(TargetFrameworkVersion)' == '' ">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToStandardLibraries('.NETFramework', 'v4.7.2', ''))</_StandardLibraryPath>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' And '$(_StandardLibraryPath)' != '' ">v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' ">v4.7.1</TargetFrameworkVersion>
-    <!-- The min API level supported by Microsoft.Android.Sdk. This applies to Mono-based runtimes,
-         both 32-bit and 64-bit. -->
-    <AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
-    <!-- The min API level supported by non-Mono runtimes (CoreCLR/NativeAOT) -->
-    <AndroidMinimumNonMonoApiLevel Condition="'$(AndroidMinimumNonMonoApiLevel)' == ''">24</AndroidMinimumNonMonoApiLevel>
+    <!-- The min API level supported by Microsoft.Android.Sdk, for all runtimes (MonoVM, CoreCLR, NativeAOT).
+         Must match $(AndroidApiLevelMin) in dotnet/runtime's Directory.Build.props. -->
+    <AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">24</AndroidMinimumDotNetApiLevel>
     <!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
     <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">37</AndroidLatestStableApiLevel>
     <AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">37.0</AndroidLatestStablePlatformId>

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs

@@ -39,18 +39,11 @@ public class GenerateSupportedPlatforms : Task
 		/// </summary>
 		public string? TargetApiLevel { get; set; }
 
-		/// <summary>
-		/// Minimum API level supported by non-Mono runtimes (CoreCLR/NativeAOT).
-		/// API levels below this will be conditional on $(UseMonoRuntime) == 'true'.
-		/// </summary>
-		public string? MinimumNonMonoApiLevel { get; set; }
-
 		public override bool Execute ()
 		{
 
 			var minVersion        = ToVersion (MinimumApiLevel);
 			var targetVersion     = ToVersion (TargetApiLevel);
-			var minNonMonoVersion = ToVersion (MinimumNonMonoApiLevel);
 			var versions          = new AndroidVersions (AndroidApiInfo.Select (ToAndroidVersion));
 			var targetApiLevel    = targetVersion != null && targetVersion.Major > 0
 				? targetVersion
@@ -98,9 +91,6 @@ public override bool Execute ()
 					if (versionCode < targetVersion) {
 						writer.WriteAttributeString ("DefineConstantsOnly", "true");
 					}
-					if (minNonMonoVersion != null && versionCode < minNonMonoVersion) {
-						writer.WriteAttributeString ("Condition", " '$(UseMonoRuntime)' == 'true' ");
-					}
 					writer.WriteEndElement (); // </AndroidSdkSupportedTargetPlatformVersion>
 				}
 				writer.WriteStartElement ("SdkSupportedTargetPlatformVersion");

build-tools/automation/azure-pipelines.yaml

@@ -207,6 +207,7 @@ extends:
             project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
             arguments: >-
               -f $(DotNetTargetFramework)-android -c Debug
+              -p:SupportedOSPlatformVersion=24
               --configfile $(Build.SourcesDirectory)/maui/NuGet.config
               -bl:$(Build.StagingDirectory)/logs/MauiTestProj-Debug.binlog
             xaSourcePath: $(Build.SourcesDirectory)/android
@@ -217,6 +218,7 @@ extends:
             project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj
             arguments: >-
               -f $(DotNetTargetFramework)-android -c Release
+              -p:SupportedOSPlatformVersion=24
               --configfile $(Build.SourcesDirectory)/maui/NuGet.config
               -bl:$(Build.StagingDirectory)/logs/MauiTestProj-Release.binlog
             xaSourcePath: $(Build.SourcesDirectory)/android

build-tools/scripts/Ndk.projitems.in

@@ -11,8 +11,6 @@
     <AndroidNdkApiLevel_X86 Condition=" '$(AndroidNdkApiLevel_X86)' == '' ">@NDK_X86_API_NET@</AndroidNdkApiLevel_X86>
     <AndroidNdkApiLevel_X86_64 Condition=" '$(AndroidNdkApiLevel_X86_64)' == '' ">@NDK_X86_64_API@</AndroidNdkApiLevel_X86_64>
     <AndroidNdkApiLevel_X64 Condition=" '$(AndroidNdkApiLevel_X64)' == '' ">@NDK_X86_64_API_NET@</AndroidNdkApiLevel_X64>
-    <AndroidNdkApiLevelNonMono_Arm64 Condition=" '$(AndroidNdkApiLevelNonMono_Arm64)' == '' ">@NDK_ARM64_V8A_API_NON_MONO@</AndroidNdkApiLevelNonMono_Arm64>
-    <AndroidNdkApiLevelNonMono_X64 Condition=" '$(AndroidNdkApiLevelNonMono_X64)' == '' ">@NDK_X86_64_API_NON_MONO@</AndroidNdkApiLevelNonMono_X64>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +30,6 @@
         Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:')) ">
       <ApiLevel>$(AndroidNdkApiLevel_ArmV8a)</ApiLevel>
       <ApiLevelNET>$(AndroidNdkApiLevel_Arm64)</ApiLevelNET>
-      <ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_Arm64)</ApiLevelNonMono>
       <AndroidRID>android-arm64</AndroidRID>
       <SupportMonoVM>True</SupportMonoVM>
       <SupportCoreCLR>True</SupportCoreCLR>
@@ -55,7 +52,6 @@
         Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':x86_64:')) ">
       <ApiLevel>$(AndroidNdkApiLevel_X86_64)</ApiLevel>
       <ApiLevelNET>$(AndroidNdkApiLevel_X64)</ApiLevelNET>
-      <ApiLevelNonMono>$(AndroidNdkApiLevelNonMono_X64)</ApiLevelNonMono>
       <AndroidRID>android-x64</AndroidRID>
       <SupportMonoVM>True</SupportMonoVM>
       <SupportCoreCLR>True</SupportCoreCLR>

build-tools/scripts/XABuildConfig.cs.in

@@ -15,7 +15,6 @@ namespace Xamarin.Android.Tools
 		public const string XamarinAndroidBranch = "@XAMARIN_ANDROID_BRANCH@";
 		public const string AndroidSdkBuildToolsVersion = "@SDK_BUILD_TOOLS_VERSION@";
 		public static readonly Version AndroidMinimumDotNetApiLevel = new Version (@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL@, @ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL_MINOR@);
-		public static readonly Version AndroidMinimumNonMonoApiLevel = new Version (@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL@, @ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL_MINOR@);
 		public static readonly Version AndroidLatestStableApiLevel = new Version (@ANDROID_LATEST_STABLE_API_LEVEL@, @ANDROID_LATEST_STABLE_API_LEVEL_MINOR@);
 		public static readonly Version AndroidLatestUnstableApiLevel = new Version (@ANDROID_LATEST_UNSTABLE_API_LEVEL@, @ANDROID_LATEST_UNSTABLE_API_LEVEL_MINOR@);
 		public static readonly Version AndroidDefaultTargetDotnetApiLevel = new Version (@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL@, @ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL_MINOR@);
@@ -37,10 +36,5 @@ namespace Xamarin.Android.Tools
 			{ AndroidTargetArch.X86,    @NDK_X86_API@ },
 			{ AndroidTargetArch.X86_64, @NDK_X86_64_API@ },
 		};
-
-		public static readonly Dictionary <AndroidTargetArch, int> ArchToApiLevelNonMono = new () {
-			{ AndroidTargetArch.Arm64, @NDK_ARM64_V8A_NONMONO_API@ },
-			{ AndroidTargetArch.X86_64, @NDK_X86_64_NONMONO_API@ },
-		};
 	}
 }

build-tools/xaprepare/xaprepare/Application/KnownProperties.cs

@@ -6,7 +6,6 @@ static class KnownProperties
 		public const string AndroidCmakeVersion                 = "AndroidCmakeVersion";
 		public const string AndroidCmakeVersionPath             = "AndroidCmakeVersionPath";
 		public const string AndroidMinimumDotNetApiLevel        = "AndroidMinimumDotNetApiLevel";
-		public const string AndroidMinimumNonMonoApiLevel       = "AndroidMinimumNonMonoApiLevel";
 		public const string AndroidDefaultTargetDotnetApiLevel  = "AndroidDefaultTargetDotnetApiLevel";
 		public const string AndroidLatestStableApiLevel         = "AndroidLatestStableApiLevel";
 		public const string AndroidLatestUnstableApiLevel       = "AndroidLatestUnstableApiLevel";

build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in

@@ -10,7 +10,6 @@ namespace Xamarin.Android.Prepare
 			properties.Add (KnownProperties.AndroidCmakeVersion,                 StripQuotes ("@AndroidCmakeVersion@"));
 			properties.Add (KnownProperties.AndroidCmakeVersionPath,             StripQuotes (@"@AndroidCmakeVersionPath@"));
 			properties.Add (KnownProperties.AndroidMinimumDotNetApiLevel,        StripQuotes ("@AndroidMinimumDotNetApiLevel@"));
-			properties.Add (KnownProperties.AndroidMinimumNonMonoApiLevel,       StripQuotes ("@AndroidMinimumNonMonoApiLevel@"));
 			properties.Add (KnownProperties.AndroidDefaultTargetDotnetApiLevel,  StripQuotes ("@AndroidDefaultTargetDotnetApiLevel@"));
 			properties.Add (KnownProperties.AndroidLatestStableApiLevel,         StripQuotes ("@AndroidLatestStableApiLevel@"));
 			properties.Add (KnownProperties.AndroidLatestUnstableApiLevel,       StripQuotes ("@AndroidLatestUnstableApiLevel@"));

build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs

@@ -10,7 +10,6 @@ class BuildAndroidPlatforms
 
 		public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
 		public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;
-		public static string NdkMinimumNonMonoAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel);
 
 		public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
 			new AndroidPlatform (apiName: "",                       apiLevel: 1,  platformID: "1"),

build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs

@@ -124,8 +124,6 @@ GeneratedFile GetCmakePresetsCommon (Context context, string sourcesDir)
 				{ "@NDK_ARM64_V8A_API_NET@",     BuildAndroidPlatforms.NdkMinimumAPI },
 				{ "@NDK_X86_API_NET@",           BuildAndroidPlatforms.NdkMinimumAPILegacy32 },
 				{ "@NDK_X86_64_API_NET@",        BuildAndroidPlatforms.NdkMinimumAPI },
-				{ "@NDK_ARM64_V8A_NONMONO_API_NET@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
-				{ "@NDK_X86_64_NONMONO_API_NET@",    BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
 				{ "@XA_BUILD_CONFIGURATION@",    context.Configuration },
 				{ "@XA_TEST_OUTPUT_DIR@", Utilities.EscapePathSeparators (props.GetRequiredValue (KnownProperties.TestOutputDirectory)) },
 			};
@@ -197,14 +195,10 @@ GeneratedFile Get_XABuildConfig_cs (Context context)
 				{ "@NDK_ARM64_V8A_API@",         BuildAndroidPlatforms.NdkMinimumAPI.ToString () },
 				{ "@NDK_X86_API@",               BuildAndroidPlatforms.NdkMinimumAPILegacy32.ToString ().ToString () },
 				{ "@NDK_X86_64_API@",            BuildAndroidPlatforms.NdkMinimumAPI.ToString ().ToString () },
-				{ "@NDK_ARM64_V8A_NONMONO_API@", BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
-				{ "@NDK_X86_64_NONMONO_API@",    BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
 				{ "@XA_SUPPORTED_ABIS@",         context.Properties.GetRequiredValue (KnownProperties.AndroidSupportedTargetJitAbis).Replace (':', ';') },
 				{ "@SDK_BUILD_TOOLS_VERSION@",   context.Properties.GetRequiredValue (KnownProperties.XABuildToolsFolder) },
 				{ "@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel)) },
 				{ "@ANDROID_DEFAULT_MINIMUM_DOTNET_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel)) },
-				{ "@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel)) },
-				{ "@ANDROID_DEFAULT_MINIMUM_NONMONO_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidMinimumNonMonoApiLevel)) },
 				{ "@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidDefaultTargetDotnetApiLevel)) },
 				{ "@ANDROID_DEFAULT_TARGET_DOTNET_API_LEVEL_MINOR@", GetMinor (context.Properties.GetRequiredValue (KnownProperties.AndroidDefaultTargetDotnetApiLevel)) },
 				{ "@ANDROID_LATEST_STABLE_API_LEVEL@", GetMajor (context.Properties.GetRequiredValue (KnownProperties.AndroidLatestStableApiLevel)) },
@@ -256,8 +250,6 @@ GeneratedFile Get_Ndk_projitems (Context context)
 				{ "@NDK_X86_API_NET@",           BuildAndroidPlatforms.NdkMinimumAPI.ToString ()  },
 				{ "@NDK_X86_64_API@",            BuildAndroidPlatforms.NdkMinimumAPI.ToString ()  },
 				{ "@NDK_X86_64_API_NET@",        BuildAndroidPlatforms.NdkMinimumAPI.ToString ()  },
-				{ "@NDK_ARM64_V8A_API_NON_MONO@",     BuildAndroidPlatforms.NdkMinimumNonMonoAPI },
-				{ "@NDK_X86_64_API_NON_MONO@",        BuildAndroidPlatforms.NdkMinimumNonMonoAPI  },
 			};
 
 			return new GeneratedPlaceholdersFile (

build-tools/xaprepare/xaprepare/xaprepare.targets

@@ -46,7 +46,6 @@
       <Replacement Include="@AndroidCmakeVersion@=$(AndroidCmakeVersion)" />
       <Replacement Include="@AndroidCmakeVersionPath@=$(AndroidCmakeVersionPath)" />
       <Replacement Include="@AndroidMinimumDotNetApiLevel@=$(AndroidMinimumDotNetApiLevel)" />
-      <Replacement Include="@AndroidMinimumNonMonoApiLevel@=$(AndroidMinimumNonMonoApiLevel)" />
       <Replacement Include="@AndroidDefaultTargetDotnetApiLevel@=$(AndroidDefaultTargetDotnetApiLevel)" />
       <Replacement Include="@AndroidLatestStableApiLevel@=$(AndroidLatestStableApiLevel)" />
       <Replacement Include="@AndroidLatestUnstableApiLevel@=$(AndroidLatestUnstableApiLevel)" />

samples/NativeAOT/NativeAOT.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(DotNetAndroidTargetFramework)</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

@@ -33,7 +33,7 @@
 
     <!-- Use $(AndroidMinimumSupportedApiLevel) for $(SupportedOSPlatformVersion) if unset -->
     <SupportedOSPlatformVersion Condition=" '$(SupportedOSPlatformVersion)' == '' ">$(AndroidMinimumSupportedApiLevel)</SupportedOSPlatformVersion>
-    <!-- $(SupportedOSPlatformVersion) must be '21.0', but we should support integer values like '21' -->
+    <!-- $(SupportedOSPlatformVersion) must be '24.0', but we should support integer values like '24' -->
     <SupportedOSPlatformVersion Condition=" '$(SupportedOSPlatformVersion)' != '' and !$(SupportedOSPlatformVersion.Contains('.')) ">$(SupportedOSPlatformVersion).0</SupportedOSPlatformVersion>
 
     <!-- Bindings properties -->

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs

@@ -237,7 +237,7 @@ public void BuildIncremental ([Values] AndroidRuntime runtime)
 			FileAssert.Exists (outputAar);
 			var outputAarFirstWriteTime = File.GetLastWriteTime (outputAar);
 			var packagedManifestContent = System.Text.Encoding.UTF8.GetString (ZipHelper.ReadFileFromZip (outputAar, "AndroidManifest.xml"));
-			StringAssert.Contains (@"uses-sdk android:minSdkVersion=""21""", packagedManifestContent);
+			StringAssert.Contains (@"uses-sdk android:minSdkVersion=""24""", packagedManifestContent);
 
 			// Build again, _BuildAndroidGradleProjects should be skipped
 			builder.BuildLogFile = "build2.log";

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -165,7 +165,7 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
 			var manifest = XDocument.Load (manifestPath);
 			XNamespace ns = "http://schemas.android.com/apk/res/android";
 			var uses_sdk = manifest.Root.Element ("uses-sdk");
-			Assert.AreEqual ("21", uses_sdk.Attribute (ns + "minSdkVersion").Value);
+			Assert.AreEqual ("24", uses_sdk.Attribute (ns + "minSdkVersion").Value);
 			Assert.AreEqual (XABuildConfig.AndroidDefaultTargetDotnetApiLevel.Major.ToString (),
 				uses_sdk.Attribute (ns + "targetSdkVersion").Value);
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs

@@ -536,7 +536,7 @@ public void DirectBootAwareAttribute ([Values] AndroidRuntime runtime)
 				/* pattern */ "{abi}{minSDK:00}{versionCode:000}",
 				/* props */ null,
 				/* shouldBuild */ true,
-				/* expected */ "221012;321012",
+				/* expected */ "224012;324012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -546,7 +546,7 @@ public void DirectBootAwareAttribute ([Values] AndroidRuntime runtime)
 				/* pattern */ "{abi}{minSDK:00}{screen}{versionCode:000}",
 				/* props */ "screen=24",
 				/* shouldBuild */ true,
-				/* expected */ "22124012;32124012",
+				/* expected */ "22424012;32424012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -556,7 +556,7 @@ public void DirectBootAwareAttribute ([Values] AndroidRuntime runtime)
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:0}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ true,
-				/* expected */ "221241012;321241012",
+				/* expected */ "224241012;324241012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -566,7 +566,7 @@ public void DirectBootAwareAttribute ([Values] AndroidRuntime runtime)
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:00}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ false,
-				/* expected */ "2212401012;3212401012",
+				/* expected */ "2242401012;3242401012",
 			},
 		};
 
@@ -577,8 +577,8 @@ public void VersionCodeTests (bool seperateApk, string abis, string versionCode,
 		{
 			var proj = new XamarinAndroidApplicationProject () {
 				IsRelease = true,
-				MinSdkVersion = "21",
-				SupportedOSPlatformVersion = "21.0",
+				MinSdkVersion = "24",
+				SupportedOSPlatformVersion = "24.0",
 			};
 
 			// MonoVM-only test, for now (changing anything in the test data changes the codes, each case must be
@@ -1238,7 +1238,7 @@ public void ExportedErrorMessage ([Values] AndroidRuntime runtime)
 				/* removeUsesSdk */		false,
 			},
 			new object[] {
-				/* minSdkVersion */		"21.0",
+				/* minSdkVersion */		"24.0",
 				/* removeUsesSdk */		true,
 			},
 			new object[] {
@@ -1269,7 +1269,7 @@ static IEnumerable<object[]> Get_SupportedOSTestSources_Data ()
 				);
 
 				AddTestData (
-					minSdkVersion: "21.0",
+					minSdkVersion: "24.0",
 					removeUsesSdkElement: true,
 					runtime: runtime
 				);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

@@ -1010,7 +1010,7 @@ public void ExtractNativeLibsTrue ([Values] AndroidRuntime runtime)
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 				// This combination produces android:extractNativeLibs="false" by default
-				SupportedOSPlatformVersion = "23",
+				SupportedOSPlatformVersion = "24",
 				ManifestMerger = "manifestmerger.jar",
 			};
 			proj.SetRuntime (runtime);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GenerateTrimmableTypeMapTests.cs

@@ -159,7 +159,7 @@ public void Execute_ManifestPlaceholdersAreResolvedForRooting ()
 			task.ApplicationRegistrationOutputFile = applicationRegistration;
 			task.PackageName = "android.app";
 			task.AndroidApiLevel = "35";
-			task.SupportedOSPlatformVersion = "21";
+			task.SupportedOSPlatformVersion = "24";
 			task.RuntimeProviderJavaName = "mono.MonoRuntimeProvider";
 			task.ManifestPlaceholders = "applicationId=android.app";
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/WearTests.cs

@@ -72,7 +72,7 @@ public void WearProjectJavaBuildFailure ([Values] AndroidRuntime runtime)
 					new Package { Id = "Xamarin.AndroidX.PercentLayout", Version = "1.0.0.14" },
 					new Package { Id = "Xamarin.AndroidX.Legacy.Support.Core.UI", Version = "1.0.0.14" },
 				},
-				SupportedOSPlatformVersion = "23",
+				SupportedOSPlatformVersion = "24",
 			};
 			proj.SetRuntime (runtime);
 			var builder = CreateApkBuilder ();

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidApplicationProject.cs

@@ -79,7 +79,7 @@ public XamarinAndroidApplicationProject (string debugConfigurationName = "Debug"
 			SetProperty (KnownProperties.ImplicitUsings, "enable");
 			SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True");
 			SetProperty ("_FastDeploymentDiagnosticLogging", "True");
-			SupportedOSPlatformVersion = "21.0";
+			SupportedOSPlatformVersion = "24.0";
 
 			AndroidManifest = default_android_manifest;
 			LayoutMain = default_layout_main;
@@ -112,7 +112,7 @@ public virtual string DefaultMainActivity {
 		public string MinSdkVersion { get; set; }
 
 		/// <summary>
-		/// Defaults to 21.0
+		/// Defaults to 24.0
 		/// </summary>
 		public string SupportedOSPlatformVersion {
 			get { return GetProperty (KnownProperties.SupportedOSPlatformVersion); }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidWearApplicationProject.cs

@@ -34,7 +34,7 @@ public XamarinAndroidWearApplicationProject (string debugConfigurationName = "De
 			PackageReferences.Add (KnownPackages.XamarinAndroidXWear);
 
 			// uses-sdk:minSdkVersion 21 cannot be smaller than version 23 declared in library androidx.wear.wear.aar as the library might be using APIs not available in 21
-			SupportedOSPlatformVersion = "23";
+			SupportedOSPlatformVersion = "24";
 
 			MainActivity = default_main_activity;
 			StringsXml = default_strings_xml;