[Mono.Android] API-30 stabilization (#4830)

jpobst · web-flow · commit 2181e786147d · 2020-06-19T15:00:40.000-04:00
Context: https://developer.android.com/android11 Changes: https://github.com/xamarin/monodroid/compare/6d05c4929db1ba12ba3a04174938256e435dbbd4...fb5542fa193d5daef1c907f172e0775f9ea4b0d2 * xamarin/monodroid@fb5542fa1 [Make.config] Update API-R to API-30 (#1102) API-30 has been enumified (8f9c638). Time to declare it stable! Set API-R as API-30, v11.0, and stable. Update unit test files so `$(TargetFrameworkVersion)`= v11.0 (API-30). Rename `src/Mono.Android/Profiles/api-R.params.txt` to `api-30.params.txt`, to match the stable API-level ID. Updated `tests/api-compatibility/acceptable-breakages-vReference.txt` because the default API compare will now be against `API-30`, not `API-29`, and we deliberately removed the `XxxConst` classes which were `[Obsolete]`d 5+ years ago in API-30, resulting in an intentional API break. TODO: * `jnimarshalmethod-gen.exe` tests were disabled as they ran into a [runtime crash][0]. Once the runtime crash is fixed, we need to update `src/Mono.Android/Test/Mono.Android-Tests.csproj` so that `$(AndroidGenerateJniMarshalMethods)` is True when `'$(HostOS)' == 'Darwin'`. [0]: dotnet/runtime#34389
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:master@6d05c4929db1ba12ba3a04174938256e435dbbd4
+xamarin/monodroid:master@fb5542fa193d5daef1c907f172e0775f9ea4b0d2
 mono/mono:2020-02@87ef5557017a8d822ae31587846a54fcd66daf1b
diff --git a/Configuration.Override.props.in b/Configuration.Override.props.in
@@ -6,11 +6,11 @@
       kept consistent with each other, lest Bad Things Happen™
       -->
     <!-- The default Android API level to bind in src/Mono.Android -->
-    <AndroidApiLevel>29</AndroidApiLevel>
+    <AndroidApiLevel>30</AndroidApiLevel>
     <!-- The Xamarin.Android $(TargetFrameworkVersion) value that corresponds to $(AndroidApiLevel) -->
-    <AndroidFrameworkVersion>v10.0</AndroidFrameworkVersion>
+    <AndroidFrameworkVersion>v11.0</AndroidFrameworkVersion>
     <!-- The default Android API "id" that corresponds to $(AndroidApiLevel) -->
-    <AndroidPlatformId>29</AndroidPlatformId>
+    <AndroidPlatformId>30</AndroidPlatformId>
 
     <!--
       Colon-separated list of ABIs to build the mono JIT for.
diff --git a/Configuration.props b/Configuration.props
@@ -23,9 +23,9 @@
     <AndroidFirstPlatformId Condition="'$(AndroidFirstPlatformId)' == ''">$(AndroidFirstApiLevel)</AndroidFirstPlatformId>
     <_IsRunningNuGetRestore Condition="$(RestoreTaskAssemblyFile.EndsWith('NuGet.exe', StringComparison.InvariantCultureIgnoreCase))">True</_IsRunningNuGetRestore>
     <!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
-    <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">29</AndroidLatestStableApiLevel>
+    <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">30</AndroidLatestStableApiLevel>
     <AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
-    <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v10.0</AndroidLatestStableFrameworkVersion>
+    <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v11.0</AndroidLatestStableFrameworkVersion>
     <!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
     <AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidApiLevel>
     <AndroidPlatformId Condition=" '$(AndroidPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidPlatformId>
diff --git a/Documentation/building/windows/instructions.md b/Documentation/building/windows/instructions.md
@@ -42,7 +42,7 @@ After the solution has built successfully, you can [use your
 build][using-your-build] to build Xamarin.Android application and library
 projects.  Note that by default `Xamarin.Android.sln` only builds support for
 the `$(TargetFrameworkVersion)` specified in the `$(AndroidFrameworkVersion)`
-property of the [`Configuration.props`][configprops-master] file (`v10.0` when
+property of the [`Configuration.props`][configprops-master] file (`v11.0` when
 this guide was last updated), so you will need to ensure that your application
 and library projects are configured to use that particular target framework
 version.
diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs
@@ -27,7 +27,7 @@ public sealed class CheckApiCompatibility : Task
 			{ "v8.1", "v8.0" },
 			{ "v9.0", "v8.1" },
 			{ "v10.0", "v9.0" },
-			{ "v10.0.99", "v10.0" },
+			{ "v11.0", "v10.0" },
 		};
 
 		static readonly string assemblyToValidate = "Mono.Android.dll";
diff --git a/build-tools/api-merge/merge-configuration.xml b/build-tools/api-merge/merge-configuration.xml
@@ -18,7 +18,7 @@
     <File Path="api-27.xml.in" Level="27" />
     <File Path="api-28.xml.in" Level="28" />
     <File Path="api-29.xml.in" Level="29" />
-    <File Path="api-R.xml.in" Level="R" />
+    <File Path="api-30.xml.in" Level="30" />
   </Inputs>
   <Outputs>
     <File Path="android-19\mcw\api.xml" LastLevel="19" />
@@ -32,6 +32,6 @@
     <File Path="android-27\mcw\api.xml" LastLevel="27" />
     <File Path="android-28\mcw\api.xml" LastLevel="28" />
     <File Path="android-29\mcw\api.xml" LastLevel="29" />
-    <File Path="android-R\mcw\api.xml" LastLevel="R" />
+    <File Path="android-30\mcw\api.xml" LastLevel="30" />
   </Outputs>
 </Configuration>
diff --git a/build-tools/api-xml-adjuster/Makefile b/build-tools/api-xml-adjuster/Makefile
@@ -17,7 +17,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
 RUNTIME = mono --debug
 RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
 RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
-API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 R
+API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
 
 XML_OUTPUT_DIR = .
 
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -38,7 +38,7 @@ class BuildAndroidPlatforms
 			new AndroidPlatform (apiName: "Oreo",                   apiLevel: 27, platformID: "27",  include: "v8.1",    framework: "v8.1"),
 			new AndroidPlatform (apiName: "Pie",                    apiLevel: 28, platformID: "28",  include: "v9.0",    framework: "v9.0"),
 			new AndroidPlatform (apiName: "Q",                      apiLevel: 29, platformID: "29",  include: "v10.0",   framework: "v10.0"),
-			new AndroidPlatform (apiName: "R",                      apiLevel: 30, platformID: "R",   include: "v10.0.99",  framework: "v10.0.99",  stable: false),
+			new AndroidPlatform (apiName: "R",                      apiLevel: 30, platformID: "30",  include: "v11.0",   framework: "v11.0"),
 		};
 
 		public static readonly Dictionary<string, uint> NdkMinimumAPI = new Dictionary<string, uint> {
diff --git a/src/Mono.Android/Profiles/api-30.params.txt b/src/Mono.Android/Profiles/api-30.params.txt
diff --git a/src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.csproj b/src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.csproj
@@ -15,7 +15,7 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\..\product.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Mono.Android/Test/Mono.Android-Test.Library/Mono.Android-Test.Library.csproj b/src/Mono.Android/Test/Mono.Android-Test.Library/Mono.Android-Test.Library.csproj
@@ -15,7 +15,7 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="..\..\..\..\Configuration.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Mono.Android/Test/Mono.Android-Tests.csproj b/src/Mono.Android/Test/Mono.Android-Tests.csproj
@@ -20,7 +20,7 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
     <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
   </PropertyGroup>
@@ -45,7 +45,6 @@
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-    <AndroidGenerateJniMarshalMethods Condition=" '$(HostOS)' == 'Darwin' ">True</AndroidGenerateJniMarshalMethods>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/Versions.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/Versions.cs
@@ -4,6 +4,7 @@ namespace Xamarin.ProjectTools
 {
 	public static class Versions
 	{
+		public const string Android11 = "v11.0";
 		/// <summary>
 		/// Previously known as Q
 		/// </summary>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProject.cs
@@ -15,7 +15,7 @@ protected XamarinAndroidProject (string debugConfigurationName = "Debug", string
 			Language = XamarinAndroidProjectLanguage.CSharp;
 
 			if (!Builder.UseDotNet) {
-				TargetFrameworkVersion = Versions.Android10;
+				TargetFrameworkVersion = Versions.Android11;
 				UseLatestPlatformSdk = true;
 				AddReferences ("System.Core", "System.Xml", "Mono.Android");
 				ProjectGuid = Guid.NewGuid ().ToString ();
diff --git a/tests/Runtime-MultiDex/Properties/AndroidManifest.xml b/tests/Runtime-MultiDex/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Mono.Android_TestsMultiDex">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="30" />
 	<application android:label="Xamarin.Android.RuntimeTestsMultiDex" android:name="android.apptests.App" android:usesCleartextTraffic="true">
 		<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
 	</application>
diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/Properties/AndroidManifest.xml b/tests/Xamarin.Forms-Performance-Integration/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Forms_Performance_Integration">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="30" />
 	<application android:label="Xamarin.Forms.Performance.Integration"></application>
 </manifest>
diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj b/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
@@ -43,7 +43,6 @@
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-    <AndroidGenerateJniMarshalMethods Condition=" '$(HostOS)' == 'Darwin' ">True</AndroidGenerateJniMarshalMethods>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/tests/api-compatibility/acceptable-breakages-v11.0.txt b/tests/api-compatibility/acceptable-breakages-v11.0.txt
diff --git a/tests/api-compatibility/acceptable-breakages-vReference.txt b/tests/api-compatibility/acceptable-breakages-vReference.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-xamarin/monodroid:master@6d05c4929db1ba12ba3a04174938256e435dbbd4`
	`1`	`+xamarin/monodroid:master@fb5542fa193d5daef1c907f172e0775f9ea4b0d2`
`2`	`2`	`mono/mono:2020-02@87ef5557017a8d822ae31587846a54fcd66daf1b`