From f6899795a868dd1e64d30c1464d70551ff54a6ae Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 4 Dec 2025 16:37:04 -0600
Subject: [PATCH] [xabt] Implement `DeployToDevice` target

Context: https://github.com/dotnet/sdk/blob/c164a9bc1246c48191fb780992530f0fe975141b/documentation/specs/dotnet-run-for-maui.md

Implements the `DeployToDevice` MSBuild target per the `dotnet run` spec
for .NET MAUI scenarios. This target allows deploying an already-built
app to a device without rebuilding, supporting the `dotnet run`
workflow.

The target reuses existing deployment logic but skips the full build,
enabling faster iteration when only deployment is needed e.g.
`--no-build`.

Also consolidates `$(SignAndroidPackageDependsOn)`,
`$(InstallDependsOnTargets)`, and `$(UninstallDependsOnTargets)`
properties into `BuildOrder.targets` to keep all target dependency
ordering in one place.

Adds test coverage to verify the target deploys successfully and the
app can be launched via adb commands.
---
 .../Microsoft.Android.Sdk.BuildOrder.targets  | 42 +++++++++++++++++++
 .../Xamarin.Android.Common.targets            | 32 +-------------
 .../Tests/InstallAndRunTests.cs               | 25 +++++++++++
 3 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
index 736930a4cea..01f6959aed2 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets
@@ -94,6 +94,48 @@ properties that determine build ordering.
     </_PrepareBuildApkDependsOnTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <InstallDependsOnTargets>
+      SignAndroidPackage;
+      _DeployApk;
+      _DeployAppBundle;
+    </InstallDependsOnTargets>
+    <UninstallDependsOnTargets>
+      AndroidPrepareForBuild;
+      _Uninstall
+    </UninstallDependsOnTargets>
+    <!-- When inside an IDE, Build has just been run. This is a minimal list of targets for SignAndroidPackage. -->
+    <_MinimalSignAndroidPackageDependsOn>
+      BuildOnlySettings;
+      _CreatePropertiesCache;
+      ResolveReferences;
+      PrepareResources;
+      CreateSatelliteAssemblies;
+      _CopyPackage;
+      _Sign;
+      _CreateUniversalApkFromBundle;
+    </_MinimalSignAndroidPackageDependsOn>
+    <SignAndroidPackageDependsOn Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">
+      Build;
+      Package;
+      _Sign;
+      _CreateUniversalApkFromBundle;
+    </SignAndroidPackageDependsOn>
+    <SignAndroidPackageDependsOn Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">
+      $(_MinimalSignAndroidPackageDependsOn);
+    </SignAndroidPackageDependsOn>
+    <!-- This should function similar to SignAndroidPackage inside VS plus also deploy -->
+    <DeployToDeviceDependsOnTargets Condition=" '$(_XASupportsFastDev)' == 'true' ">
+      $(_MinimalSignAndroidPackageDependsOn);
+      _Upload;
+    </DeployToDeviceDependsOnTargets>
+    <DeployToDeviceDependsOnTargets Condition=" '$(_XASupportsFastDev)' != 'true' ">
+      $(_MinimalSignAndroidPackageDependsOn);
+      _DeployApk;
+      _DeployAppBundle;
+    </DeployToDeviceDependsOnTargets>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(AndroidApplication)' != 'True' ">
     <BuildDependsOn>
       $(_AndroidBuildDependsOn);
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index ee24d3a843d..1093614e340 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2800,28 +2800,10 @@ because xbuild doesn't support framework reference assemblies.
   <UnzipToFolder Sources="$(_UniversalApkSetIntermediate)" DestinationDirectories="$(OutDir)" Files="@(_FilestoExtract)" />
 </Target>
 
-<PropertyGroup>
-  <SignAndroidPackageDependsOn Condition=" '$(BuildingInsideVisualStudio)' != 'True' ">
-    Build;
-    Package;
-    _Sign;
-    _CreateUniversalApkFromBundle;
-  </SignAndroidPackageDependsOn>
-  <!-- When inside an IDE, Build has just been run. This is a minimal list of targets for SignAndroidPackage. -->
-  <SignAndroidPackageDependsOn Condition=" '$(BuildingInsideVisualStudio)' == 'True' ">
-    BuildOnlySettings;
-    _CreatePropertiesCache;
-    ResolveReferences;
-    PrepareResources;
-    CreateSatelliteAssemblies;
-    _CopyPackage;
-    _Sign;
-    _CreateUniversalApkFromBundle;
-  </SignAndroidPackageDependsOn>
-</PropertyGroup>
 <Target Name="SignAndroidPackage" DependsOnTargets="$(SignAndroidPackageDependsOn)">
 </Target>
 
+<Target Name="DeployToDevice" DependsOnTargets="$(DeployToDeviceDependsOnTargets)" />
 
 <!-- Callable targets -->
 <PropertyGroup>
@@ -2938,18 +2920,6 @@ because xbuild doesn't support framework reference assemblies.
   <WriteLinesToFile File="$(_LldbConfigFile)" Lines="MANIFEST=$(IntermediateOutputPath)android\AndroidManifest.xml"/>
 </Target>
 
-<PropertyGroup>
-  <InstallDependsOnTargets>
-    SignAndroidPackage;
-    _DeployApk;
-    _DeployAppBundle;
-  </InstallDependsOnTargets>
-  <UninstallDependsOnTargets>
-    AndroidPrepareForBuild;
-    _Uninstall
-  </UninstallDependsOnTargets>
-</PropertyGroup>
-
 <Target Name="_DeployApk"
     Condition=" '$(AndroidPackageFormat)' != 'aab' ">
   <AndroidAdb
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index c7018a1fda0..90f8258ccf4 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -53,6 +53,31 @@ public void DotNetRun (bool isRelease, string typemapImplementation)
 			Assert.IsTrue (didLaunch, "Activity should have started.");
 		}
 
+		[Test]
+		[TestCase (true)]
+		[TestCase (false)]
+		public void DeployToDevice (bool isRelease)
+		{
+			var proj = new XamarinAndroidApplicationProject {
+				IsRelease = isRelease
+			};
+			using var builder = CreateApkBuilder ();
+			builder.Save (proj);
+
+			var dotnet = new DotNetCLI (Path.Combine (Root, builder.ProjectDirectory, proj.ProjectFilePath));
+			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
+			Assert.IsTrue (dotnet.Build ("DeployToDevice"), "`dotnet build -t:DeployToDevice` should succeed");
+
+			// Launch the app using adb
+			ClearAdbLogcat ();
+			var result = AdbStartActivity ($"{proj.PackageName}/{proj.JavaPackageName}.MainActivity");
+			Assert.IsTrue (result.Contains ("Starting: Intent"), $"Activity should have launched. adb output:\n{result}");
+
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
+				Path.Combine (Root, builder.ProjectDirectory, "logcat.log"), 30);
+			Assert.IsTrue (didLaunch, "Activity should have started.");
+		}
+
 		[Test]
 		public void ActivityAliasRuns ([Values (true, false)] bool isRelease)
 		{