Skip to content

Commit f72dda5

Browse files
committed
Migrate start-emulator to dotnet.
1 parent df28d8e commit f72dda5

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@ stages:
5252
--outfile="$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.runsettings"
5353
displayName: Slice unit tests
5454
55-
- task: MSBuild@1
56-
displayName: start emulator
57-
inputs:
58-
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
59-
configuration: $(XA.Build.Configuration)
60-
msbuildArguments: /t:AcquireAndroidTarget /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog
55+
- template: start-emulator.yaml
6156

6257
- template: run-nunit-tests.yaml
6358
parameters:
@@ -121,12 +116,13 @@ stages:
121116
artifactName: $(TestAssembliesArtifactName)
122117
downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
123118

124-
- task: MSBuild@1
125-
displayName: install and launch emulator
126-
inputs:
127-
solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
128-
configuration: $(XA.Build.Configuration)
129-
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
119+
- template: start-emulator.yaml
120+
parameters:
121+
installImage: true
122+
installDeviceName: $(deviceName)
123+
installAvdApiLevel: $(avdApiLevel)
124+
installAvdAbi: $(avdAbi)
125+
installAvdType: $(avdType)
130126

131127
- template: run-nunit-tests.yaml
132128
parameters:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
parameters:
2+
installImage: false
3+
installDeviceName:
4+
installAvdApiLevel:
5+
installAvdAbi:
6+
installAvdType:
7+
8+
steps:
9+
- task: DotNetCoreCLI@2
10+
displayName: Start emulator
11+
inputs:
12+
projects: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
13+
${{ if eq(parameters.installImage, true) }}:
14+
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
15+
${{ else }}:
16+
arguments: -c $(XA.Build.Configuration) -t:AcquireAndroidTarget -bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog

0 commit comments

Comments
 (0)