From f72dda554248bb4a5ba8f29bcce08732379ca27c Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 28 Feb 2023 08:46:20 -1000 Subject: [PATCH] Migrate start-emulator to dotnet. --- .../stage-msbuild-emulator-tests.yaml | 20 ++++++++----------- .../yaml-templates/start-emulator.yaml | 16 +++++++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 build-tools/automation/yaml-templates/start-emulator.yaml diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml index f7b113cceae..ccb5f84c6cd 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml @@ -52,12 +52,7 @@ stages: --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-emulator.yaml - template: run-nunit-tests.yaml parameters: @@ -121,12 +116,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-emulator.yaml + parameters: + installImage: true + installDeviceName: $(deviceName) + installAvdApiLevel: $(avdApiLevel) + installAvdAbi: $(avdAbi) + installAvdType: $(avdType) - template: run-nunit-tests.yaml parameters: diff --git a/build-tools/automation/yaml-templates/start-emulator.yaml b/build-tools/automation/yaml-templates/start-emulator.yaml new file mode 100644 index 00000000000..049f09adb56 --- /dev/null +++ b/build-tools/automation/yaml-templates/start-emulator.yaml @@ -0,0 +1,16 @@ +parameters: + installImage: false + installDeviceName: + installAvdApiLevel: + installAvdAbi: + installAvdType: + +steps: +- task: DotNetCoreCLI@2 + displayName: Start emulator + inputs: + projects: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj + ${{ if eq(parameters.installImage, true) }}: + arguments: -c $(XA.Build.Configuration) -t:InstallAvdImage;AcquireAndroidTarget -p:TestDeviceName=${{ parameters.installDeviceName }} -p:TestAvdApiLevel=${{ parameters.installAvdApiLevel }} -p:TestAvdAbi=${{ parameters.installAvdAbi }} -p:TestAvdType=${{ parameters.installAvdType }} -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog + ${{ else }}: + arguments: -c $(XA.Build.Configuration) -t:AcquireAndroidTarget -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog