From 66f723e6e33d48b1a701fb8898ba9f91681c9776 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 08:45:51 -0500
Subject: [PATCH 1/5] [build] set `$(PackageVersionSuffix)` for
 dotnet/android-tools

Context: https://github.com/dotnet/android-tools/pull/259

This adds the suffix:

    <PackageVersionSuffix>-preview.$(PackVersionCommitCount)</PackageVersionSuffix>

In order to allow the package to be published as a "transport" package
with a non-stable version:

    packages\microsoft.dotnet.arcade.sdk\10.0.0-beta.25367.5\tools\SdkTasks\PublishArtifactsInManifest.proj(124,5): error :
    Package 'Xamarin.Android.Tools.AndroidSdk' has stable version '1.0.104' but is targeted at a non-isolated feed 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json'
---
 external/xamarin-android-tools                | 2 +-
 external/xamarin-android-tools.override.props | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 975f894882a..68ea438d18e 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 975f894882a2f7dde13e734529495557ac8cd496
+Subproject commit 68ea438d18e0c0a7310b9187f4c8ac1f70ed5d60
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
index 660c5ffd086..a734524a0ff 100644
--- a/external/xamarin-android-tools.override.props
+++ b/external/xamarin-android-tools.override.props
@@ -1,6 +1,8 @@
 <Project>
   <!-- Import $(LibZipSharpVersion) -->
   <Import Project="..\Directory.Build.props" />
+  <Import Project="..\Configuration.props" />
+  <Import Project="..\build-tools\scripts\XAVersionInfo.targets" />
   <PropertyGroup>
     <AndroidToolsDisableMultiTargeting>true</AndroidToolsDisableMultiTargeting>
     <PackageOutputPath>$(MSBuildThisFileDirectory)..\bin\Build$(Configuration)\nuget-unsigned\</PackageOutputPath>
@@ -9,4 +11,9 @@
       https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
     </RestoreAdditionalProjectSources>
   </PropertyGroup>
+  <Target Name="_GetXAVersionInfo" BeforeTargets="SetVersion" DependsOnTargets="GetXAVersionInfo">
+    <PropertyGroup>
+      <PackageVersionSuffix>-preview.$(PackVersionCommitCount)</PackageVersionSuffix>
+    </PropertyGroup>
+  </Target>
 </Project>

From 8fe4a213dbbd148071d43c61aac740ecb34d3b2f Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 08:56:46 -0500
Subject: [PATCH 2/5] Update xamarin-android-tools.override.props

---
 external/xamarin-android-tools.override.props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
index a734524a0ff..32197f76a66 100644
--- a/external/xamarin-android-tools.override.props
+++ b/external/xamarin-android-tools.override.props
@@ -11,7 +11,10 @@
       https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
     </RestoreAdditionalProjectSources>
   </PropertyGroup>
-  <Target Name="_GetXAVersionInfo" BeforeTargets="SetVersion" DependsOnTargets="GetXAVersionInfo">
+  <Target Name="_GetXAVersionInfo"
+      Condition="Exists('$(PrepTasksAssembly)')"
+      BeforeTargets="SetVersion"
+      DependsOnTargets="GetXAVersionInfo">
     <PropertyGroup>
       <PackageVersionSuffix>-preview.$(PackVersionCommitCount)</PackageVersionSuffix>
     </PropertyGroup>

From f67ed80ebef1341b3aa9b7bd74c780415b7bfb3a Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 10:34:56 -0500
Subject: [PATCH 3/5] Use `TaskFactory="TaskHostFactory"`

Context: https://github.com/rainersigwald/build-task-in-solution-demo/blob/master/Task/DemoFunctionality.targets

Fixes:

(_CopyFilesMarkedCopyLocal target) ->
         C:\a\_work\1\s\bin\Release\dotnet\sdk\10.0.100-preview.7.25368.105\Microsoft.Common.CurrentVersion.targets(5080,5): error MSB3027: Could not copy "C:\a\_work\1\s\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\bin\Release\netstandard2.0\Microsoft.Android.Build.BaseTasks.dll" to "C:\a\_work\1\s\bin\BuildRelease\netstandard2.0\Microsoft.Android.Build.BaseTasks.dll". Exceeded retry count of 10. Failed. The file is locked by: ".NET Host (8356)" [C:\a\_work\1\s\build-tools\xa-prep-tasks\xa-prep-tasks.csproj]
         C:\a\_work\1\s\bin\Release\dotnet\sdk\10.0.100-preview.7.25368.105\Microsoft.Common.CurrentVersion.targets(5080,5): error MSB3021: Unable to copy file "C:\a\_work\1\s\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\bin\Release\netstandard2.0\Microsoft.Android.Build.BaseTasks.dll" to "C:\a\_work\1\s\bin\BuildRelease\netstandard2.0\Microsoft.Android.Build.BaseTasks.dll". The process cannot access the file 'C:\a\_work\1\s\bin\BuildRelease\netstandard2.0\Microsoft.Android.Build.BaseTasks.dll' because it is being used by another process. [C:\a\_work\1\s\build-tools\xa-prep-tasks\xa-prep-tasks.csproj]
---
 build-tools/scripts/XAVersionInfo.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets
index 292b67cf41b..32e867a06ee 100644
--- a/build-tools/scripts/XAVersionInfo.targets
+++ b/build-tools/scripts/XAVersionInfo.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" TaskFactory="TaskHostFactory" />
   <Target Name="_GetSubmodulesVersionInfo">
     <ItemGroup>
       <!-- If anything changes in this list, make sure to update:

From b3b0e02f3f203478381c47eec30841e3c776fdf6 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 11:22:33 -0500
Subject: [PATCH 4/5] Revert "Use `TaskFactory="TaskHostFactory"`"

This reverts commit f67ed80ebef1341b3aa9b7bd74c780415b7bfb3a.
---
 build-tools/scripts/XAVersionInfo.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets
index 32e867a06ee..292b67cf41b 100644
--- a/build-tools/scripts/XAVersionInfo.targets
+++ b/build-tools/scripts/XAVersionInfo.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" TaskFactory="TaskHostFactory" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" TaskFactory="TaskHostFactory" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" TaskFactory="TaskHostFactory" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" TaskFactory="TaskHostFactory" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" TaskFactory="TaskHostFactory" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" TaskFactory="TaskHostFactory" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" />
   <Target Name="_GetSubmodulesVersionInfo">
     <ItemGroup>
       <!-- If anything changes in this list, make sure to update:

From 1a4477c8aa4a18e2d7a665ee57961a0b846cdad1 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 23 Jul 2025 11:24:37 -0500
Subject: [PATCH 5/5] Only set android-tools version when packing

---
 build-tools/create-packs/Directory.Build.targets | 2 +-
 external/xamarin-android-tools.override.props    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 6f3c5435186..a0718dccb76 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -60,7 +60,7 @@
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Windows.binlog&quot; -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.NET.Sdk.Android.binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Templates.binlog&quot; &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
+    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:IsPacking=true &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
     <ReplaceFileContents
         SourceFile="vs-workload.in.props"
         DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
index 32197f76a66..b31cecbfd98 100644
--- a/external/xamarin-android-tools.override.props
+++ b/external/xamarin-android-tools.override.props
@@ -12,7 +12,7 @@
     </RestoreAdditionalProjectSources>
   </PropertyGroup>
   <Target Name="_GetXAVersionInfo"
-      Condition="Exists('$(PrepTasksAssembly)')"
+      Condition=" '$(IsPacking)' == 'true' "
       BeforeTargets="SetVersion"
       DependsOnTargets="GetXAVersionInfo">
     <PropertyGroup>