From 90a5a4c6cb695c10d0231ef35dc0fa3666d8c1ae Mon Sep 17 00:00:00 2001
From: xtmq <mail.stepanov.ev@gmail.com>
Date: Sun, 31 Mar 2019 16:58:05 +0200
Subject: [PATCH 1/3] Include adb console output into error message if exec
 command was failed

---
 .../Xamarin.Android.Common.targets                       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 4549747ff20..efceb30b51f 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3313,7 +3313,14 @@ 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 Command="$(_DeployCommand)" ContinueOnError="true" ConsoleToMSBuild="true">
+    <Output TaskParameter="ExitCode" PropertyName="_DeployEditCode" />
+    <Output TaskParameter="ConsoleOutput" PropertyName="_DeployConsoleOutput" />
+  </Exec>
+  <Error Text="$(_DeployCommand) exitied with code $(_DeployEditCode): $(_DeployConsoleOutput)" Condition="'$(_DeployEditCode)' != '0'" />
 </Target>
 
 <Target Name="Install"

From 89a77d0c985ceb8cee7fe871b3c3580a9499b410 Mon Sep 17 00:00:00 2001
From: xtmq <mail.stepanov.ev@gmail.com>
Date: Sun, 31 Mar 2019 18:41:10 +0200
Subject: [PATCH 2/3] Fix error message text to match the original one

---
 src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index efceb30b51f..9ca114a8717 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3320,7 +3320,7 @@ because xbuild doesn't support framework reference assemblies.
     <Output TaskParameter="ExitCode" PropertyName="_DeployEditCode" />
     <Output TaskParameter="ConsoleOutput" PropertyName="_DeployConsoleOutput" />
   </Exec>
-  <Error Text="$(_DeployCommand) exitied with code $(_DeployEditCode): $(_DeployConsoleOutput)" Condition="'$(_DeployEditCode)' != '0'" />
+  <Error Text="The command &quot;$(_DeployCommand)&quot; exitied with code $(_DeployEditCode): $(_DeployConsoleOutput)" Condition="'$(_DeployEditCode)' != '0'" />
 </Target>
 
 <Target Name="Install"

From 2cedff098153a65ee549f3e3c6c7a3fc09f12461 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 3 Apr 2019 14:39:22 -0400
Subject: [PATCH 3/3] Cleanup

Emit an ADB0000 error containing multiple lines.
---
 .../Xamarin.Android.Common.targets            | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 9ca114a8717..0b01fd02742 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3316,11 +3316,22 @@ because xbuild doesn't support framework reference assemblies.
   <PropertyGroup>
     <_DeployCommand>&quot;$(AdbToolPath)\adb&quot; $(AdbTarget) install -r &quot;$(ApkFileSigned)&quot;</_DeployCommand>
   </PropertyGroup>
-  <Exec Command="$(_DeployCommand)" ContinueOnError="true" ConsoleToMSBuild="true">
-    <Output TaskParameter="ExitCode" PropertyName="_DeployEditCode" />
-    <Output TaskParameter="ConsoleOutput" PropertyName="_DeployConsoleOutput" />
+  <Exec
+      ContinueOnError="True"
+      Command="$(_DeployCommand)"
+      ConsoleToMSBuild="True">
+    <Output TaskParameter="ExitCode"      PropertyName="_DeployExitCode" />
+    <Output TaskParameter="ConsoleOutput" ItemName="_DeployConsoleOutput" />
   </Exec>
-  <Error Text="The command &quot;$(_DeployCommand)&quot; exitied with code $(_DeployEditCode): $(_DeployConsoleOutput)" Condition="'$(_DeployEditCode)' != '0'" />
+  <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"