Run tests under CoreCLR

build-tools/automation/azure-pipelines.yaml

@@ -102,12 +102,31 @@ extends:
         macTestAgentsUseCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
 
     - template: /build-tools/automation/yaml-templates/stage-linux-tests.yaml@self
+      parameters:
+        runtimeName: "MonoVM"
+
+    - template: /build-tools/automation/yaml-templates/stage-msbuild-tests.yaml@self
+      parameters:
+        runtimeName: "MonoVM"
+
+    - template: /build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml@self
+      parameters:
+        usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
+        runtimeName: "MonoVM"
+
+    - template: /build-tools/automation/yaml-templates/stage-linux-tests.yaml@self
+      parameters:
+        runtimeName: "CoreCLR"
 
     - template: /build-tools/automation/yaml-templates/stage-msbuild-tests.yaml@self
+      parameters:
+        runtimeName: "CoreCLR"
+        testFilter: $(CoreCLRExcludedNunitCategories)
 
     - template: /build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml@self
       parameters:
         usesCleanImages: ${{ parameters.macTestAgentsUseCleanImages }}
+        runtimeName: "CoreCLR"
 
     - stage: maui_tests
       displayName: MAUI Tests

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
@@ -42,6 +43,10 @@ jobs:
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
 
+  - template: /build-tools/automation/yaml-templates/select-test-runtime.yaml
+    parameters:
+      runtimeName: ${{ parameters.runtimeName }}
+
   - task: DownloadPipelineArtifact@2
     inputs:
       artifactName: $(TestAssembliesArtifactName)
@@ -51,13 +56,13 @@ jobs:
     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/select-test-runtime.yaml

@@ -0,0 +1,14 @@
+parameters:
+  runtimeName: ''
+
+steps:
+- pwsh: |
+    Write-Host "Selecting target runtime: "${{ parameters.runtimeName }}""
+    if ("${{ parameters.runtimeName }}" -eq "CoreCLR") {
+      $useMonoRuntime="false"
+    } else {
+      $useMonoRuntime="true"
+    }
+
+    Write-Host "##vso[task.setvariable variable=USE_MONO_RUNTIME]$useMonoRuntime"
+  displayName: select target runtime (MonoVM or CoreCLR)

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

@@ -1,15 +1,17 @@
 # Runs smoke tests on Linux packages.
+parameters:
+  runtimeName: ''
 
 stages:
-- stage: linux_tests
-  displayName: Linux Tests
+- stage: linux_tests_${{ parameters.runtimeName }}
+  displayName: Linux Tests (${{ parameters.runtimeName }})
   dependsOn:
   - mac_build
   - linux_build
   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)
@@ -20,26 +22,30 @@ stages:
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 
+    - template: /build-tools/automation/yaml-templates/select-test-runtime.yaml
+      parameters:
+        runtimeName: ${{ parameters.runtimeName }}
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)
         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
 
   - job: linux_tests_smoke_2
-    displayName: Linux > Tests > MSBuild 2
+    displayName: Linux > Tests > MSBuild 2 (${{ parameters.runtimeName }})
     pool:
       name: MAUI-1ESPT
       image: $(LinuxPoolImage1ESPT)
@@ -50,26 +56,30 @@ stages:
     steps:
     - template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
 
+    - template: /build-tools/automation/yaml-templates/select-test-runtime.yaml
+      parameters:
+        runtimeName: ${{ parameters.runtimeName }}
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)
         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"
 
@@ -82,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-emulator-tests.yaml

@@ -1,6 +1,7 @@
 # Runs MSBuild tests against a device running on macOS
 
 parameters:
+  runtimeName: ''
   stageName: msbuilddevice_tests
   job_name: 'mac_dotnetdevice_tests'
   dependsOn: mac_build
@@ -16,8 +17,8 @@ parameters:
   use1ESTemplate: true
 
 stages:
-- stage: ${{ parameters.stageName }}
-  displayName: ${{ parameters.stagePrefix }}MSBuild Emulator Tests
+- stage: ${{ parameters.stageName }}_${{ parameters.runtimeName }}
+  displayName: ${{ parameters.stagePrefix }}MSBuild Emulator Tests (${{ parameters.runtimeName }})
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.stageCondition }}
   jobs:
@@ -44,6 +45,10 @@ stages:
         commit: ${{ parameters.commit }}
         xaprepareScenario: EmulatorTestDependencies
 
+    - template: /build-tools/automation/yaml-templates/select-test-runtime.yaml
+      parameters:
+        runtimeName: ${{ parameters.runtimeName }}
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)
@@ -85,7 +90,7 @@ stages:
         condition: ${{ parameters.shouldFailOnIssue }}
 
   - job: wear_tests
