Skip to content

Commit 952a33e

Browse files
radekdoulikjonpryor
authored andcommitted
use namespace when using Adb and CheckAdbTarget tasks (#619)
- because in monodroid we have different tasks named equally. and we want to use UnitTestApks.targets
1 parent 27a20f0 commit 952a33e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

build-tools/scripts/UnitTestApks.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
</PropertyGroup>
1414

1515
<Target Name="AcquireAndroidTarget">
16-
<CheckAdbTarget
16+
<Xamarin.Android.Tools.BootstrapTasks.CheckAdbTarget
1717
Condition=" '$(RequireNewEmulator)' != 'True' "
1818
AdbTarget="$(AdbTarget)"
1919
ToolExe="$(AdbToolExe)"
2020
ToolPath="$(AdbToolPath)">
2121
<Output TaskParameter="AdbTarget" PropertyName="_AdbTarget" />
2222
<Output TaskParameter="IsValidTarget" PropertyName="_ValidAdbTarget" />
23-
</CheckAdbTarget>
23+
</Xamarin.Android.Tools.BootstrapTasks.CheckAdbTarget>
2424
<CreateAndroidEmulator
2525
Condition=" '$(_ValidAdbTarget)' != 'True' "
2626
AndroidAbi="x86"
@@ -45,7 +45,7 @@
4545
Condition=" '$(_ValidAdbTarget)' != 'True' "
4646
Command="sleep 10"
4747
/>
48-
<Adb
48+
<Xamarin.Android.Tools.BootstrapTasks.Adb
4949
Condition=" '$(_ValidAdbTarget)' != 'True' "
5050
Arguments="$(_AdbTarget) wait-for-device"
5151
ToolExe="$(AdbToolExe)"
@@ -58,14 +58,14 @@
5858
</Target>
5959

6060
<Target Name="ReleaseAndroidTarget">
61-
<Adb
61+
<Xamarin.Android.Tools.BootstrapTasks.Adb
6262
Condition="'@(_FailedComponent)' != ''"
6363
ContinueOnError="True"
6464
Arguments="$(_EmuTarget) logcat -d"
6565
ToolExe="$(AdbToolExe)"
6666
ToolPath="$(AdbToolPath)"
6767
/>
68-
<Adb
68+
<Xamarin.Android.Tools.BootstrapTasks.Adb
6969
Condition=" '$(_EmuTarget)' != '' "
7070
ContinueOnError="True"
7171
Arguments="$(_EmuTarget) emu kill"
@@ -77,7 +77,7 @@
7777
ContinueOnError="True"
7878
ProcessId="$(_EmuPid)"
7979
/>
80-
<Adb
80+
<Xamarin.Android.Tools.BootstrapTasks.Adb
8181
Arguments="kill-server"
8282
ContinueOnError="True"
8383
ToolExe="$(AdbToolExe)"
@@ -101,7 +101,7 @@
101101

102102
<Target Name="DeployUnitTestApks"
103103
Condition=" '@(UnitTestApk)' != '' ">
104-
<Adb
104+
<Xamarin.Android.Tools.BootstrapTasks.Adb
105105
Arguments="$(_AdbTarget) $(AdbOptions) install &quot;%(UnitTestApk.Identity)&quot;"
106106
ToolExe="$(AdbToolExe)"
107107
ToolPath="$(AdbToolPath)"
@@ -110,7 +110,7 @@
110110

111111
<Target Name="UndeployUnitTestApks"
112112
Condition=" '@(UnitTestApk)' != '' ">
113-
<Adb
113+
<Xamarin.Android.Tools.BootstrapTasks.Adb
114114
Arguments="$(_AdbTarget) $(AdbOptions) uninstall &quot;%(UnitTestApk.Package)&quot;"
115115
ToolExe="$(AdbToolExe)"
116116
ToolPath="$(AdbToolPath)"

0 commit comments

Comments
 (0)