From 030cd63c06d95a6b0d0f563fe9b9d537f84cb84b Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Tue, 28 Jun 2022 15:05:55 -0400
Subject: [PATCH] Branching for d17-2; Bump $(ProductVersion) to 13.0.0

Xamarin.Android v13.0.0 will be shipped as part of
Visual Studio 2022 17.3 Preview 3 and subsequent releases.

Changes: https://github.com/xamarin/monodroid/compare/1e6734feac26a86541232c5073ace2fe9dee7569...d46d4cc13bbc282bee55cc8c890910eb04c2595b

  * xamarin/monodroid@d46d4cc13: Branching for d17-3

Changes: https://github.com/xamarin/xamarin-android-tools/compare/9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef...14076a6c4f79c6e6a38eb83d122a36021fa9676c

  * xamarin/xamarin-android-tools@14076a6 [Xamarin.Android.Tools.AndroidSdk] Add API-32 to KnownVersions
---
 .external                      | 2 +-
 .gitmodules                    | 4 ++--
 Directory.Build.props          | 2 +-
 external/xamarin-android-tools | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.external b/.external
index 360e85ba4b1..6176eff7c44 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@1e6734feac26a86541232c5073ace2fe9dee7569
+xamarin/monodroid:d17-3@d46d4cc13bbc282bee55cc8c890910eb04c2595b
 mono/mono:2020-02@dffa5ab92245f2419238a35b7c2052e9a24036b4
diff --git a/.gitmodules b/.gitmodules
index f8838a54d10..fb58dd4859f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = main
+    branch = d17-3
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
@@ -41,4 +41,4 @@
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
     url = https://github.com/xamarin/xamarin-android-tools
-    branch = main
+    branch = d17-3
diff --git a/Directory.Build.props b/Directory.Build.props
index 8be03bb468e..cc2578e8f75 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProductVersion>12.3.99</ProductVersion>
+    <ProductVersion>13.0.0</ProductVersion>
     <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
          Rules:
          * Major/Minor match Android stable API level, such as 30.0 for API 30.
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 9c641b3e08e..14076a6c4f7 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef
+Subproject commit 14076a6c4f79c6e6a38eb83d122a36021fa9676c