-    displayName: macOS > Tests > WearOS 
+    displayName: macOS > Tests > WearOS (${{ parameters.runtimeName }})
     timeoutInMinutes: 180
     cancelTimeoutInMinutes: 2
     strategy:
@@ -111,6 +116,10 @@ stages:
         commit: ${{ parameters.commit }}
         xaprepareScenario: EmulatorTestDependencies
 
+    - template: /build-tools/automation/yaml-templates/select-test-runtime.yaml
+      parameters:
+        runtimeName: ${{ parameters.runtimeName }}
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)

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

@@ -1,6 +1,8 @@
 # Runs MSBuild tests that do not require devices on Mac/Windows
 
 parameters:
+  runtimeName: ''
+  testFilter: ''          # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
   stageName: msbuild_dotnet
   stageCondition: succeeded()
   dependsOn: mac_build
@@ -12,14 +14,16 @@ parameters:
   use1ESTemplate: true
 
 stages:
-- stage: ${{ parameters.stageName }}
-  displayName: ${{ parameters.stagePrefix }}MSBuild Tests
+- stage: ${{ parameters.stageName }}_${{ parameters.runtimeName }}
+  displayName: ${{ parameters.stagePrefix }}MSBuild Tests (${{ parameters.runtimeName }})
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.stageCondition }}
   jobs:
   - template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
     parameters:
       testOS: macOS
+      runtimeName: ${{ parameters.runtimeName }}
+      testFilter: ${{ parameters.testFilter }}
       jobName: mac_msbuild_tests
       jobDisplayName: macOS > Tests > MSBuild
       agentCount: 10
@@ -32,6 +36,8 @@ stages:
   - template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
     parameters:
       testOS: Windows
+      runtimeName: ${{ parameters.runtimeName }}
+      testFilter: ${{ parameters.testFilter }}
       jobName: win_msbuild_tests
       jobDisplayName: Windows > Tests > MSBuild
       agentCount: 8

build-tools/automation/yaml-templates/variables.yaml

@@ -68,3 +68,5 @@ variables:
   value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
 - name: RunMAUITestJob
   value: true
+- name: CoreCLRExcludedNunitCategories
+  value: 'cat != AOT'

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

@@ -33,6 +33,13 @@
     <!-- HACK: make dotnet restore include Microsoft.NETCore.App.Runtime.NativeAOT.linux-bionic-arm64 -->
     <_IsPublishing Condition=" '$(_IsPublishing)' == '' and '$(_AndroidRuntime)' == 'NativeAOT' ">true</_IsPublishing>
 
+    <!-- HACK: NativeCompilationDuringPublish is set to `true` by Microsoft.NETCore.Native.targets
+         by default, which enforces running of the SetupOSSpecificProps target which, if NDK is
+         present or its bin directory isn't in PATH, will error out not being able to find
+         llvm-objcopy or objcopy even though the current build doesn't need them because it doesn't
+         target NativeAOT. Setting it here will hopefully prevent that from happening. -->
+    <NativeCompilationDuringPublish Condition=" '$(NativeCompilationDuringPublish)' == '' And '$(_AndroidRuntime)' != 'NativeAOT' ">false</NativeCompilationDuringPublish>
+
     <!-- Use $(AndroidMinimumSupportedApiLevel) for $(SupportedOSPlatformVersion) if unset -->
     <SupportedOSPlatformVersion Condition=" '$(SupportedOSPlatformVersion)' == '' ">$(AndroidMinimumSupportedApiLevel)</SupportedOSPlatformVersion>
     <!-- $(SupportedOSPlatformVersion) must be '21.0', but we should support integer values like '21' -->

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

@@ -6,11 +6,13 @@
       "packs": [
         "Microsoft.Android.Sdk.net10",
         "Microsoft.Android.Sdk.net9",
-        "Microsoft.Android.Ref.36",
-        "Microsoft.Android.Runtime.Mono.36.android-arm",
-        "Microsoft.Android.Runtime.Mono.36.android-arm64",
-        "Microsoft.Android.Runtime.Mono.36.android-x86",
-        "Microsoft.Android.Runtime.Mono.36.android-x64",
+        "Microsoft.Android.Ref.35",
+        "Microsoft.Android.Runtime.Mono.35.android-arm",
+        "Microsoft.Android.Runtime.Mono.35.android-arm64",
+        "Microsoft.Android.Runtime.Mono.35.android-x86",
+        "Microsoft.Android.Runtime.Mono.35.android-x64",
+        "Microsoft.Android.Runtime.CoreCLR.35.android-arm64",
+        "Microsoft.Android.Runtime.CoreCLR.35.android-x64",
         "Microsoft.Android.Templates"
       ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],