From e8d1ca88fb5e11e32ce9af598855f1723902309d Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 20 Jan 2020 13:32:51 +0000
Subject: [PATCH 1/5] [Build] Bump Xamarin.LibZipSharp to 1.0.7

Fixes #4100

The version of libzip.so we shipped for linux in
1.0.6 had a dependency on libcrypto.so.1.1. Some
linux based systems only ship with libcrypto.so.1.0.
As a result Xamarin.Android would not build and we give
the following error.

	error MSB4018: System.DllNotFoundException: lib64/libzip.so assembly

Verison 1.0.7 if Xamarin.LibZipSharp fixes this issue by
statically linking libcrypto (and other dependencies) into the
dynamic library. This should allow Xamarin.Android to build and
run on those systems which does not include libcrypto or have
an older version.
---
 build-tools/scripts/MSBuildReferences.projitems                 | 2 +-
 build-tools/xaprepare/xaprepare/xaprepare.csproj                | 2 +-
 .../Xamarin.Android.Tools.JavadocImporter.csproj                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-tools/scripts/MSBuildReferences.projitems b/build-tools/scripts/MSBuildReferences.projitems
index 2043be1d37f..30d59ba1c1b 100644
--- a/build-tools/scripts/MSBuildReferences.projitems
+++ b/build-tools/scripts/MSBuildReferences.projitems
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" IncludeAssets="compile"/>
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="Xamarin.Build.AsyncTask" Version="0.3.4" />
-    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.6" />
+    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.7" />
   </ItemGroup>
   <ItemGroup>
     <!-- Copy system Microsoft.Build*.dll and dependencies for tests to run against. We can remove this
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
index 81d59485f1e..fbe2b13c59e 100644
--- a/build-tools/xaprepare/xaprepare/xaprepare.csproj
+++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -281,7 +281,7 @@
       <Version>5.3.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.LibZipSharp">
-      <Version>1.0.6</Version>
+      <Version>1.0.7</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
index 81935e2e8d7..0e581df383d 100644
--- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
+++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
@@ -74,7 +74,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Xml.SgmlReader" Version="1.8.14" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.6" />
+    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.7" />
   </ItemGroup>
   <Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
   <Import Project="..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />

From 0f7c1e40f2db1284897686a9e9ed47d6bcfeb5dc Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 20 Jan 2020 14:02:31 +0000
Subject: [PATCH 2/5] Fix Third Party Notices

---
 .../xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
index 2d319f50c73..54ebaecde82 100644
--- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
+++ b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
@@ -8,7 +8,7 @@ namespace Xamarin.Android.Prepare
 	class LibZipSharp_grendello_LibZipSharp_TPN : ThirdPartyNotice
 	{
 		static readonly Uri url = new Uri ("https://github.com/xamarin/LibZipSharp/");
-		internal static readonly string LibZipSharpVersion = "1.0.6";
+		internal static readonly string LibZipSharpVersion = "1.0.7";
 		static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
 			"packages", "xamarin.libzipsharp", LibZipSharpVersion,
 			"Licences", "LICENSE");

From 217c0ee51a56e8d74d492d03a5f64f358769a76a Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 20 Jan 2020 14:25:55 +0000
Subject: [PATCH 3/5] Move the LibZipSharp version number to a central location

---
 Configuration.props                                      | 1 +
 build-tools/scripts/MSBuildReferences.projitems          | 2 +-
 .../xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs | 9 +++++++--
 build-tools/xaprepare/xaprepare/xaprepare.csproj         | 2 +-
 .../Xamarin.Android.Tools.JavadocImporter.csproj         | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index 967a3464a6d..e708ea9c840 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -108,6 +108,7 @@
     <_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled</_TestsProfiledAotName>
     <_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
     <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
+    <LibZipSharpVersion>1.0.7</LibZipSharpVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MingwCommandPrefix32>i686-w64-mingw32</MingwCommandPrefix32>
diff --git a/build-tools/scripts/MSBuildReferences.projitems b/build-tools/scripts/MSBuildReferences.projitems
index 30d59ba1c1b..a1c22b31169 100644
--- a/build-tools/scripts/MSBuildReferences.projitems
+++ b/build-tools/scripts/MSBuildReferences.projitems
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" IncludeAssets="compile"/>
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="Xamarin.Build.AsyncTask" Version="0.3.4" />
-    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.7" />
+    <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
   </ItemGroup>
   <ItemGroup>
     <!-- Copy system Microsoft.Build*.dll and dependencies for tests to run against. We can remove this
diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
index 54ebaecde82..9d8e82995f8 100644
--- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
+++ b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Xamarin.Android.Prepare
 {
@@ -8,9 +10,12 @@ namespace Xamarin.Android.Prepare
 	class LibZipSharp_grendello_LibZipSharp_TPN : ThirdPartyNotice
 	{
 		static readonly Uri url = new Uri ("https://github.com/xamarin/LibZipSharp/");
-		internal static readonly string LibZipSharpVersion = "1.0.7";
+		internal static readonly string LibZipSharpVersion => {
+			var doc = XDocumment.Load (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Configuration.props"));
+			return doc.Descendants(XName.Get("LibZipSharpVersion", @"http://schemas.microsoft.com/developer/msbuild/2003")).First().Value;
+		};
 		static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
-			"packages", "xamarin.libzipsharp", LibZipSharpVersion,
+			"packages", "xamarin.libzipsharp", LibZipSharpVersion (),
 			"Licences", "LICENSE");
 
 		public override string LicenseFile => licenseFile;
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
index fbe2b13c59e..6abfd3699aa 100644
--- a/build-tools/xaprepare/xaprepare/xaprepare.csproj
+++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -281,7 +281,7 @@
       <Version>5.3.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.LibZipSharp">
-      <Version>1.0.7</Version>
+      <Version>$(LibZipSharpVersion)</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
index 0e581df383d..2e0a5e4f7b7 100644
--- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
+++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj
@@ -74,7 +74,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Xml.SgmlReader" Version="1.8.14" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="Xamarin.LibZipSharp" Version="1.0.7" />
+    <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" />
   </ItemGroup>
   <Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
   <Import Project="..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />

From 5f6cac6c5841782ea0da7c61d2a71727b20daa97 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 20 Jan 2020 14:26:46 +0000
Subject: [PATCH 4/5] Fix Typo

---
 .../xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
index 9d8e82995f8..e806120f482 100644
--- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
+++ b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
@@ -11,7 +11,7 @@ class LibZipSharp_grendello_LibZipSharp_TPN : ThirdPartyNotice
 	{
 		static readonly Uri url = new Uri ("https://github.com/xamarin/LibZipSharp/");
 		internal static readonly string LibZipSharpVersion => {
-			var doc = XDocumment.Load (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Configuration.props"));
+			var doc = XDocument.Load (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Configuration.props"));
 			return doc.Descendants(XName.Get("LibZipSharpVersion", @"http://schemas.microsoft.com/developer/msbuild/2003")).First().Value;
 		};
 		static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,

From fa12081e326db5e08a0843c3aca48b46bb7eea59 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 20 Jan 2020 14:34:00 +0000
Subject: [PATCH 5/5] Fix typo's

---
 .../xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs   | 7 ++++---
 .../xaprepare/xaprepare/ThirdPartyNotices/libzip.cs        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
index e806120f482..96f4d305499 100644
--- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
+++ b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/LibZipSharp.cs
@@ -7,13 +7,14 @@
 namespace Xamarin.Android.Prepare
 {
 	[TPN]
-	class LibZipSharp_grendello_LibZipSharp_TPN : ThirdPartyNotice
+	class LibZipSharp_xamarin_LibZipSharp_TPN : ThirdPartyNotice
 	{
 		static readonly Uri url = new Uri ("https://github.com/xamarin/LibZipSharp/");
-		internal static readonly string LibZipSharpVersion => {
+		internal static string LibZipSharpVersion ()
+		{
 			var doc = XDocument.Load (Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Configuration.props"));
 			return doc.Descendants(XName.Get("LibZipSharpVersion", @"http://schemas.microsoft.com/developer/msbuild/2003")).First().Value;
-		};
+		}
 		static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
 			"packages", "xamarin.libzipsharp", LibZipSharpVersion (),
 			"Licences", "LICENSE");
diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/libzip.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/libzip.cs
index 0df5bf85e6b..1cec9070be5 100644
--- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/libzip.cs
+++ b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/libzip.cs
@@ -9,7 +9,7 @@ class libzip_nih_at_libzip_TPN : ThirdPartyNotice
 	{
 		static readonly Uri url = new Uri ("https://github.com/nih-at/libzip/");
 		static readonly string licenseFile = Path.Combine (BuildPaths.XamarinAndroidSourceRoot,
-			"packages", "xamarin.libzipsharp", LibZipSharp_grendello_LibZipSharp_TPN.LibZipSharpVersion,
+			"packages", "xamarin.libzipsharp", LibZipSharp_xamarin_LibZipSharp_TPN.LibZipSharpVersion (),
 			"Licences", "libzip", "LICENSE");
 
 		public override string LicenseFile => licenseFile;