@@ -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 :
0 commit comments