From e86ee4c7230e608844c0e851d79fe789b313b198 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 12 Aug 2020 07:40:58 +0100 Subject: [PATCH] [LibZipSharp] Bump to Version 1.0.20 (#4976) Fixes: https://github.com/xamarin/LibZipSharp/issues/64 Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1139578 Context: https://liquid.microsoft.com/Web/Object/Read/ms.security/Requirements/Microsoft.Security.SystemsADM.10039#guide Changes: https://github.com/xamarin/libzipsharp/compare/1.0.10...1.0.20 * xamarin/LibZipSharp@1752f95: Statically Linux libzip.so (#70) * xamarin/LibZipSharp@2b1762f: Fix Dll SearchPath to include Assembly Directory. (#69) * xamarin/LibZipSharp@28b4639: Merge pull request #68 from dellis1972/fixwindowssearch * xamarin/LibZipSharp@fdabcda: Fix Windows to look in Assembly Directory for 32bit dll. * xamarin/LibZipSharp@b332af0: Fix Native Crash on Windows. (#67) * xamarin/LibZipSharp@96eb5e3: Use DefaultDllImportSearchPathsAttribute (#66) * xamarin/LibZipSharp@755a42a: Bump libzip to 1.7.3 and go back to mingw (#65) * xamarin/LibZipSharp@5ae5e70: Merge pull request #60 from xamarin/msvc-static-link * xamarin/LibZipSharp@30ff680: Build libzip with static CRT and VS2019 * xamarin/LibZipSharp@bad320e: Merge pull request #59 from dellis1972/theswitcharoo * xamarin/LibZipSharp@d7bc2c5: Merge pull request #58 from xamarin/optimize-winbuild * xamarin/LibZipSharp@34dc213: Make 64 bit Linux native lib the default. * xamarin/LibZipSharp@d3aad35: fixup! Optimize libzip build * xamarin/LibZipSharp@0970a01: Optimize libzip build * xamarin/LibZipSharp@d321af1: Merge pull request #57 from xamarin/fix-win32-packaging * xamarin/LibZipSharp@80b739d: Fix a typo which caused 64-bit dll to be packaged for 32-bit Windows * xamarin/LibZipSharp@1665db0: Bump the version (to 1.0.12), to prepare to release (#56) * xamarin/LibZipSharp@dd5e939: Throw exception instead of silently failing if zip save/close fails (#54) * xamarin/LibZipSharp@2df5b16: Fix enumerating zip with deleted entries (#53) * xamarin/LibZipSharp@a042554: Add .editorconfig, copied from xamarin-android (#55) * xamarin/LibZipSharp@a0973d4: Bump libzip to 1.6.1 (#49) Changes: https://github.com/nih-at/libzip/compare/rel-1-5-1...v1.7.3 * Context: https://libzip.org/news/release-1.7.3.html * Context: https://libzip.org/news/release-1.7.2.html * Context: https://libzip.org/news/release-1.7.1.html * Context: https://libzip.org/news/release-1.7.0.html Two primary changes of note in this xamarin/LibZipSharp bump: 1. Bump to `libzip` 1.7.3, which contains numerious fixes and improvements over the previously used 1.5.1 release. 2. Use of `DefaultDllImportSearchPathsAttribute` so that native library dependencies are loaded securely, i.e. w/o allowing "other" libraries to be loaded from unsafe directories. Unfortunately, the `libzip` bump itself caused issues, PR #4751 and PR #4937 each had integration tests "randomly" SIGSEGV. This was eventually tracked down to a bug within `libzip` itself, fixed at: * https://github.com/nih-at/libzip/pull/202 --- Configuration.props | 2 +- build-tools/debian-metadata/rules | 1 - .../Xamarin.Android.Build.Tasks.targets | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Configuration.props b/Configuration.props index a4e56f35d90..3b1558ff975 100644 --- a/Configuration.props +++ b/Configuration.props @@ -114,7 +114,7 @@ <_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled <_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle $(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName) - 1.0.10 + 1.0.20 5.4.0 diff --git a/build-tools/debian-metadata/rules b/build-tools/debian-metadata/rules index cf380523ba9..18bd49a9718 100755 --- a/build-tools/debian-metadata/rules +++ b/build-tools/debian-metadata/rules @@ -22,7 +22,6 @@ override_dh_install: rm -f bin/*/lib/xamarin.android/xbuild/Xamarin/Android/aapt2.exe rm -f bin/*/lib/xamarin.android/xbuild/Xamarin/Android/libwinpthread-1.dll rm -f bin/*/lib/xamarin.android/xbuild/Xamarin/Android/libzip.dll - rm -f bin/*/lib/xamarin.android/xbuild/Xamarin/Android/libzip.so dh_install diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index 2fad2a78b76..e583c32e903 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -399,4 +399,7 @@ /> + + +