From 22260563e83a839028db46d2cb300c6b12048f46 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 21 Sep 2023 20:55:34 +0200
Subject: [PATCH] Update SkiaSharp to 2.88.6

---
 eng/Microsoft.Extensions.targets              | 46 ++++++++++++++++++-
 eng/Versions.props                            |  7 +--
 .../GraphicsTester.Skia.Console.csproj        |  2 +-
 .../GraphicsTester.Skia.Gtk.csproj            |  4 +-
 .../GraphicsTester.Skia.Mac.csproj            |  4 +-
 .../GraphicsTester.Skia.Windows.csproj        |  2 +-
 .../Graphics.Skia.GtkSharp.csproj             |  2 +-
 .../Graphics.Skia.WPF.csproj                  |  2 +-
 .../src/ResizetizerPackages.projitems         | 18 ++++----
 .../Resizetizer/src/SkiaSharpTools.cs         | 10 ++++
 .../UnitTests/Resizetizer.UnitTests.csproj    |  4 +-
 11 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/eng/Microsoft.Extensions.targets b/eng/Microsoft.Extensions.targets
index 596320eb37df..58b8a8a2302e 100644
--- a/eng/Microsoft.Extensions.targets
+++ b/eng/Microsoft.Extensions.targets
@@ -1,5 +1,29 @@
 <Project>
   <ItemGroup>
+    <PackageReference
+        Update="HarfBuzzSharp"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.Linux"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.macOS"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.Win32"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.HarfBuzz"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.Extended"
+        Version="$(_SkiaSharpExtendedVersion)"
+    />
     <PackageReference
         Update="SkiaSharp"
         Version="$(_SkiaSharpVersion)"
@@ -8,12 +32,32 @@
         Update="SkiaSharp.Views"
         Version="$(_SkiaSharpVersion)"
     />
+    <PackageReference
+        Update="SkiaSharp.Views.Gtk3"
+        Version="$(_SkiaSharpVersion)"
+    />
     <PackageReference
         Update="SkiaSharp.Views.WinUI"
         Version="$(_SkiaSharpVersion)"
     />
     <PackageReference
-        Update="SkiaSharp.HarfBuzz"
+        Update="SkiaSharp.Views.WPF"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Linux"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Linux.NoDependencies"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.macOS"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Win32"
         Version="$(_SkiaSharpVersion)"
     />
     <PackageReference
diff --git a/eng/Versions.props b/eng/Versions.props
index 364b02367af1..80f44153e34b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -73,9 +73,10 @@
        - Feed URI in the nuget.config
        - Native assets build and sha
     -->
-    <_SkiaSharpVersion>2.88.2</_SkiaSharpVersion>
-    <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
-    <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
+    <_SkiaSharpVersion>2.88.6</_SkiaSharpVersion>
+    <_SkiaSharpExtendedVersion>2.0.0-preview.86</_SkiaSharpExtendedVersion>
+    <_HarfBuzzSharpVersion>7.3.0</_HarfBuzzSharpVersion>
+    <_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
diff --git a/src/Graphics/samples/GraphicsTester.Skia.Console/GraphicsTester.Skia.Console.csproj b/src/Graphics/samples/GraphicsTester.Skia.Console/GraphicsTester.Skia.Console.csproj
index d359fdaf5ecf..8fc35699e859 100644
--- a/src/Graphics/samples/GraphicsTester.Skia.Console/GraphicsTester.Skia.Console.csproj
+++ b/src/Graphics/samples/GraphicsTester.Skia.Console/GraphicsTester.Skia.Console.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Graphics/samples/GraphicsTester.Skia.Gtk/GraphicsTester.Skia.Gtk.csproj b/src/Graphics/samples/GraphicsTester.Skia.Gtk/GraphicsTester.Skia.Gtk.csproj
index 102ffcdd3ad4..37f74da9e69a 100644
--- a/src/Graphics/samples/GraphicsTester.Skia.Gtk/GraphicsTester.Skia.Gtk.csproj
+++ b/src/Graphics/samples/GraphicsTester.Skia.Gtk/GraphicsTester.Skia.Gtk.csproj
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0" />
-    <PackageReference Include="SkiaSharp.Views.Gtk3" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" />
+    <PackageReference Include="SkiaSharp.Views.Gtk3" />
     <PackageReference Include="GtkSharp" Version="3.24.24.34" />
   </ItemGroup>
 
