[ci] Reduce overhead for MSBuildIntegration unit test jobs.

Configuration.props

@@ -109,8 +109,8 @@
     <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/151/c633fe923832f0c3db3c4e6aa98e5592bf5a06e7/MonoFramework-MDK-6.12.0.145.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.145</MonoRequiredMinimumVersion>
+    <MonoDarwinPackageUrl>https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.188.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.188</MonoRequiredMinimumVersion>
     <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">$(MonoRequiredMinimumVersion)</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>

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

@@ -8,6 +8,11 @@ parameters:
   jdkTestFolder: $(JAVA_HOME_11_X64)
   remove_dotnet: false
   installTestSlicer: false
+  installApkDiff: true
+  installLegacyDotNet: true
+  restoreNUnitConsole: true
+  updateMono: true
+  androidSdkPlatforms: 19,21,26,32,33
 
 steps:
 - checkout: self
@@ -40,11 +45,12 @@ steps:
   condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
 
 # Install .NET 6 for legacy tests
-- template: use-dot-net.yaml
-  parameters:
-    version: 6.0
-    quality: GA
-    remove_dotnet: ${{ parameters.remove_dotnet }}
+- ${{ if eq(parameters.installLegacyDotNet, true) }}:
+  - template: use-dot-net.yaml
+    parameters:
+      version: 6.0
+      quality: GA
+      remove_dotnet: ${{ parameters.remove_dotnet }}
 
 # Install latest .NET
 - template: use-dot-net.yaml
@@ -56,26 +62,28 @@ steps:
     custom: build-server
     arguments: shutdown
 
-- template: run-xaprepare.yaml
-  parameters:
-    displayName: run xaprepare-UpdateMono
-    arguments: --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes
-    condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
-    xaSourcePath: ${{ parameters.xaSourcePath }}
+- ${{ if eq(parameters.updateMono, true) }}:
+  - template: run-xaprepare.yaml
+    parameters:
+      displayName: run xaprepare-UpdateMono
+      arguments: --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes
+      condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
+      xaSourcePath: ${{ parameters.xaSourcePath }}
 
 - template: run-xaprepare.yaml
   parameters:
-    arguments: --s=AndroidTestDependencies  --android-sdk-platforms="19,21,26,32,33"
+    arguments: --s=AndroidTestDependencies  --android-sdk-platforms="${{ parameters.androidSdkPlatforms }}"
     xaSourcePath: ${{ parameters.xaSourcePath }}
 
-- task: DotNetCoreCLI@2
-  displayName: restore NUnit.Console
-  inputs:
-    command: restore
-    projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
-    restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.ProjectTools.binlog
-    nugetConfigPath: ${{ parameters.xaSourcePath }}/NuGet.config
-    feedsToUse: config
+- ${{ if eq(parameters.restoreNUnitConsole, true) }}:
+  - task: DotNetCoreCLI@2
+    displayName: restore NUnit.Console
+    inputs:
+      command: restore
+      projects: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
+      restoreArguments: -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/restore-Xamarin.ProjectTools.binlog
+      nugetConfigPath: ${{ parameters.xaSourcePath }}/NuGet.config
+      feedsToUse: config
 
 - task: DotNetCoreCLI@2
   displayName: build Xamarin.Android.Tools.BootstrapTasks.csproj
@@ -101,7 +109,8 @@ steps:
     projects: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
     arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog
 
-- template: install-apkdiff.yaml
+- ${{ if eq(parameters.installApkDiff, true) }}:
+  - template: install-apkdiff.yaml
 
 - ${{ if eq(parameters.installTestSlicer, true) }}:
   - template: install-dotnet-test-slicer.yaml

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

@@ -26,17 +26,24 @@ stages:
     cancelTimeoutInMinutes: 5
     workspace:
       clean: all
+    variables:
+      androidSdkPlatforms: 33
     steps:
     - template: setup-test-environment.yaml
       parameters:
         provisionClassic: false
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
         installTestSlicer: true
+        installApkDiff: false
+        installLegacyDotNet: false
+        restoreNUnitConsole: false
+        updateMono: false
+        androidSdkPlatforms: $(androidSdkPlatforms)
 
     - template: run-xaprepare.yaml
       parameters:
         displayName: install emulator
-        arguments: --s=EmulatorTestDependencies --android-sdk-platforms="19,21,26,32,33"
+        arguments: --s=EmulatorTestDependencies --android-sdk-platforms="$(androidSdkPlatforms)"
 
     - task: DownloadPipelineArtifact@2
       inputs:
@@ -46,18 +53,13 @@ stages:
     - pwsh: |
         dotnet-test-slicer `
           --test-assembly="$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.dll" `
-          --test-filter="cat != TimeZoneInfo & cat != Localization ${{ parameters.nunit_categories }}" `
+          --test-filter="cat != TimeZoneInfo & cat != Localization & cat != SmokeTests ${{ parameters.nunit_categories }}" `
           --slice-number=$(System.JobPositionInPhase) `
           --total-slices=$(System.TotalJobsInPhase) `
           --outfile="$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.runsettings"
       displayName: Slice unit tests
 
-    - task: MSBuild@1
-      displayName: start emulator
-      inputs:
-        solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
-        configuration: $(XA.Build.Configuration)
-        msbuildArguments: /t:AcquireAndroidTarget /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog
+    - template: start-stop-emulator.yaml
 
     - template: run-nunit-tests.yaml
       parameters:
