Skip to content

Commit

Permalink
Branching for d16-10; Bump $(ProductVersion) to 11.3.0
Browse files Browse the repository at this point in the history
Xamarin.Android v11.3.0 will be shipped as part of
Visual Studio 2019 16.10 Preview 3 and subsequent releases.

Changes: mono/debugger-libs@8bf09ce...08268b7

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

Changes: dotnet/java-interop@f9faaab...f39db25

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

Changes: xamarin/monodroid@76c04cd...69e9111

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

Changes: dotnet/android-tools@d92fc3e...c5732a0

  * dotnet/android-tools@c5732a0: [Xamarin.Android.Tools.AndroidSdk] Support Microsoft Dist JDK (#117)
  * dotnet/android-tools@52ef989: [Xamarin.Android.Tools.AndroidSdk] Fix CS0168 warning (#116)
  • Loading branch information
jonpryor committed Apr 26, 2021
1 parent eac74eb commit 496a43a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@76c04cd15eca7afc269a6d26296e9d2db6f79be2
xamarin/monodroid:d16-10@69e911139ca5b15972dbdfe261778d205144e7a6
mono/mono:2020-02@b4a385816ed4f1398d0184c38f19f560e868fd80
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
2 changes: 1 addition & 1 deletion external/xamarin-android-tools

0 comments on commit 496a43a

Please sign in to comment.