diff --git a/src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj b/src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
index 0b88ae6f5a40..a8bd2de74be2 100644
--- a/src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
+++ b/src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp" />
+    <PackageReference Include="SkiaSharp.Views" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj b/src/Graphics/samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj
index 9da63eecfc52..49369ce4c8a2 100644
--- a/src/Graphics/samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj
+++ b/src/Graphics/samples/GraphicsTester.Skia.Windows/GraphicsTester.Skia.Windows.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp.Views.WPF" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj b/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj
index aef0724fa738..dfd0fe39c5c7 100644
--- a/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj
+++ b/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.Gtk3" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp.Views.Gtk3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj b/src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj
index d3d8d2c59a64..06db2242d315 100644
--- a/src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj
+++ b/src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp.Views.WPF" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems b/src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
index 0fccaba32320..054b8954242a 100644
--- a/src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
+++ b/src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
@@ -3,15 +3,15 @@
 
   <ItemGroup>
     <!-- skiasharp and skia-related -->
-    <PackageReference Include="HarfBuzzSharp" Version="$(_HarfBuzzSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="$(_HarfBuzzSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.Win32" Version="$(_HarfBuzzSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" Version="$(_HarfBuzzSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp" Version="$(_SkiaSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="$(_SkiaSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="$(_SkiaSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="$(_SkiaSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="$(_SkiaSharpVersion)" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="HarfBuzzSharp" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="HarfBuzzSharp.NativeAssets.Win32" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SkiaSharp" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="Svg.Skia" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="Svg.Custom" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="Svg.Model" GeneratePathProperty="true" PrivateAssets="all" />
diff --git a/src/SingleProject/Resizetizer/src/SkiaSharpTools.cs b/src/SingleProject/Resizetizer/src/SkiaSharpTools.cs
index cc570187423e..e3de9e822a7a 100644
--- a/src/SingleProject/Resizetizer/src/SkiaSharpTools.cs
+++ b/src/SingleProject/Resizetizer/src/SkiaSharpTools.cs
@@ -7,6 +7,16 @@ namespace Microsoft.Maui.Resizetizer
 {
 	internal abstract class SkiaSharpTools
 	{
+		static SkiaSharpTools()
+		{
+			// DO NOT DELETE!
+			// Because we are doing dangerous things - like using a net462 assembly in a netstandard2.0 assembly
+			// we need to make sure the correct dependencies are loaded. We use net462 because this has special
+			// native library loading logic for the .NET Framework (Visual Studio). 
+			var span = (Span<SKPoint>)new SKPoint[1];
+			span[0] = new SKPoint();
+		}
+
 		public static SkiaSharpTools Create(bool isVector, string filename, SKSize? baseSize, SKColor? backgroundColor, SKColor? tintColor, ILogger logger)
 			=> isVector
 				? new SkiaSharpSvgTools(filename, baseSize, backgroundColor, tintColor, logger) as SkiaSharpTools
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
index 7a41f1c5e429..2b3c03e88089 100644
--- a/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
+++ b/src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
@@ -11,8 +11,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Microsoft.Build.Framework" Version="16.7.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp" Version="$(_SkiaSharpVersion)" />
-    <PackageReference Include="SkiaSharp.Extended" Version="2.0.0-preview.61" />
+    <PackageReference Include="SkiaSharp" />
+    <PackageReference Include="SkiaSharp.Extended" />
     <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />