From bef2d935a6a820153996bfb3ce7994176ca5f7c4 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Wed, 29 Nov 2023 09:27:22 -1000
Subject: [PATCH 1/3] Bump `xamarin-android-tools` from `bde49e6` to `4889bf0`.

---
 .../Xamarin.Android.Tools.BootstrapTasks.csproj                | 1 +
 external/xamarin-android-tools                                 | 2 +-
 .../Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj     | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
index d3ab591a159..7aef0db2ed7 100644
--- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
+++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
@@ -6,6 +6,7 @@
     <TargetFramework>$(TargetFrameworkNETStandard)</TargetFramework>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
     <OutputPath>$(BootstrapOutputDirectory)</OutputPath>
+    <_IncludeMicrosoftBuildPackage>true</_IncludeMicrosoftBuildPackage>
   </PropertyGroup>
 
   <Import Project="..\..\Configuration.props" />
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 21de3d731d0..4889bf025bf 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 21de3d731d0b0391f81f8b4397b7d6e2d3fecc74
+Subproject commit 4889bf025bf2d99775d7921266b1211240e71ba7
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
index 1f10e632927..0d6c4810e2d 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <ProjectGuid>{2DD1EE75-6D8D-4653-A800-0A24367F7F38}</ProjectGuid>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\..\product.snk</AssemblyOriginatorKeyFile>
     <NoWarn>$(NoWarn);CA1305</NoWarn>
+    <_IncludeMicrosoftBuildPackage>true</_IncludeMicrosoftBuildPackage>
   </PropertyGroup>
   <Import Project="..\..\..\..\Configuration.props" />
   <Import Project="..\..\..\..\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\MSBuildReferences.projitems" />

From 5580a89d4af21f59a92d808135e76bebd52530ff Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Thu, 30 Nov 2023 07:45:46 -1000
Subject: [PATCH 2/3] Update `System.Reflection.Metadata` and `System.CodeDom`
 packages to match new `$(MSBuildPackageReferenceVersion)`.

---
 external/xamarin-android-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 4889bf025bf..3d1934a24d8 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 4889bf025bf2d99775d7921266b1211240e71ba7
+Subproject commit 3d1934a24d8149a95c058dcb03c2976c47199561

From a5469cb1c2670d6a3b0fbaa336cc20de42d3559d Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Mon, 4 Dec 2023 11:41:06 -1000
Subject: [PATCH 3/3] Update XAT back to `main`

---
 external/xamarin-android-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 3d1934a24d8..4889bf025bf 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 3d1934a24d8149a95c058dcb03c2976c47199561
+Subproject commit 4889bf025bf2d99775d7921266b1211240e71ba7