From 496a43a5613062dab19fc3bd92af80bd82cefe19 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Mon, 26 Apr 2021 19:21:52 -0400
Subject: [PATCH] Branching for d16-10; Bump $(ProductVersion) to 11.3.0

Xamarin.Android v11.3.0 will be shipped as part of
Visual Studio 2019 16.10 Preview 3 and subsequent releases.

Changes: https://github.com/mono/debugger-libs/compare/8bf09ce96132b74e416ed9a9c332b6e7b6de1234...08268b730a73cca0e3b3ac9c703f0b773a3be25b

  * mono/debugger-libs@08268b7: Add Module.ApplyChanges (#342)
  * mono/debugger-libs@1b5a55a: Fix assembly version after converting projects to SDK style

Changes: https://github.com/xamarin/Java.Interop/compare/f9faaaba0ca2f3721ea1de33fd793edeae059474...f39db25c7364f1e406be80ccaffda8e2366adfba

  * xamarin/Java.Interop@f39db25c: Branching for d16-10.
  * xamarin/Java.Interop@f4e68b5b: [generator] Separate metadata fixup step from parsing step. (#822)

Changes: https://github.com/xamarin/monodroid/compare/76c04cd15eca7afc269a6d26296e9d2db6f79be2...69e911139ca5b15972dbdfe261778d205144e7a6

  * xamarin/monodroid@69e911139: Branching for d16-10.
  * xamarin/monodroid@9f9ee378c: [tools/msbuild] Missing translations for XA0135 (#1198)

Changes: https://github.com/xamarin/xamarin-android-tools/compare/d92fc3e3a27e8240551baa813b15d6bf006a5620...c5732a0e9f4bd4176f43b0568880cfe453fc78de

  * xamarin/xamarin-android-tools@c5732a0: [Xamarin.Android.Tools.AndroidSdk] Support Microsoft Dist JDK (#117)
  * xamarin/xamarin-android-tools@52ef989: [Xamarin.Android.Tools.AndroidSdk] Fix CS0168 warning (#116)
---
 .external                      | 2 +-
 .gitmodules                    | 6 +++---
 Directory.Build.props          | 2 +-
 external/Java.Interop          | 2 +-
 external/debugger-libs         | 2 +-
 external/xamarin-android-tools | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.external b/.external
index a00968df90a..e78e890049b 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@76c04cd15eca7afc269a6d26296e9d2db6f79be2
+xamarin/monodroid:d16-10@69e911139ca5b15972dbdfe261778d205144e7a6
 mono/mono:2020-02@b4a385816ed4f1398d0184c38f19f560e868fd80
diff --git a/.gitmodules b/.gitmodules
index 871f85b513b..2e9899d1ff1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,11 +9,11 @@
 [submodule "external/debugger-libs"]
     path = external/debugger-libs
     url = https://github.com/mono/debugger-libs
-    branch = master
+    branch = d16-10
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = master
+    branch = d16-10
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
@@ -46,4 +46,4 @@
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
     url = https://github.com/xamarin/xamarin-android-tools
-    branch = main
+    branch = d16-10
diff --git a/Directory.Build.props b/Directory.Build.props
index e471af2ef4d..56e942c6dc5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProductVersion>11.2.99</ProductVersion>
+    <ProductVersion>11.3.0</ProductVersion>
     <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
          Rules:
          * Reset patch version (third number) to 100 every time either major or minor version is bumped.
diff --git a/external/Java.Interop b/external/Java.Interop
index f9faaaba0ca..f39db25c736 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit f9faaaba0ca2f3721ea1de33fd793edeae059474
+Subproject commit f39db25c7364f1e406be80ccaffda8e2366adfba
diff --git a/external/debugger-libs b/external/debugger-libs
index 8bf09ce9613..08268b730a7 160000
--- a/external/debugger-libs
+++ b/external/debugger-libs
@@ -1 +1 @@
-Subproject commit 8bf09ce96132b74e416ed9a9c332b6e7b6de1234
+Subproject commit 08268b730a73cca0e3b3ac9c703f0b773a3be25b
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index d92fc3e3a27..c5732a0e9f4 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit d92fc3e3a27e8240551baa813b15d6bf006a5620
+Subproject commit c5732a0e9f4bd4176f43b0568880cfe453fc78de