From 028cc94f9d26fec3432c5e63d3eb52f4792ae057 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 9 Dec 2025 14:31:19 -0600
Subject: [PATCH 1/3] [xabt] `ComputeRunArguments` target no longer needs to
 deploy

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

When the `DeployToDevice` target is run by the `dotnet run` pipeline,
we will no longer need to make the `ComputeRunArguments` target deploy
anything.

We are thinking this feature can ship in future .NET 11 and 10.0.200
SDKs.
---
 .../targets/Microsoft.Android.Sdk.Application.targets        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
index b28e987017f..28c7faed9bd 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
@@ -22,7 +22,10 @@ This file contains targets specific for Android application projects.
       Install;
       StartAndroidActivity;
     </_RunDependsOn>
-    <_AndroidComputeRunArgumentsDependsOn>
+    <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionGreaterThanOrEquals($(NetCoreSdkVersion), 10.0.200))">
+      _ResolveMonoAndroidSdks;
+    </_AndroidComputeRunArgumentsDependsOn>
+    <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionLessThan($(NetCoreSdkVersion), 10.0.200))">
       Install;
     </_AndroidComputeRunArgumentsDependsOn>
   </PropertyGroup>

From 1c408d8effece7df0c1277a0e5987337f600fdb4 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 9 Dec 2025 15:42:52 -0600
Subject: [PATCH 2/3] Update Microsoft.Android.Sdk.Application.targets

---
 .../targets/Microsoft.Android.Sdk.Application.targets            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
index 28c7faed9bd..9d94a16ea84 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
@@ -24,6 +24,7 @@ This file contains targets specific for Android application projects.
     </_RunDependsOn>
     <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionGreaterThanOrEquals($(NetCoreSdkVersion), 10.0.200))">
       _ResolveMonoAndroidSdks;
+      _GetAndroidPackageName;
     </_AndroidComputeRunArgumentsDependsOn>
     <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionLessThan($(NetCoreSdkVersion), 10.0.200))">
       Install;

From 4e3b4bade14197e44970c15fc8e07622d6f64ae4 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 6 Jan 2026 16:28:33 -0600
Subject: [PATCH 3/3] Update Microsoft.Android.Sdk.Application.targets

---
 .../targets/Microsoft.Android.Sdk.Application.targets        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
index a15ebf4997b..bbc31157d0c 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets
@@ -22,13 +22,10 @@ This file contains targets specific for Android application projects.
       Install;
       StartAndroidActivity;
     </_RunDependsOn>
-    <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionGreaterThanOrEquals($(NetCoreSdkVersion), 10.0.200))">
+    <_AndroidComputeRunArgumentsDependsOn Condition=" '$(_AndroidComputeRunArgumentsDependsOn)' == '' ">
       _ResolveMonoAndroidSdks;
       _GetAndroidPackageName;
     </_AndroidComputeRunArgumentsDependsOn>
-    <_AndroidComputeRunArgumentsDependsOn Condition="$([MSBuild]::VersionLessThan($(NetCoreSdkVersion), 10.0.200))">
-      Install;
-    </_AndroidComputeRunArgumentsDependsOn>
   </PropertyGroup>
 
   <!--