Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use namespace when using Adb and CheckAdbTarget tasks #619

Merged
merged 1 commit into from
Jun 1, 2017
Merged

use namespace when using Adb and CheckAdbTarget tasks #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
use namespace when using Adb and CheckAdbTarget tasks 
 - because in monodroid we have different tasks named equally. and we
   want to use UnitTestApks.targets
  • Loading branch information
@radekdoulik
radekdoulik committed Jun 1, 2017
commit 59a0004d27eb0d1a632e64a57990203d61d5d6a1
16 changes: 8 additions & 8 deletions build-tools/scripts/UnitTestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)"
Expand All @@ -58,14 +58,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"
Expand All @@ -77,7 +77,7 @@
ContinueOnError="True"
ProcessId="$(_EmuPid)"
/>
<Adb
<Xamarin.Android.Tools.BootstrapTasks.Adb
Arguments="kill-server"
ContinueOnError="True"
ToolExe="$(AdbToolExe)"
Expand All @@ -101,7 +101,7 @@

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

<Target Name="UndeployUnitTestApks"
Condition=" '@(UnitTestApk)' != '' ">
<Adb
<Xamarin.Android.Tools.BootstrapTasks.Adb
Arguments="$(_AdbTarget) $(AdbOptions) uninstall &quot;%(UnitTestApk.Package)&quot;"
ToolExe="$(AdbToolExe)"
ToolPath="$(AdbToolPath)"
Expand Down