From 639506d2fb75ceb090ed587f90737651a9167ebd Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 2 Jun 2020 10:33:10 +0100
Subject: [PATCH 1/3] [LibZipSharp] Bump to Version 1.0.20

---
 Configuration.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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</_TestsProfiledAotName>
     <_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
     <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
-    <LibZipSharpVersion>1.0.10</LibZipSharpVersion>
+    <LibZipSharpVersion>1.0.20</LibZipSharpVersion>
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

From 87ba4f7200db6e47f8e0c12fb96a098629d17896 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 11 Aug 2020 11:42:42 +0100
Subject: [PATCH 2/3] Try to fix OSS Linux build

---
 .../Xamarin.Android.Build.Tasks.targets                        | 3 +++
 1 file changed, 3 insertions(+)

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 @@
     />
   </Target>
 
+  <Target Name="_Remove32BitLinux" Condition="Exists ('$(OutputPath)lib32\libzip.so')" AfterTargets="CopyFilesToOutputDirectory">
+    <Delete Files="$(OutputPath)lib32\libzip.so" />
+  </Target>
 </Project>

From 69e171c7f4be3eabe4a1f791a31ef976d00982d6 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 11 Aug 2020 13:16:25 +0100
Subject: [PATCH 3/3] Try this

---
 build-tools/debian-metadata/rules | 1 -
 1 file changed, 1 deletion(-)

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