use namespace when using Adb and CheckAdbTarget tasks (dotnet#619)

- because in monodroid we have different tasks named equally. and we want to use UnitTestApks.targets
jonpryor · Jun 5, 2017 · 2b296e9 · 2b296e9
1 parent 33b5d39
commit 2b296e9
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/build-tools/scripts/UnitTestApks.targets b/build-tools/scripts/UnitTestApks.targets
@@ -13,14 +13,14 @@
   </PropertyGroup>
 
   <Target Name="AcquireAndroidTarget">
-    <CheckAdbTarget
+    <Xamarin.Android.Tools.BootstrapTasks.CheckAdbTarget
         Condition=" '$(RequireNewEmulator)' != 'True' "
         AdbTarget="$(AdbTarget)"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)">
       <Output TaskParameter="AdbTarget"     PropertyName="_AdbTarget" />
       <Output TaskParameter="IsValidTarget" PropertyName="_ValidAdbTarget"  />
-    </CheckAdbTarget>
+    </Xamarin.Android.Tools.BootstrapTasks.CheckAdbTarget>
     <CreateAndroidEmulator
         Condition=" '$(_ValidAdbTarget)' != 'True' "
         AndroidAbi="x86"
@@ -45,7 +45,7 @@
         Condition=" '$(_ValidAdbTarget)' != 'True' "
         Command="sleep 10"
     />
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition=" '$(_ValidAdbTarget)' != 'True' "
         Arguments="$(_AdbTarget) wait-for-device"
         ToolExe="$(AdbToolExe)"
@@ -64,14 +64,14 @@
   </Target>
 
   <Target Name="ReleaseAndroidTarget">
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition="'@(_FailedComponent)' != ''"
         ContinueOnError="True"
         Arguments="$(_EmuTarget) logcat -d"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
     />
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition=" '$(_EmuTarget)' != '' "
         ContinueOnError="True"
         Arguments="$(_EmuTarget) emu kill"
@@ -83,7 +83,7 @@
         ContinueOnError="True"
         ProcessId="$(_EmuPid)"
     />
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="kill-server"
         ContinueOnError="True"
         ToolExe="$(AdbToolExe)"
@@ -107,7 +107,7 @@
 
   <Target Name="DeployUnitTestApks"
       Condition=" '@(UnitTestApk)' != '' ">
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="$(_AdbTarget) $(AdbOptions) install &quot;%(UnitTestApk.Identity)&quot;"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
@@ -116,7 +116,7 @@
 
   <Target Name="UndeployUnitTestApks"
       Condition=" '@(UnitTestApk)' != '' ">
-    <Adb
+    <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="$(_AdbTarget) $(AdbOptions) uninstall &quot;%(UnitTestApk.Package)&quot;"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"