Bump to xamarin/LibZipSharp/1.0.22@9f563dd1 (dotnet#5067)

Changes: dotnet/android-libzipsharp@1.0.20...1.0.22 * dotnet/android-libzipsharp@9f563dd: Add a test which changes the CompressionMethod of an item (dotnet#78) * dotnet/android-libzipsharp@3b610c9: Try actually running the tests under .net core (dotnet#77) * dotnet/android-libzipsharp@03cd66b: Archive the SignList.xml * dotnet/android-libzipsharp@8afe791: Add the signListPath parameter * dotnet/android-libzipsharp@ed5585c: Add SignList.xml for signing * dotnet/android-libzipsharp@2ab6943: Add a build_windows.bat file to make it easier to build on windows (dotnet#75) * … * dotnet/android-libzipsharp@9dca4fb: Initial commit of localisation * dotnet/android-libzipsharp@668babc: Add Unit Test for setting file permissions on extraction. * dotnet/android-libzipsharp@8f2053c: Build on Windows again (dotnet#71)
grendello · Feb 18, 2021 · 67de0df · 67de0df
1 parent 214dd76
commit 67de0df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,7 +25,7 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>1.0.20</LibZipSharpVersion>
+    <LibZipSharpVersion>1.0.22</LibZipSharpVersion>
     <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.2</MonoCecilVersion>
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>

diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
@@ -192,6 +192,7 @@
     <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\interpreter-%(Identity)\libMonoPosixHelper.so')"            ExcludeFromAndroidNETSdk="true" />
     <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\interpreter-%(Identity)\libmonosgen-2.0.so')"               ExcludeFromAndroidNETSdk="true" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\libZipSharp.dll" />
+    <_MSBuildFiles Include="@(_LocalizationLanguages->'$(MSBuildSrcDir)\%(Identity)\libZipSharp.resources.dll')" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\libZipSharp.dll.config" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\libZipSharp.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Posix.NETStandard.dll" />

diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -16,10 +16,6 @@
 
   <Import Project="../../../Configuration.props" />
 
-  <ItemGroup Condition=" '$(OS)' == 'Unix' ">
-    <Reference Include="Mono.Posix" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Steps\Step_PrepareBundle.cs" />
   </ItemGroup>
@@ -56,6 +52,7 @@
     <PackageReference Include="7-Zip.CommandLine" Version="18.1.0" GeneratePathProperty="true" />
     <PackageReference Include="Kajabity.Tools.Java" Version="0.2.6862.30334" />
     <PackageReference Include="Mono.Options" Version="$(MonoOptionsVersion)" />
+    <PackageReference Include="Mono.Posix.NetStandard" Version="1.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
@@ -217,10 +217,10 @@ void AssertEmbeddedDSOs (string apk)
 		void AssertCompression (ZipEntry entry, bool compressed)
 		{
 			if (compressed) {
-				Assert.AreNotEqual (entry.CompressionMethod, CompressionMethod.Store, $"`{entry.FullName}` should be compressed!");
+				Assert.AreNotEqual (CompressionMethod.Store, entry.CompressionMethod, $"`{entry.FullName}` should be compressed!");
 				Assert.AreNotEqual (entry.Size, entry.CompressedSize, $"`{entry.FullName}` should be compressed!");
 			} else {
-				Assert.AreEqual (entry.CompressionMethod, CompressionMethod.Store, $"`{entry.FullName}` should be uncompressed!");
+				Assert.AreEqual (CompressionMethod.Store, entry.CompressionMethod, $"`{entry.FullName}` should be uncompressed!");
 				Assert.AreEqual (entry.Size, entry.CompressedSize, $"`{entry.FullName}` should be uncompressed!");
 			}
 		}
@@ -255,6 +255,7 @@ public void IncrementalCompression ()
 				proj.Touch ("Properties\\AndroidManifest.xml");
 				proj.SetProperty ("AndroidStoreUncompressedFileExtensions", ".bar");
 
+				b.BuildLogFile = "build2.log";
 				Assert.IsTrue (b.Build (proj), "second build should have succeeded");
 
 				FileAssert.Exists (apk);