diff --git a/nuget.config b/nuget.config
new file mode 100644
index 00000000..bff97919
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/samples/Forms/SkiaSharpDemo.Android/SkiaSharpDemo.Android.csproj b/samples/Forms/SkiaSharpDemo.Android/SkiaSharpDemo.Android.csproj
index 815e806b..efd004c4 100644
--- a/samples/Forms/SkiaSharpDemo.Android/SkiaSharpDemo.Android.csproj
+++ b/samples/Forms/SkiaSharpDemo.Android/SkiaSharpDemo.Android.csproj
@@ -52,12 +52,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj
index ce885d00..bb16408d 100644
--- a/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj
+++ b/samples/Forms/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj
@@ -119,12 +119,12 @@
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
   </ItemGroup>
diff --git a/samples/Forms/SkiaSharpDemo.WPF/SkiaSharpDemo.WPF.csproj b/samples/Forms/SkiaSharpDemo.WPF/SkiaSharpDemo.WPF.csproj
index 708b2b48..600c6fd9 100644
--- a/samples/Forms/SkiaSharpDemo.WPF/SkiaSharpDemo.WPF.csproj
+++ b/samples/Forms/SkiaSharpDemo.WPF/SkiaSharpDemo.WPF.csproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms.WPF" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2612" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms.WPF" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2622" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
   </ItemGroup>
 
diff --git a/samples/Forms/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj b/samples/Forms/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj
index fef839c1..b8f5effb 100644
--- a/samples/Forms/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj
+++ b/samples/Forms/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj
@@ -69,12 +69,12 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/Forms/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj b/samples/Forms/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj
index 26bb325e..ffe980ee 100644
--- a/samples/Forms/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj
+++ b/samples/Forms/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj
@@ -50,12 +50,12 @@
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/Forms/SkiaSharpDemo/SkiaSharpDemo.csproj b/samples/Forms/SkiaSharpDemo/SkiaSharpDemo.csproj
index af1815cc..13452df5 100644
--- a/samples/Forms/SkiaSharpDemo/SkiaSharpDemo.csproj
+++ b/samples/Forms/SkiaSharpDemo/SkiaSharpDemo.csproj
@@ -7,14 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
     <PackageReference Include="NLipsum" Version="1.1.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Svg.Skia" Version="1.0.0.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Svg.Skia" Version="1.0.0.13" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Maui/SkiaSharpDemo/SkiaSharpDemo.csproj b/samples/Maui/SkiaSharpDemo/SkiaSharpDemo.csproj
index 7041f6bd..53514552 100644
--- a/samples/Maui/SkiaSharpDemo/SkiaSharpDemo.csproj
+++ b/samples/Maui/SkiaSharpDemo/SkiaSharpDemo.csproj
@@ -32,9 +32,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="7.3.0" />
+    <PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
     <PackageReference Include="NLipsum" Version="1.1.0" />
-    <PackageReference Include="Svg.Skia" Version="1.0.0.3" />
+    <PackageReference Include="Svg.Skia" Version="1.0.0.13" />
     <PackageReference Include="Topten.RichTextKit" Version="0.4.166" />
   </ItemGroup>
 
diff --git a/source/SkiaSharp.Extended.UI.Forms.WPF/SkiaSharp.Extended.UI.Forms.WPF.csproj b/source/SkiaSharp.Extended.UI.Forms.WPF/SkiaSharp.Extended.UI.Forms.WPF.csproj
index 5d5a1ebe..5c1b0471 100644
--- a/source/SkiaSharp.Extended.UI.Forms.WPF/SkiaSharp.Extended.UI.Forms.WPF.csproj
+++ b/source/SkiaSharp.Extended.UI.Forms.WPF/SkiaSharp.Extended.UI.Forms.WPF.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms.WPF" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2612" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms.WPF" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2622" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/SkiaSharp.Extended.UI.Forms/SkiaSharp.Extended.UI.Forms.csproj b/source/SkiaSharp.Extended.UI.Forms/SkiaSharp.Extended.UI.Forms.csproj
index ff9094e9..6563de30 100644
--- a/source/SkiaSharp.Extended.UI.Forms/SkiaSharp.Extended.UI.Forms.csproj
+++ b/source/SkiaSharp.Extended.UI.Forms/SkiaSharp.Extended.UI.Forms.csproj
@@ -17,10 +17,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.6" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.7" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/SkiaSharp.Extended.UI.Maui/SkiaSharp.Extended.UI.Maui.csproj b/source/SkiaSharp.Extended.UI.Maui/SkiaSharp.Extended.UI.Maui.csproj
index accf18d8..e2ccb319 100644
--- a/source/SkiaSharp.Extended.UI.Maui/SkiaSharp.Extended.UI.Maui.csproj
+++ b/source/SkiaSharp.Extended.UI.Maui/SkiaSharp.Extended.UI.Maui.csproj
@@ -29,9 +29,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj b/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj
index 7d9d3078..313a21a5 100644
--- a/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj
+++ b/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj b/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj
index d6f8b1a1..e4e910be 100644
--- a/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj
+++ b/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj
@@ -5,11 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
diff --git a/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj
index 8d94f7b5..e7743a42 100644
--- a/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj
+++ b/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj
@@ -6,11 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
diff --git a/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj
index ba5c4568..f517483b 100644
--- a/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj
+++ b/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj
@@ -7,11 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
diff --git a/tests/SkiaSharp.Extended.UI.Maui.Tests/SkiaSharp.Extended.UI.Maui.Tests.csproj b/tests/SkiaSharp.Extended.UI.Maui.Tests/SkiaSharp.Extended.UI.Maui.Tests.csproj
index 8f1e8063..0cf585bd 100644
--- a/tests/SkiaSharp.Extended.UI.Maui.Tests/SkiaSharp.Extended.UI.Maui.Tests.csproj
+++ b/tests/SkiaSharp.Extended.UI.Maui.Tests/SkiaSharp.Extended.UI.Maui.Tests.csproj
@@ -7,11 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>