Add API-31 to d16-11

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>30</AndroidApiLevel>
+    <AndroidApiLevel>31</AndroidApiLevel>
     <!-- The Xamarin.Android $(TargetFrameworkVersion) value that corresponds to $(AndroidApiLevel) -->
-    <AndroidFrameworkVersion>v11.0</AndroidFrameworkVersion>
+    <AndroidFrameworkVersion>v12.0</AndroidFrameworkVersion>
     <!-- The default Android API "id" that corresponds to $(AndroidApiLevel) -->
-    <AndroidPlatformId>30</AndroidPlatformId>
+    <AndroidPlatformId>31</AndroidPlatformId>
 
     <!--
       Colon-separated list of ABIs to build the mono JIT for.

Configuration.props

@@ -30,9 +30,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)' == ''">30</AndroidLatestStableApiLevel>
+    <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">31</AndroidLatestStableApiLevel>
     <AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
-    <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v11.0</AndroidLatestStableFrameworkVersion>
+    <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v12.0</AndroidLatestStableFrameworkVersion>
     <!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
     <AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidApiLevel>
     <AndroidPlatformId Condition=" '$(AndroidPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidPlatformId>

Directory.Build.props

@@ -21,7 +21,7 @@
          * Bump last two digits of the patch version for service releases.
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
-    <AndroidPackVersion>30.0.100</AndroidPackVersion>
+    <AndroidPackVersion>31.0.100</AndroidPackVersion>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->

Documentation/building/windows/instructions.md