@@ -67,15 +69,9 @@ stages:
         dotNetTestExtraArgs: --settings "$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.runsettings"
         testResultsFile: TestResult-MSBuildDeviceIntegration-${{ parameters.job_name }}-$(System.JobPositionInPhase)-$(XA.Build.Configuration).xml
 
-    - task: MSBuild@1
-      displayName: shut down emulator
-      inputs:
-        solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
-        configuration: $(XA.Build.Configuration)
-        msbuildArguments: >-
-          /t:AcquireAndroidTarget,ReleaseAndroidTarget
-          /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
-      condition: always()
+    - template: start-stop-emulator.yaml
+      parameters:
+        command: stop
 
     - template: upload-results.yaml
       parameters:
@@ -94,14 +90,21 @@ stages:
           avdAbi: x86
           avdType: android-wear
           deviceName: wear_square
+          androidSdkPlatforms: 33
     pool:
       vmImage: $(HostedMacImage)
     workspace:
       clean: all
     steps:
     - template: setup-test-environment.yaml
       parameters:
+        provisionClassic: false
+        provisionatorChannel: ${{ parameters.provisionatorChannel }}
         configuration: $(XA.Build.Configuration)
+        installApkDiff: false
+        installLegacyDotNet: false
+        restoreNUnitConsole: false
+        androidSdkPlatforms: $(androidSdkPlatforms)
 
     - template: run-xaprepare.yaml
       parameters:
@@ -111,7 +114,7 @@ stages:
     - template: run-xaprepare.yaml
       parameters:
         displayName: install emulator
-        arguments: --s=EmulatorTestDependencies
+        arguments: --s=EmulatorTestDependencies --android-sdk-platforms="$(androidSdkPlatforms)"
 
     - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
       displayName: set Java8SdkDirectory
@@ -121,12 +124,13 @@ stages:
         artifactName: $(TestAssembliesArtifactName)
         downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
 
-    - task: MSBuild@1
-      displayName: install and launch emulator
-      inputs:
-        solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
-        configuration: $(XA.Build.Configuration)
-        msbuildArguments: /t:InstallAvdImage;AcquireAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-$(avdApiLevel).binlog
+    - template: start-stop-emulator.yaml
+      parameters:
+        specificImage: true
+        deviceName: $(deviceName)
+        avdApiLevel: $(avdApiLevel)
+        avdAbi: $(avdAbi)
+        avdType: $(avdType)
 
     - template: run-nunit-tests.yaml
       parameters:
@@ -135,13 +139,14 @@ stages:
         dotNetTestExtraArgs: --filter "TestCategory = WearOS"
         testResultsFile: TestResult-WearOS--$(XA.Build.Configuration).xml
 
-    - task: MSBuild@1
-      displayName: shut down emulator
-      inputs:
-        solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
-        configuration: $(XA.Build.Configuration)
-        msbuildArguments: /t:AcquireAndroidTarget,ReleaseAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
-      condition: always()
+    - template: start-stop-emulator.yaml
+      parameters:
+        command: stop
+        specificImage: true
+        deviceName: $(deviceName)
+        avdApiLevel: $(avdApiLevel)
+        avdAbi: $(avdAbi)
+        avdType: $(avdType)
 
     - template: upload-results.yaml
       parameters:

build-tools/automation/yaml-templates/start-stop-emulator.yaml

@@ -0,0 +1,31 @@
+parameters:
+  command: start          # 'start' or 'stop'
+  specificImage: false    # 'true' to use a specific emulator AVD image
+  deviceName:             # Device name, like 'wear_square', required if 'specificImage' is 'true'
+  avdApiLevel:            # Device API level, like '30', required if 'specificImage' is 'true'
+  avdAbi:                 # Device ABI, like 'x86', required if 'specificImage' is 'true'
+  avdType:                # Device AVD, like 'android-wear', required if 'specificImage' is 'true'
+
+steps:
+- ${{ if eq(parameters.command, 'start') }}:
+  - task: DotNetCoreCLI@2
+    displayName: Start emulator
+    continueOnError: false
+    inputs:
+      projects: src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
+      ${{ if eq(parameters.specificImage, true) }}:
+        arguments: -c $(XA.Build.Configuration) -t:"InstallAvdImage;AcquireAndroidTarget" -p:TestDeviceName=${{ parameters.deviceName }} -p:TestAvdApiLevel=${{ parameters.avdApiLevel }} -p:TestAvdAbi=${{ parameters.avdAbi }} -p:TestAvdType=${{ parameters.avdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-${{ parameters.avdApiLevel }}.binlog
+      ${{ else }}:
+        arguments: -c $(XA.Build.Configuration) -t:AcquireAndroidTarget -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog
+
+- ${{ if eq(parameters.command, 'stop') }}:
+  - task: DotNetCoreCLI@2
+    displayName: Stop emulator
+    condition: always()
+    continueOnError: true
+    inputs:
+      projects: src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
+      ${{ if eq(parameters.specificImage, true) }}:
+        arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -p:TestDeviceName=${{ parameters.deviceName }} -p:TestAvdApiLevel=${{ parameters.avdApiLevel }} -p:TestAvdAbi=${{ parameters.avdAbi }} -p:TestAvdType=${{ parameters.avdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
+      ${{ else }}:
+        arguments: -c $(XA.Build.Configuration) -t:"AcquireAndroidTarget,ReleaseAndroidTarget" -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj

@@ -3,6 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
-  <Import Project="..\..\Configuration.props" />
-  <Import Project="..\..\build-tools\scripts\TestApks.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\Configuration.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\build-tools\scripts\TestApks.targets" />
 </Project>