[coreclr] projects with UseMonoRuntime=false successfully build (#9754)

This is a step towards Android projects using `UseMonoRuntime=false`
successfully:

1. Create new packs such as `Microsoft.Android.Runtime.CoreCLR.[api].[rid]`

2. Ensure a project *builds* with `UseMonoRuntime=false` in both
  `Debug` and `Release` configurations.

3. The project will not be able to run successfully yet.

(Significant work required for no. 3)

Author: jonathanpeppers

Configuration.props

@@ -216,5 +216,6 @@
   <ItemGroup>
     <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="Mono" />
     <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="NativeAOT" />
+    <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="CoreCLR" />
   </ItemGroup>
 </Project>

build-tools/create-packs/Directory.Build.targets

@@ -56,7 +56,7 @@
 
   <Target Name="_CreateItemGroups">
     <ItemGroup>
-      <_AndroidRuntimeNames Include="Mono;NativeAOT" />
+      <_AndroidRuntimeNames Include="@(AndroidAbiAndRuntimeFlavor->'%(AndroidRuntime)'->Distinct())" />
       <_AndroidRIDs Include="android-arm;android-arm64;android-x86;android-x64" Runtime="%(_AndroidRuntimeNames.Identity)" />
     </ItemGroup>
   </Target>

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

@@ -0,0 +1,15 @@
+<!--
+***********************************************************************************************
+Microsoft.Android.Sdk.CoreCLR.targets
+
+This file contains the CoreCLR-specific MSBuild logic for .NET for Android.
+***********************************************************************************************
+-->
+<Project>
+
+  <!-- Default property values for CoreCLR -->
+  <PropertyGroup>
+    <_AndroidRuntimePackRuntime>CoreCLR</_AndroidRuntimePackRuntime>
+  </PropertyGroup>
+
+</Project>

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

@@ -27,6 +27,7 @@
   <Import Project="Microsoft.Android.Sdk.DefaultProperties.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\tools\Xamarin.Android.Common.Debugging.props"
       Condition="Exists('$(MSBuildThisFileDirectory)..\tools\Xamarin.Android.Common.Debugging.props') And '$(DesignTimeBuild)' != 'true' "/>
-  <Import Project="Microsoft.Android.Sdk.NativeAOT.targets" Condition=" '$(_AndroidRuntime)' == 'NativeAOT' And '$(DesignTimeBuild)' != 'true' " />
+  <Import Project="Microsoft.Android.Sdk.CoreCLR.targets"   Condition=" '$(_AndroidRuntime)' == 'CoreCLR' " />
+  <Import Project="Microsoft.Android.Sdk.NativeAOT.targets" Condition=" '$(_AndroidRuntime)' == 'NativeAOT' " />
 
 </Project>

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

@@ -81,6 +81,22 @@
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"
     },
+    "Microsoft.Android.Runtime.CoreCLR.35.android-arm": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.35.android-arm64": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.35.android-x86": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.35.android-x64": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
     "Microsoft.Android.Runtime.NativeAOT.35.android-arm": {
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"
@@ -117,6 +133,22 @@
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"
     },
+    "Microsoft.Android.Runtime.CoreCLR.36.android-arm": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.36.android-arm64": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.36.android-x86": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
+    "Microsoft.Android.Runtime.CoreCLR.36.android-x64": {
+      "kind": "framework",
+      "version": "@WORKLOAD_VERSION@"
+    },
     "Microsoft.Android.Runtime.NativeAOT.36.android-arm": {
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"

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

@@ -105,6 +105,21 @@ public void BuildBasicApplication ([Values (true, false)] bool isRelease, [Value
 			}
 		}
 
+		[Test]
+		public void BasicApplicationOtherRuntime ([Values (true, false)] bool isRelease)
+		{
+			var proj = new XamarinAndroidApplicationProject {
+				IsRelease = isRelease,
+				// Add locally downloaded CoreCLR packs
+				ExtraNuGetConfigSources = {
+					Path.Combine (XABuildPaths.BuildOutputDirectory, "nuget-unsigned"),
+				}
+			};
+			proj.SetProperty ("UseMonoRuntime", "false"); // Enables CoreCLR
+			var b = CreateApkBuilder ();
+			Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
+		}
+
 		[Test]
 		public void NativeAOT ()
 		{