Skip to content

Deploy target #2905

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

Merged
jonpryor merged 3 commits into from
Apr 3, 2019
Merged

Deploy target #2905

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90a5a4c
Include adb console output into error message if exec command was failed
xtmq Mar 31, 2019
89a77d0
Fix error message text to match the original one
xtmq Mar 31, 2019
2cedff0
Cleanup
jonpryor Apr 3, 2019
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
20 changes: 19 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3313,7 +3313,25 @@ because xbuild doesn't support framework reference assemblies.
</PropertyGroup>

<Target Name="_Deploy">
<Exec Command="&quot;$(AdbToolPath)\adb&quot; $(AdbTarget) install -r &quot;$(ApkFileSigned)&quot;" />
<PropertyGroup>
<_DeployCommand>&quot;$(AdbToolPath)\adb&quot; $(AdbTarget) install -r &quot;$(ApkFileSigned)&quot;</_DeployCommand>
</PropertyGroup>
<Exec
ContinueOnError="True"
Command="$(_DeployCommand)"
ConsoleToMSBuild="True">
<Output TaskParameter="ExitCode" PropertyName="_DeployExitCode" />
<Output TaskParameter="ConsoleOutput" ItemName="_DeployConsoleOutput" />
</Exec>
<ItemGroup>
<_AdbError Include="The command `$(_DeployCommand)` exited with code $(_DeployExitCode):" />
<_AdbError Include="@(_DeployConsoleOutput->' %(Identity)')" />
</ItemGroup>
<Error
Condition=" '$(_DeployExitCode)' != '0' "
Code="ADB0000"
Text="@(_AdbError, '%0a')"
/>
</Target>

<Target Name="Install"
Expand Down