From 2b6b98189a619f6ee56ff34722fa9b2d5a2918ad Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Fri, 3 Mar 2023 19:25:30 -0500
Subject: [PATCH 1/4] Try building with platform-tools 34.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Does It Build™?
---
 Configuration.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration.props b/Configuration.props
index a881c28cc21..f57e4f12038 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -146,7 +146,7 @@
     <XABuildTools30Version>30.0.3</XABuildTools30Version>
     <XABuildTools30Folder Condition="'$(XABuildTools30Folder)' == ''">30.0.3</XABuildTools30Folder>
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
-    <XAPlatformToolsVersion>32.0.0</XAPlatformToolsVersion>
+    <XAPlatformToolsVersion>34.0.0</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
     <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.8.1</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>

From 4c74084a19277c8d70c59cf7cd73446eea50b49e Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Mon, 10 Apr 2023 14:55:45 -0400
Subject: [PATCH 2/4] Try platform-tools 34.0.1!

---
 Configuration.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration.props b/Configuration.props
index f57e4f12038..451c969b5a9 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -146,7 +146,7 @@
     <XABuildTools30Version>30.0.3</XABuildTools30Version>
     <XABuildTools30Folder Condition="'$(XABuildTools30Folder)' == ''">30.0.3</XABuildTools30Folder>
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
-    <XAPlatformToolsVersion>34.0.0</XAPlatformToolsVersion>
+    <XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
     <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.8.1</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>

From 2b69fa0f02f1cb6376fa8c27f07771207d029784 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Mon, 10 Apr 2023 14:57:53 -0400
Subject: [PATCH 3/4] Also try xamarin/xamarin-android-tools#203

---
 .gitmodules                    | 4 ++--
 external/xamarin-android-tools | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 53706ac5d07..f0fa0a303a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,5 +32,5 @@
     branch = master
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
-    url = https://github.com/xamarin/xamarin-android-tools
-    branch = main
+    url = https://github.com/dellis1972/xamarin-android-tools
+    branch = bumppt
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index dbe42bf1688..2c61e2ae4c6 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit dbe42bf1688e79e1ca474dff4a1f8060158cafd9
+Subproject commit 2c61e2ae4c6fdd99d32ad27d7333d236f5cedfc1

From 8b898fa8de7c9e0274351b3901441b500b42349b Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 19 Apr 2023 13:59:00 -0400
Subject: [PATCH 4/4] Bump to xamarin/xamarin-android-tools/main@8bc07503

Changes: http://github.com/xamarin/xamarin-android-tools/compare/dbe42bf1688e79e1ca474dff4a1f8060158cafd9...8bc075035818e7731df79ec688e2c6b154a29b4f

  * xamarin/xamarin-android-tools@8bc0750: [Xamarin.Android.Tools.AndroidSdk] Update platform-tools for API-T (xamarin/xamarin-android-tools#203)
---
 .gitmodules                    | 4 ++--
 external/xamarin-android-tools | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f0fa0a303a1..53706ac5d07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,5 +32,5 @@
     branch = master
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
-    url = https://github.com/dellis1972/xamarin-android-tools
-    branch = bumppt
+    url = https://github.com/xamarin/xamarin-android-tools
+    branch = main
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 2c61e2ae4c6..8bc07503581 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 2c61e2ae4c6fdd99d32ad27d7333d236f5cedfc1
+Subproject commit 8bc075035818e7731df79ec688e2c6b154a29b4f