@@ -46,7 +46,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-main] file (`v11.0` when
+property of the [`Configuration.props`][configprops-main] file (`v12.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.

Documentation/release-notes/6084.md

@@ -0,0 +1,8 @@
+#### Application build and deployment
+
+- [GitHub Pull Request #6084](https://github.com/xamarin/xamarin-android/pull/6084):
+  Android API 31 and a `$(TargetFrameworkVersion)` of `v11.0.99`
+  requires JDK 11. This can be obtained manually by installing
+  [Microsoft OpenJDK 11][ms-openjdk].
+
+[ms-openjdk]: https://docs.microsoft.com/java/openjdk/download

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

@@ -28,7 +28,7 @@ public sealed class CheckApiCompatibility : Task
 			{ "v9.0", "v8.1" },
 			{ "v10.0", "v9.0" },
 			{ "v11.0", "v10.0" },
-			{ "v11.0.99", "v11.0" },
+			{ "v12.0", "v11.0" },
 		};
 
 		static readonly string assemblyToValidate = "Mono.Android.dll";

build-tools/api-merge/merge-configuration.xml

@@ -19,7 +19,7 @@
     <File Path="api-28.xml.in" Level="28" />
     <File Path="api-29.xml.in" Level="29" />
     <File Path="api-30.xml.in" Level="30" />
-    <File Path="api-S.xml.in" Level="S" />
+    <File Path="api-31.xml.in" Level="31" />
   </Inputs>
   <Outputs>
     <File Path="android-19\mcw\api.xml" LastLevel="19" />
@@ -34,6 +34,6 @@
     <File Path="android-28\mcw\api.xml" LastLevel="28" />
     <File Path="android-29\mcw\api.xml" LastLevel="29" />
     <File Path="android-30\mcw\api.xml" LastLevel="30" />
-    <File Path="android-S\mcw\api.xml" LastLevel="S" />
+    <File Path="android-31\mcw\api.xml" LastLevel="31" />
   </Outputs>
 </Configuration>

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 30 S
+API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 
 XML_OUTPUT_DIR = .
 

build-tools/automation/azure-pipelines.yaml

@@ -42,7 +42,7 @@ variables:
   DotNet6Version: 6.0.100-preview.3.21202.5
   HostedMacImage: macOS-10.15
   HostedWinVS2019: Hosted Windows 2019 with VS2019
-  VSEngWinVS2019: Xamarin-Android-Win2019
+  VSEngWinVS2019: android-win-2019
   # Run all tests if:
   # - User who queued the job requested it (They set XA.RunAllTests to true)
   # - This is the master integration branch (Pipeline defaults XA.RunAllTests to true)
@@ -171,7 +171,7 @@ stages:
 
     - template: yaml-templates\clean.yaml
 
-    - template: yaml-templates\update-vs.yaml
+    - template: yaml-templates\delete-platform-31.yaml
 
     - script: |
         echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
@@ -293,7 +293,7 @@ stages:
 
     - template: yaml-templates\clean.yaml
 
-    - template: yaml-templates\update-vs.yaml
+    - template: yaml-templates\delete-platform-31.yaml
 
     - script: |
         echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
@@ -927,7 +927,6 @@ stages:
       job_name: mac_msbuild_tests_1
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
@@ -936,15 +935,13 @@ stages:
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
       run_extra_tests: true
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 3
       job_name: mac_msbuild_tests_3
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
   # Xamarin.Android (Test MSBuild Legacy - Windows)
   - template: yaml-templates\run-msbuild-win-tests.yaml
@@ -953,7 +950,6 @@ stages:
       job_name: win_msbuild_tests_1
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
   - template: yaml-templates\run-msbuild-win-tests.yaml
     parameters:
@@ -962,15 +958,13 @@ stages:
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
       run_extra_tests: true
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
   - template: yaml-templates\run-msbuild-win-tests.yaml
     parameters:
       node_id: 3
       job_name: win_msbuild_tests_3
       job_suffix: Legacy
       nunit_categories: '&& cat != SmokeTests'
-      jdkTestFolder: $(XA.Jdk8.Folder)
 
 - stage: msbuild_dotnet
   displayName: One .NET Tests
@@ -1037,7 +1031,7 @@ stages:
     parameters:
       job_name: mac_msbuilddevice_tests
       job_suffix: Legacy
-      jdkTestFolder: $(XA.Jdk8.Folder)
+      jdkTestFolder: $(XA.Jdk11.Folder)
 
   # Check - "Xamarin.Android (MSBuild Emulator Tests macOS - One .NET)"
   - template: yaml-templates/run-msbuild-device-tests.yaml
@@ -1056,7 +1050,7 @@ stages:
   - job: designer_integration_mac
     displayName: macOS
     pool:
-      vmImage: $(HostedMacImage)
+      vmImage: internal-macos-11
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 5
     workspace:
@@ -1133,7 +1127,9 @@ stages:
         targetPath: $(Build.ArtifactStagingDirectory)/designer-binlogs
 
   # Check - "Xamarin.Android (Designer Tests Windows)"
+  # TODO: Enable once Windows test issues are fixed.
   - job: designer_integration_win
+    condition: false
     displayName: Windows
     pool: $(HostedWinVS2019)
     timeoutInMinutes: 120

build-tools/automation/yaml-templates/delete-platform-31.yaml

@@ -0,0 +1,10 @@
+# NOTE: temporary workaround to delete platform-31
+steps:
+
+- script: rm -rfv "$HOME/Library/Android/sdk/platforms/android-31"
+  displayName: delete API 31
+  condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
+
+- script: if exist "%USERPROFILE%\android-toolchain\sdk\platforms\android-31" rmdir /s /q "%USERPROFILE%\android-toolchain\sdk\platforms\android-31"
+  displayName: delete API 31
+  condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml

@@ -26,7 +26,6 @@ jobs:
 
     - template: setup-test-environment.yaml
       parameters:
-        updateVS: true
         jdkTestFolder: ${{ parameters.jdkTestFolder }}
 
     - task: DownloadPipelineArtifact@1

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -19,6 +19,8 @@ steps:
   parameters:
     provisionExtraArgs: ${{ parameters.provisionExtraArgs }}
 
+- template: delete-platform-31.yaml
+
 - script: |
     echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/Library/Android/${{ parameters.jdkTestFolder }}"
     echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]$HOME/Library/Android/dotnet/dotnet"

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

@@ -39,7 +39,7 @@ class BuildAndroidPlatforms
 			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: "30",  include: "v11.0",   framework: "v11.0"),
-			new AndroidPlatform (apiName: "S",                      apiLevel: 31, platformID: "S",   include: "v11.0.99",   framework: "v11.0.99", stable: false),
+			new AndroidPlatform (apiName: "S",                      apiLevel: 31, platformID: "31",  include: "v12.0",   framework: "v12.0"),
 		};
 
 		// These are here until we can drop "legacy" targets and use only .NET6+

build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs

@@ -62,7 +62,7 @@ public AndroidToolchain ()
 				new AndroidPlatformComponent ("platform-28_r04",   apiLevel: "28", pkgRevision: "4"),
 				new AndroidPlatformComponent ("platform-29_r01",   apiLevel: "29", pkgRevision: "1"),
 				new AndroidPlatformComponent ("platform-30_r01",   apiLevel: "30", pkgRevision: "1"),
-				new AndroidPlatformComponent ("platform-S_r05",    apiLevel: "S",  pkgRevision: "5"),
+				new AndroidPlatformComponent ("platform-31_r01",   apiLevel: "31",  pkgRevision: "1"),
 
 				new AndroidToolchainComponent ("sources-30_r01",   destDir: Path.Combine ("platforms", $"android-30", "src"), pkgRevision: "1", dependencyType: AndroidToolchainComponentType.BuildDependency),
 

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

@@ -102,12 +102,6 @@ protected override async Task<bool> Execute (Context context)
 				Utilities.CopyFileToDir (file, destination);
 			}
 
-			// Install the microsoft-net-runtime-android workload
-			if (!Utilities.RunCommand (dotnetTool, BuildPaths.XamarinAndroidSourceRoot, ignoreEmptyArguments: false, new [] { "workload", "install", "microsoft-net-runtime-android", "--skip-manifest-update", "--verbosity", "diag" })) {
-				Log.ErrorLine ($"dotnet workload install failed.");
-				return false;
-			}
-
 			return true;
 		}
 

eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.6.21306.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21369.3">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>c83bef2f34e5302bfc651d12df2f8bbcd2a981dc</Sha>
+      <Sha>9c463710a333a48301a211fbd7b8ca3b15d4f1f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21304.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21366.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>21df7dbbf881507c98026c1b9e7532303b3c0a06</Sha>
+      <Sha>460dd6ddb329a5588d9e4399f4257ce28dfadaca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21306.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21368.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>5b8e1780ad7740e632c285bc2af13a8d0b20c5a9</Sha>
+      <Sha>96ce6b35359b3c159ef3e685dd67cf30bb46769b</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,11 +1,11 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21306.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21304.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21369.3</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21366.2</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21306.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21368.1</MicrosoftNETCoreAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Trim all characters after first `-` or `+` is encountered. -->

src/Microsoft.Android.Templates/android-bindinglib/.template.config/template.json

@@ -15,5 +15,14 @@
   "primaryOutputs": [
     { "path": "AndroidBinding1.csproj" }
   ],
+  "symbols": {
+    "supportedOSVersion": {
+      "type": "parameter",
+      "description": "Overrides $(SupportedOSPlatformVersion) in the project",
+      "datatype": "string",
+      "replaces": "SUPPORTED_OS_PLATFORM_VERSION",
+      "defaultValue": "21"
+    }
+  },
   "defaultName": "AndroidBinding1"
 }

src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidBinding1</RootNamespace>
   </PropertyGroup>
 </Project>

src/Microsoft.Android.Templates/android/.template.config/template.json

@@ -21,6 +21,13 @@
       "description": "Overrides the package name in the AndroidManifest.xml",
       "datatype": "string",
       "replaces": "com.companyname.AndroidApp1"
+    },
+    "supportedOSVersion": {
+      "type": "parameter",
+      "description": "Overrides $(SupportedOSPlatformVersion) in the project",
+      "datatype": "string",
+      "replaces": "SUPPORTED_OS_PLATFORM_VERSION",
+      "defaultValue": "21"
     }
   },
   "defaultName": "AndroidApp1"

src/Microsoft.Android.Templates/android/AndroidApp1.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
     <OutputType>Exe</OutputType>
   </PropertyGroup>

src/Microsoft.Android.Templates/android/AndroidManifest.xml

@@ -3,7 +3,6 @@
           android:versionCode="1" 
           android:versionName="1.0" 
           package="com.companyname.AndroidApp1">
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
   <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true">
   </application>
 </manifest>

src/Microsoft.Android.Templates/androidlib/.template.config/template.json

@@ -15,5 +15,14 @@
   "primaryOutputs": [
     { "path": "AndroidLib1.csproj" }
   ],
+  "symbols": {
+    "supportedOSVersion": {
+      "type": "parameter",
+      "description": "Overrides $(SupportedOSPlatformVersion) in the project",
+      "datatype": "string",
+      "replaces": "SUPPORTED_OS_PLATFORM_VERSION",
+      "defaultValue": "21"
+    }
+  },
   "defaultName": "AndroidLib1"
 }

src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
   </PropertyGroup>
 </Project>

src/Mono.Android/Android.Bluetooth/AdvertisingSetParametersBuilder.cs

@@ -0,0 +1,24 @@
+#if ANDROID_26
+
+namespace Android.Bluetooth.LE
+{
+	public sealed partial class AdvertisingSetParameters
+	{
+		public sealed partial class Builder
+		{
+			// These methods were obsoleted as a warning in API-31
+			[global::System.Obsolete ("This method has the wrong enumeration. Use the version that takes an 'Android.Bluetooth.BluetoothPhy' instead.")]
+			[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android26.0")]
+			public unsafe Android.Bluetooth.LE.AdvertisingSetParameters.Builder? SetPrimaryPhy ([global::Android.Runtime.GeneratedEnum] Android.Bluetooth.LE.ScanSettingsPhy primaryPhy)
+				=> SetPrimaryPhy ((Android.Bluetooth.BluetoothPhy) primaryPhy);
+
+			[global::System.Obsolete ("This method has the wrong enumeration. Use the version that takes an 'Android.Bluetooth.BluetoothPhy' instead.")]
+			[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android26.0")]
+			public unsafe Android.Bluetooth.LE.AdvertisingSetParameters.Builder? SetSecondaryPhy ([global::Android.Runtime.GeneratedEnum] Android.Bluetooth.LE.ScanSettingsPhy secondaryPhy)
+				=> SetSecondaryPhy ((Android.Bluetooth.BluetoothPhy) secondaryPhy);
+		}
+	}
+}
+
+#endif
+