From 6fbec9739a54a8a87a16d2185f0ee7c57b6d257e Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 25 Feb 2021 11:36:42 +0000 Subject: [PATCH 1/6] Bump LibZipSharp to 1.0.23 Changes Changes: https://github.com/xamarin/libzipsharp/compare/1.0.22...1.0.23 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1d74ab8c5c3..aa7af430103 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -25,7 +25,7 @@ - 1.0.22 + 1.0.23 0.4.1 0.11.2 5.4.0 From a7202c144e6cded8625295a0b1b8eb44cf386eda Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 25 Feb 2021 13:32:44 +0000 Subject: [PATCH 2/6] bump xamarin-android-tools submodule --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 479931ce144..ca820e5f6d7 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 479931ce1449b39c0165315fc103e7e12812f34b +Subproject commit ca820e5f6d7da08dd3f4f342bc8cdb92bf4f9bc2 From 9cf1aca8bb8aa0de61b1553585ef6407e363fbf8 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Mar 2021 13:10:55 +0000 Subject: [PATCH 3/6] include libzip.pdb in insstaller --- build-tools/installers/create-installers.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 51f3f728e0f..c85594e5e8f 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -305,7 +305,9 @@ <_MSBuildFilesWin Include="$(MSBuildSrcDir)\libzip.dll" /> + <_MSBuildFilesWin Include="$(MSBuildSrcDir)\libzip.pdb" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\lib64\libzip.dll" /> + <_MSBuildFilesWin Include="$(MSBuildSrcDir)\lib64\libzip.pdb" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\proguard\bin\proguard.bat" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\aapt2.exe" /> <_MSBuildFilesWin Include="$(MSBuildSrcDir)\ndk\aarch64-linux-android-as.exe" /> From 9901555c35213c66dc7eefaaf37ee226f36016fd Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 1 Mar 2021 13:12:14 +0000 Subject: [PATCH 4/6] test monodroid pr --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index ca820e5f6d7..554d45a166a 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit ca820e5f6d7da08dd3f4f342bc8cdb92bf4f9bc2 +Subproject commit 554d45a166a02da0ca1d0d9ca895eaa650fb648a From 6d5eeadf888e46d8b692186b14f00d2f3f8326eb Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 3 Mar 2021 17:06:33 +0000 Subject: [PATCH 5/6] 1.0.24 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index aa7af430103..e471af2ef4d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -25,7 +25,7 @@ - 1.0.23 + 1.0.24 0.4.1 0.11.2 5.4.0 From aa8a03374c404d84294b520d6208eb0abc7f82ff Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 4 Mar 2021 11:34:25 +0000 Subject: [PATCH 6/6] bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 01e4987437b..6cd2d477652 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@dade1f497271f3ae5ceb1fe8c6c672b399a369ec +xamarin/monodroid:main@e6f0c0ffa19fed461f137ce735882c736dc8764e mono/mono:2020-02@c66141a8c7ba2566c578c2dd012b2b723e006213