Let's see how this works

Author: grendello

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

@@ -1,5 +1,6 @@
 parameters:
   testOS: ''              # 'macOS' or 'Windows'
+  runtimeName: ''         # MonoVM or CoreCLR
   jobName: ''             # Name of the job
   jobDisplayName: ''      # Display name of the job
   agentCount: 1           # Number of build agents to run in parallel
@@ -48,20 +49,20 @@ jobs:
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifactName: $(TestAssembliesArtifactName)
+      artifactName: $(TestAssembliesArtifactName)-${{ parameters.runtimeName }}
       downloadPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)
 
   - template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
     parameters:
       testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
       testFilter: ${{ parameters.testFilter }}
-      testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }}
+      testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }} (${{ parameters.runtimeName }})
       retryFailedTests: false
       xaSourcePath: ${{ parameters.xaSourcePath }}
 
   - template: /build-tools/automation/yaml-templates/upload-results.yaml
     parameters:
-      artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-$(System.JobPositionInPhase)
+      artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-${{ parameters.runtimeName }}-$(System.JobPositionInPhase)
       xaSourcePath: ${{ parameters.xaSourcePath }}
       use1ESTemplate: ${{ parameters.use1ESTemplate }}
 

build-tools/automation/yaml-templates/stage-linux-tests.yaml

@@ -11,7 +11,7 @@ stages:
   jobs:
   # Check - "Xamarin.Android (Linux Tests Linux > Tests > MSBuild)"
   - job: linux_tests_smoke_1
-    displayName: Linux > Tests > MSBuild 1
+    displayName: Linux > Tests > MSBuild 1 (${{ parameters.runtimeName }})
     pool:
       name: MAUI-1ESPT
       image: $(LinuxPoolImage1ESPT)
@@ -28,19 +28,19 @@ stages:
 
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifactName: $(TestAssembliesArtifactName)
+        artifactName: $(TestAssembliesArtifactName)-${{ parameters.rutimeName }}
         downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
 
     - template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
       parameters:
-        testRunTitle: Xamarin.Android.Build.Tests - Linux BuildTest
+        testRunTitle: Xamarin.Android.Build.Tests - Linux BuildTest (${{ parameters.runtimeName }})
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
         dotNetTestExtraArgs: --filter "Name = BuildTest"
 
     - template: /build-tools/automation/yaml-templates/upload-results.yaml
       parameters:
         configuration: $(XA.Build.Configuration)
-        artifactName: Test Results - MSBuild - Linux 1
+        artifactName: Test Results - MSBuild - Linux 1 - ${{ parameters.runtimeName }}
 
     - template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
 
@@ -62,24 +62,24 @@ stages:
 
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifactName: $(TestAssembliesArtifactName)
+        artifactName: $(TestAssembliesArtifactName)-${{ parameters.runtimeName }}
         downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
 
     - template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
       parameters:
-        testRunTitle: Xamarin.Android.Build.Tests - Linux PackagingTest
+        testRunTitle: Xamarin.Android.Build.Tests - Linux PackagingTest (${{ parameters.runtimeName }})
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
         dotNetTestExtraArgs: --filter "Name = PackagingTest"
 
     - template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
       parameters:
-        testRunTitle: Xamarin.Android.Build.Tests - Linux XASdkTests
+        testRunTitle: Xamarin.Android.Build.Tests - Linux XASdkTests (${{ parameters.runtimeName }})
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
         dotNetTestExtraArgs: --filter "Name = XASdkTests & Name != XamarinLegacySdk"
 
     - template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
       parameters:
-        testRunTitle: Xamarin.Android.Build.Tests - Linux AndroidDependenciesTests
+        testRunTitle: Xamarin.Android.Build.Tests - Linux AndroidDependenciesTests (${{ parameters.runtimeName }})
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
         dotNetTestExtraArgs: --filter "Name = AndroidDependenciesTests"
 
@@ -92,6 +92,6 @@ stages:
     - template: /build-tools/automation/yaml-templates/upload-results.yaml
       parameters:
         configuration: $(XA.Build.Configuration)
-        artifactName: Test Results - MSBuild - Linux 2
+        artifactName: Test Results - MSBuild - Linux 2 - ${{ parameters.runtimeName }}
 
     - template: /build-tools/automation/yaml-templates/fail-on-issue.yaml

build-tools/automation/yaml-templates/stage-msbuild-tests.yaml

@@ -21,6 +21,7 @@ stages:
   - template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
     parameters:
       testOS: macOS
+      runtimeName: ${{ parameters.runtimeName }}
       jobName: mac_msbuild_tests
       jobDisplayName: macOS > Tests > MSBuild
       agentCount: 10
@@ -33,6 +34,7 @@ stages:
   - template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
     parameters:
       testOS: Windows
+      runtimeName: ${{ parameters.runtimeName }}
       jobName: win_msbuild_tests
       jobDisplayName: Windows > Tests > MSBuild
       agentCount: 8

src/Xamarin.Android.Build.Tasks/Tasks/GenerateTypeMappings.cs

@@ -77,10 +77,6 @@ void WriteTypeMappings (NativeCodeGenState state)
 			// NativeAOT typemaps are generated in `Microsoft.Android.Sdk.ILLink.TypeMappingStep`
 			return;
 		}
-		if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.CoreCLR) {
-			// TODO: CoreCLR typemaps will be emitted later
-			return;
-		}
 		Log.LogDebugMessage ($"Generating type maps for architecture '{state.TargetArch}'");
 		var tmg = new TypeMapGenerator (Log, state, androidRuntime);
 		if (!tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory, GenerateNativeAssembly)) {