Merge remote-tracking branch 'origin/patch/v2.80.4'

mono · Sep 13, 2021 · 789cb44 · 789cb44
2 parents 4a687a8 + 45e4894
commit 789cb44
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 0 deletions.
diff --git a/SignList.xml b/SignList.xml
@@ -10,6 +10,7 @@
     <!-- ANGLE -->
     <FirstParty Include="libEGL.dll" />
     <FirstParty Include="libGLESv2.dll" />
+    <FirstParty Include="zlib1.dll" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@@ -21,6 +21,10 @@
     <None Include="..\..\output\native\uwp\x86\libEGL*" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\%(Filename)%(Extension)" />
     <None Include="..\..\output\native\uwp\arm\libEGL*" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\%(Filename)%(Extension)" />
     <None Include="..\..\output\native\uwp\arm64\libEGL*" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\uwp\x64\zlib*" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\uwp\x86\zlib*" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\uwp\arm\zlib*" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\uwp\arm64\zlib*" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

diff --git a/native/uwp/build.cake b/native/uwp/build.cake
@@ -115,6 +115,7 @@ Task("ANGLE")
         if (Skip(arch)) return;
 
         var d = CONFIGURATION.ToLower() == "release" ? "" : "debug/";
+        var zd = CONFIGURATION.ToLower() == "release" ? "" : "d";
 
         RunProcess (vcpkg, $"install angle:{arch}-uwp");
 
@@ -124,6 +125,8 @@ Task("ANGLE")
         CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libEGL.pdb"), outDir);
         CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.dll"), outDir);
         CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.pdb"), outDir);
+        CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}1.dll"), outDir);
+        CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}.pdb"), outDir);
     }
 });
 

diff --git a/nuget/SkiaSharp.NativeAssets.UWP.nuspec b/nuget/SkiaSharp.NativeAssets.UWP.nuspec
@@ -50,6 +50,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
     <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
     <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
+    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/zlib1.dll" />
+    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/zlib1.dll" />
+    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/zlib1.dll" />
+    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/zlib1.dll" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/uap10.0.10240/_._" />

diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj
@@ -131,6 +131,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -134,6 +134,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -140,6 +140,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
@@ -141,6 +141,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -144,6 +144,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
@@ -150,6 +150,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
+    <Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
   </ItemGroup>
   <ItemGroup>