From 249a51c1615d78faeb8f1e1ffb6698305099b0b8 Mon Sep 17 00:00:00 2001
From: Juan Marcelo Tondato <jumarcel@microsoft.com>
Date: Thu, 9 Nov 2023 13:43:35 -0300
Subject: [PATCH 1/4] Bump android-sdk platforms-tools to version 34.0.5

That revison is available on Xamarin Android Feed for d17.9
---
 .../Xamarin.Android.Tools.Versions.props                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
index d93900e..9a06185 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
+++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
@@ -11,7 +11,7 @@
     -->
     <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">32.0.0</AndroidSdkBuildToolsVersion>
     <AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">7.0</AndroidCommandLineToolsVersion>
-    <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">34.0.1</AndroidSdkPlatformToolsVersion>
+    <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">34.0.5</AndroidSdkPlatformToolsVersion>
     <AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
     <AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-34</AndroidSdkPlatformVersion>
     <AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">24.0.8215888</AndroidNdkVersion>

From 2cfcb93af53440c365fde41ed02e345d1a0c1127 Mon Sep 17 00:00:00 2001
From: Juan Marcelo Tondato <jumarcel@microsoft.com>
Date: Thu, 9 Nov 2023 13:45:26 -0300
Subject: [PATCH 2/4] Bump android-sdk cmdline-tools to version 11.0

That version is available on Xamarin Android feed for d17.9

Enables the posibility to creates avd for pixel 6/7 on Visual Studio Device Manager tool
---
 .../Xamarin.Android.Tools.Versions.props                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
index 9a06185..5d6c749 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
+++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
@@ -10,7 +10,7 @@
     along with any other repo which references androidtools.
     -->
     <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">32.0.0</AndroidSdkBuildToolsVersion>
-    <AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">7.0</AndroidCommandLineToolsVersion>
+    <AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">11.0</AndroidCommandLineToolsVersion>
     <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">34.0.5</AndroidSdkPlatformToolsVersion>
     <AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
     <AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-34</AndroidSdkPlatformVersion>

From ae370bff298e186e0f64a38ee45f88465af4920e Mon Sep 17 00:00:00 2001
From: Juan Marcelo Tondato <jumarcel@microsoft.com>
Date: Wed, 15 Nov 2023 22:22:13 -0300
Subject: [PATCH 3/4] Bump android-sdk build-tool version to 34.0.0

---
 .../Xamarin.Android.Tools.Versions.props                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
index 5d6c749..f05391c 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
+++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
@@ -9,7 +9,7 @@
     If this file is changed the submodule for androidtools should be updated,
     along with any other repo which references androidtools.
     -->
-    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">32.0.0</AndroidSdkBuildToolsVersion>
+    <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">34.0.0</AndroidSdkBuildToolsVersion>
     <AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">11.0</AndroidCommandLineToolsVersion>
     <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">34.0.5</AndroidSdkPlatformToolsVersion>
     <AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>

From d6f1453f58c9642614c5db1a0613866d78010a8e Mon Sep 17 00:00:00 2001
From: Juan Marcelo Tondato <jumarcel@microsoft.com>
Date: Wed, 15 Nov 2023 22:23:00 -0300
Subject: [PATCH 4/4] Bump android-sdk NDK version to 26.1.10909125

---
 .../Xamarin.Android.Tools.Versions.props                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
index f05391c..13e6387 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
+++ b/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
@@ -14,7 +14,7 @@
     <AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">34.0.5</AndroidSdkPlatformToolsVersion>
     <AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
     <AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-34</AndroidSdkPlatformVersion>
-    <AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">24.0.8215888</AndroidNdkVersion>
+    <AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">26.1.10909125</AndroidNdkVersion>
 
     <!-- obsolete; should consider removing eventually -->
     <AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>