File tree Expand file tree Collapse file tree 5 files changed +15
-12
lines changed
xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks
tests/Xamarin.Forms-Performance-Integration/Droid Expand file tree Collapse file tree 5 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -253,11 +253,18 @@ stages:
253
253
254
254
- template : yaml-templates/run-installer.yaml
255
255
256
- # HACK - Provision Emulator
256
+ - task : MSBuild@1
257
+ displayName : build xaprepare
258
+ inputs :
259
+ solution : build-tools/xaprepare/xaprepare.sln
260
+ configuration : $(XA.Build.Configuration)
261
+ msbuildArguments : /t:Restore,Build
262
+
257
263
- script : |
258
- make prepare CONFIGURATION=$(ApkTestConfiguration) V=1 MSBUILD=msbuild MSBUILD_ARGS="$(AutoProvisionArgs)"
259
- git clean -xfd
260
- displayName: (hack) make prepare - provision emulator
264
+ mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
265
+ mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
266
+ mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=AndroidToolchain --no-emoji --run-mode=CI
267
+ displayName: provision dependencies
261
268
262
269
- task : NuGetCommand@2
263
270
displayName : nuget restore Xamarin.Android.Tools.sln
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ parameters:
3
3
testName : []
4
4
project : []
5
5
testResultsFiles : []
6
- extraBuildArgs : []
6
+ extraBuildArgs : " "
7
7
testResultsFormat : NUnit
8
8
packageType : Apk
9
9
Original file line number Diff line number Diff line change 303
303
/>
304
304
</Target >
305
305
<Target Name =" RenameApkTestCases"
306
- Condition =" '@(TestApk)' != '' " >
306
+ Condition =" '@(TestApk)' != '' Or '@(TestAab)' != '' " >
307
307
<RenameTestCases
308
308
Condition =" '%(TestApkInstrumentation.ResultsPath)' != '' "
309
309
Configuration =" $(Configuration)"
Original file line number Diff line number Diff line change @@ -53,7 +53,6 @@ public override bool Execute ()
53
53
} else {
54
54
if ( line . Contains ( $ "Process { ApplicationPackageName } (pid { PID } ) has died") ) {
55
55
Log . LogError ( "Application crash detected. Could not collect performance data." ) ;
56
- reader . Close ( ) ;
57
56
return false ;
58
57
}
59
58
@@ -99,11 +98,8 @@ public override bool Execute ()
99
98
WriteResults ( ) ;
100
99
} else {
101
100
Log . LogError ( "Application start wasn't detected. Could not collect performance data." ) ;
102
- reader . Close ( ) ;
103
101
return false ;
104
102
}
105
-
106
- reader . Close ( ) ;
107
103
}
108
104
109
105
return true ;
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<Project ToolsVersion =" 4.0" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
3
3
<Import Project =" Xamarin.Forms.Performance.Integration.Droid.projitems" />
4
- <Import Project =" ..\..\..\ build-tools\scripts\TestApks.targets" />
5
- <Import Project =" ..\..\..\ build-tools\scripts\JavaInteropDllConfigs.targets" />
4
+ <Import Project =" $(XamarinAndroidSourcePath) build-tools\scripts\TestApks.targets" />
5
+ <Import Project =" $(XamarinAndroidSourcePath) build-tools\scripts\JavaInteropDllConfigs.targets" />
6
6
<Target Name =" EnsureJavaInteropDllConfigs"
7
7
Condition =" Exists ('$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll')"
8
8
BeforeTargets =" _GenerateJniMarshalMethods"
You can’t perform that action at this time.
0 commit comments