From 35d70842a4fb4539810ab19b22316ef7f5c137fb Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Mon, 26 Apr 2021 21:41:59 -0400
Subject: [PATCH] Bump $(ProductVersion) to 11.3.99 (#5876)

(Commercial) Xamarin.Android v11.3 is being tracked in the
[xamarin-android/d16-10][0] branch, which was branched from
commit eac74ebb.

Bump `$(ProductVersion)` to 11.3.99 to track development progress of
the *next* version of Xamarin.Android.

Additionally, bump various submodules to their "main" equivalents
to mirror the d16-10 branch commit 496a43a5, and update `.gitmodules`
so that the correct branch name is used:

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/mono/opentk/compare/933939da123a3fe4a040d57a589b43af99175037...50128f7a636472e202ff6717b62b820c8ca427c2

  * mono/opentk@50128f7a: Create Xamarin.Legacy.OpenTK Nuget Package (#28)
  * mono/opentk@72f4b085: Merge pull request #26 from dellis1972/ci
  * mono/opentk@b8fd3d2f: Fix Path issue
  * mono/opentk@62fd3b17: Clean up
  * mono/opentk@3a1a53c7: Add missing files. Update .gitignore
  * mono/opentk@e657cf71: Build with dotnet
  * mono/opentk@6e9a6160: Switch to using Xamarin.Legacy.Sdk
  * mono/opentk@a46a0668: rework
  * mono/opentk@cdae43e0: Initial Commit for Building Android

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)

[0]: https://github.com/xamarin/xamarin-android/commits/d16-10
---
 .gitmodules                    | 6 +++---
 Directory.Build.props          | 2 +-
 external/debugger-libs         | 2 +-
 external/opentk                | 2 +-
 external/xamarin-android-tools | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 871f85b513b..83c95bab23b 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 = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = master
+    branch = main
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
@@ -29,7 +29,7 @@
 [submodule "external/opentk"]
     path = external/opentk
     url = https://github.com/mono/opentk.git
-    branch = master
+    branch = main
 [submodule "external/proguard"]
     path = external/proguard
     url = https://github.com/Guardsquare/proguard.git
diff --git a/Directory.Build.props b/Directory.Build.props
index e471af2ef4d..f61b76e7dcd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProductVersion>11.2.99</ProductVersion>
+    <ProductVersion>11.3.99</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/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/opentk b/external/opentk
index 933939da123..50128f7a636 160000
--- a/external/opentk
+++ b/external/opentk
@@ -1 +1 @@
-Subproject commit 933939da123a3fe4a040d57a589b43af99175037
+Subproject commit 50128f7a636472e202ff6717b62b820c8ca427c2
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