Skip to content

Commit 88bbd48

Browse files
committed
[build] Use xaprepare to provision Android tools
1 parent 0e489de commit 88bbd48

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,18 @@ stages:
253253

254254
- template: yaml-templates/run-installer.yaml
255255

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+
257263
- 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
261268
262269
- task: NuGetCommand@2
263270
displayName: nuget restore Xamarin.Android.Tools.sln

build-tools/automation/yaml-templates/apk-instrumentation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
testName: []
44
project: []
55
testResultsFiles: []
6-
extraBuildArgs: []
6+
extraBuildArgs: ""
77
testResultsFormat: NUnit
88
packageType: Apk
99

build-tools/scripts/TestApks.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
/>
304304
</Target>
305305
<Target Name="RenameApkTestCases"
306-
Condition=" '@(TestApk)' != '' ">
306+
Condition=" '@(TestApk)' != '' Or '@(TestAab)' != '' ">
307307
<RenameTestCases
308308
Condition=" '%(TestApkInstrumentation.ResultsPath)' != '' "
309309
Configuration="$(Configuration)"

build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/ProcessLogcatTiming.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public override bool Execute ()
5353
} else {
5454
if (line.Contains ($"Process {ApplicationPackageName} (pid {PID}) has died")) {
5555
Log.LogError ("Application crash detected. Could not collect performance data.");
56-
reader.Close ();
5756
return false;
5857
}
5958

@@ -99,11 +98,8 @@ public override bool Execute ()
9998
WriteResults ();
10099
} else {
101100
Log.LogError ("Application start wasn't detected. Could not collect performance data.");
102-
reader.Close ();
103101
return false;
104102
}
105-
106-
reader.Close ();
107103
}
108104

109105
return true;

tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<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" />
66
<Target Name="EnsureJavaInteropDllConfigs"
77
Condition="Exists ('$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll')"
88
BeforeTargets="_GenerateJniMarshalMethods"

0 commit comments

Comments
 (0)