From 8c824e3af166032bddd7bb55e1ebeff67d73b778 Mon Sep 17 00:00:00 2001
From: mgood7123 <smallville7123@gmail.com>
Date: Fri, 1 Jul 2022 17:43:07 +1000
Subject: [PATCH 1/3] add /.idea to git ignore (#2138)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c358466167a..be8ad6baab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -299,3 +299,4 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/screenshots
+/.idea

From ead1869d0700c838e1191b1322fc61ebb0932f3b Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 4 Jul 2022 14:25:36 +0200
Subject: [PATCH 2/3] Clean up the nuspecs and add xmldoc (#2140)

---
 docs                                          |  2 +-
 .../HarfBuzzSharp.NativeAssets.Android.nuspec |  8 +-
 ...fBuzzSharp.NativeAssets.MacCatalyst.nuspec |  2 +-
 nuget/HarfBuzzSharp.NativeAssets.UWP.nuspec   | 16 ++--
 nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec | 12 +--
 nuget/HarfBuzzSharp.NativeAssets.iOS.nuspec   |  2 +-
 nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec |  2 +-
 nuget/HarfBuzzSharp.NativeAssets.tvOS.nuspec  |  2 +-
 .../HarfBuzzSharp.NativeAssets.watchOS.nuspec |  2 +-
 nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec |  8 +-
 nuget/HarfbuzzSharp.nuspec                    | 90 ++++++++---------
 nuget/SkiaSharp.NativeAssets.Android.nuspec   |  8 +-
 ...p.NativeAssets.Linux.NoDependencies.nuspec |  8 +-
 nuget/SkiaSharp.NativeAssets.Linux.nuspec     |  8 +-
 .../SkiaSharp.NativeAssets.MacCatalyst.nuspec |  2 +-
 .../SkiaSharp.NativeAssets.NanoServer.nuspec  |  2 +-
 nuget/SkiaSharp.NativeAssets.UWP.nuspec       | 64 ++++++-------
 nuget/SkiaSharp.NativeAssets.Win32.nuspec     | 12 +--
 nuget/SkiaSharp.NativeAssets.iOS.nuspec       |  2 +-
 nuget/SkiaSharp.NativeAssets.macOS.nuspec     |  2 +-
 nuget/SkiaSharp.NativeAssets.tvOS.nuspec      |  2 +-
 nuget/SkiaSharp.NativeAssets.watchOS.nuspec   |  2 +-
 nuget/SkiaSharp.Skottie.nuspec                | 84 +++++++++++-----
 nuget/SkiaSharp.Views.Blazor.nuspec           |  1 +
 nuget/SkiaSharp.Views.Forms.GTK.nuspec        |  8 +-
 nuget/SkiaSharp.Views.Forms.nuspec            | 48 +++++-----
 nuget/SkiaSharp.Views.Gtk2.nuspec             |  6 +-
 ...p.Views.Maui.Controls.Compatibility.nuspec | 30 +++---
 nuget/SkiaSharp.Views.Maui.Controls.nuspec    | 30 +++---
 nuget/SkiaSharp.Views.Maui.Core.nuspec        | 30 +++---
 nuget/SkiaSharp.Views.Uno.WinUI.nuspec        | 24 ++---
 nuget/SkiaSharp.Views.Uno.nuspec              | 18 ++--
 nuget/SkiaSharp.Views.WPF.nuspec              | 12 +--
 nuget/SkiaSharp.Views.WinUI.nuspec            | 18 ++--
 nuget/SkiaSharp.Views.WindowsForms.nuspec     | 12 +--
 nuget/SkiaSharp.Views.nuspec                  | 86 ++++++++---------
 nuget/SkiaSharp.nuspec                        | 96 +++++++++----------
 37 files changed, 408 insertions(+), 353 deletions(-)

diff --git a/docs b/docs
index 6cf1350e4ab..cf37af79ca9 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 6cf1350e4ab3c9ec6c4e711fecd7ff2ab7be4089
+Subproject commit cf37af79ca9267b572a2327750d7c05731c0aa53
diff --git a/nuget/HarfBuzzSharp.NativeAssets.Android.nuspec b/nuget/HarfBuzzSharp.NativeAssets.Android.nuspec
index 8fe7b552444..7e8d8fb51d7 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.Android.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.Android.nuspec
@@ -43,10 +43,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-android/HarfBuzzSharp.targets" target="buildTransitive/net6.0-android30.0/HarfBuzzSharp.NativeAssets.Android.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos,windows" src="runtimes/android-x64/native/libHarfBuzzSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-x86/native/libHarfBuzzSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm/native/libHarfBuzzSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm64/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/android-x64/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/android-x86/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/android-arm/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/android-arm64/native/libHarfBuzzSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/monoandroid1.0/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.MacCatalyst.nuspec b/nuget/HarfBuzzSharp.NativeAssets.MacCatalyst.nuspec
index b1a7e87c596..f7319ab1ea5 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.MacCatalyst.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.MacCatalyst.nuspec
@@ -39,7 +39,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-maccatalyst/HarfBuzzSharp.targets" target="buildTransitive/net6.0-maccatalyst13.5/HarfBuzzSharp.NativeAssets.MacCatalyst.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/maccatalyst/native/libHarfBuzzSharp.framework.zip" target="runtimes/maccatalyst/native/libHarfBuzzSharp.framework.zip" />
+    <file src="runtimes/maccatalyst/native/libHarfBuzzSharp.framework.zip" target="runtimes/maccatalyst/native/libHarfBuzzSharp.framework.zip" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net6.0-maccatalyst13.5/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.UWP.nuspec b/nuget/HarfBuzzSharp.NativeAssets.UWP.nuspec
index b4d0b309881..de554cb87d4 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.UWP.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.UWP.nuspec
@@ -37,14 +37,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- the build bits -->
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libHarfBuzzSharp.pdb" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/uap10.0.10240/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec b/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec
index 73e4dbd8448..727d97b1ba7 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec
@@ -45,12 +45,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/HarfBuzzSharp.targets" target="buildTransitive/net462/HarfBuzzSharp.NativeAssets.Win32.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/win-x64/native/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win-x64/native/libHarfBuzzSharp.pdb" />
-    <file platform="windows" src="runtimes/win-x86/native/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win-x86/native/libHarfBuzzSharp.pdb" />
-    <file platform="windows" src="runtimes/win-arm64/native/libHarfBuzzSharp.dll" />
-    <file platform="windows" src="runtimes/win-arm64/native/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win-x64/native/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win-x64/native/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win-x86/native/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win-x86/native/libHarfBuzzSharp.pdb" />
+    <file src="runtimes/win-arm64/native/libHarfBuzzSharp.dll" />
+    <file src="runtimes/win-arm64/native/libHarfBuzzSharp.pdb" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.iOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.iOS.nuspec
index 21b1756a8b5..9b0b24aebd4 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.iOS.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.iOS.nuspec
@@ -43,7 +43,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-ios/HarfBuzzSharp.targets" target="buildTransitive/net6.0-ios13.6/HarfBuzzSharp.NativeAssets.iOS.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/ios/native/libHarfBuzzSharp.framework/**/*" target="runtimes/ios/native/libHarfBuzzSharp.framework" />
+    <file src="runtimes/ios/native/libHarfBuzzSharp.framework/**/*" target="runtimes/ios/native/libHarfBuzzSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinios1.0/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec
index 08d32d29bfa..f09ddde3055 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec
@@ -53,7 +53,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/HarfBuzzSharp.targets" target="buildTransitive/net462/HarfBuzzSharp.NativeAssets.macOS.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/osx/native/libHarfBuzzSharp.dylib" />
+    <file src="runtimes/osx/native/libHarfBuzzSharp.dylib" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinmac2.0/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.tvOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.tvOS.nuspec
index 860b188285c..4031b0f9af7 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.tvOS.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.tvOS.nuspec
@@ -43,7 +43,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-tvos/HarfBuzzSharp.targets" target="buildTransitive/net6.0-tvos13.4/HarfBuzzSharp.NativeAssets.tvOS.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/tvos/native/libHarfBuzzSharp.framework/**/*" target="runtimes/tvos/native/libHarfBuzzSharp.framework" />
+    <file src="runtimes/tvos/native/libHarfBuzzSharp.framework/**/*" target="runtimes/tvos/native/libHarfBuzzSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarintvos1.0/_._" />
diff --git a/nuget/HarfBuzzSharp.NativeAssets.watchOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.watchOS.nuspec
index baeb400baae..b529c1a3cb2 100644
--- a/nuget/HarfBuzzSharp.NativeAssets.watchOS.nuspec
+++ b/nuget/HarfBuzzSharp.NativeAssets.watchOS.nuspec
@@ -39,7 +39,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/xamarinwatchos1.0/HarfBuzzSharp.targets" target="buildTransitive/xamarinwatchos1.0/HarfBuzzSharp.NativeAssets.watchOS.targets" />
 
     <!-- libHarfBuzzSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/watchos/native/libHarfBuzzSharp.framework/**/*" target="runtimes/watchos/native/libHarfBuzzSharp.framework" />
+    <file src="runtimes/watchos/native/libHarfBuzzSharp.framework/**/*" target="runtimes/watchos/native/libHarfBuzzSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinwatchos1.0/_._" />
diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
index ff09f998c92..dc3fed871d7 100644
--- a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
+++ b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
@@ -49,10 +49,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/HarfBuzzSharp.targets" target="buildTransitive/net462/HarfBuzzSharp.NativeAssets.Linux.targets" />
 
     <!-- harfbuzz.dll and other native files -->
-    <file platform="linux" src="runtimes/linux-x64/native/libHarfBuzzSharp.so" />
-    <file platform="linux" src="runtimes/linux-arm/native/libHarfBuzzSharp.so" />
-    <file platform="linux" src="runtimes/linux-arm64/native/libHarfBuzzSharp.so" />
-    <file platform="linux" src="runtimes/linux-musl-x64/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/linux-x64/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/linux-arm/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/linux-arm64/native/libHarfBuzzSharp.so" />
+    <file src="runtimes/linux-musl-x64/native/libHarfBuzzSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec
index ae65db5cf4d..c2edd68b4ab 100644
--- a/nuget/HarfbuzzSharp.nuspec
+++ b/nuget/HarfbuzzSharp.nuspec
@@ -119,54 +119,54 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/netstandard2.1/HarfBuzzSharp.dll" />
     <file src="lib/netstandard2.1/HarfBuzzSharp.pdb" />
     <file src="lib/netstandard2.1/HarfBuzzSharp.xml" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/HarfBuzzSharp.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/HarfBuzzSharp.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/xamarintvos1.0/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/xamarintvos1.0/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/xamarintvos1.0/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/HarfBuzzSharp.xml" />
-    <file platform="windows" src="lib/uap10.0.10240/HarfBuzzSharp.dll" />
-    <file platform="windows" src="lib/uap10.0.10240/HarfBuzzSharp.pdb" />
-    <file platform="windows" src="lib/uap10.0.10240/HarfBuzzSharp.xml" />
-    <file platform="windows" src="lib/uap10.0.16299/HarfBuzzSharp.dll" />
-    <file platform="windows" src="lib/uap10.0.16299/HarfBuzzSharp.pdb" />
-    <file platform="windows" src="lib/uap10.0.16299/HarfBuzzSharp.xml" />
+    <file src="lib/monoandroid1.0/HarfBuzzSharp.dll" />
+    <file src="lib/monoandroid1.0/HarfBuzzSharp.pdb" />
+    <file src="lib/monoandroid1.0/HarfBuzzSharp.xml" />
+    <file src="lib/xamarinios1.0/HarfBuzzSharp.dll" />
+    <file src="lib/xamarinios1.0/HarfBuzzSharp.pdb" />
+    <file src="lib/xamarinios1.0/HarfBuzzSharp.xml" />
+    <file src="lib/xamarintvos1.0/HarfBuzzSharp.dll" />
+    <file src="lib/xamarintvos1.0/HarfBuzzSharp.pdb" />
+    <file src="lib/xamarintvos1.0/HarfBuzzSharp.xml" />
+    <file src="lib/xamarinwatchos1.0/HarfBuzzSharp.dll" />
+    <file src="lib/xamarinwatchos1.0/HarfBuzzSharp.pdb" />
+    <file src="lib/xamarinwatchos1.0/HarfBuzzSharp.xml" />
+    <file src="lib/xamarinmac2.0/HarfBuzzSharp.dll" />
+    <file src="lib/xamarinmac2.0/HarfBuzzSharp.pdb" />
+    <file src="lib/xamarinmac2.0/HarfBuzzSharp.xml" />
+    <file src="lib/uap10.0.10240/HarfBuzzSharp.dll" />
+    <file src="lib/uap10.0.10240/HarfBuzzSharp.pdb" />
+    <file src="lib/uap10.0.10240/HarfBuzzSharp.xml" />
+    <file src="lib/uap10.0.16299/HarfBuzzSharp.dll" />
+    <file src="lib/uap10.0.16299/HarfBuzzSharp.pdb" />
+    <file src="lib/uap10.0.16299/HarfBuzzSharp.xml" />
     <file src="lib/tizen40/HarfBuzzSharp.dll" />
     <file src="lib/tizen40/HarfBuzzSharp.pdb" />
     <file src="lib/tizen40/HarfBuzzSharp.xml" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/HarfBuzzSharp.dll" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/HarfBuzzSharp.pdb" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/HarfBuzzSharp.xml" />
-    <file platform="macos,windows" src="lib/net5.0/HarfBuzzSharp.dll" />
-    <file platform="macos,windows" src="lib/net5.0/HarfBuzzSharp.pdb" />
-    <file platform="macos,windows" src="lib/net5.0/HarfBuzzSharp.xml" />
-    <file platform="macos,windows" src="lib/net6.0/HarfBuzzSharp.dll" />
-    <file platform="macos,windows" src="lib/net6.0/HarfBuzzSharp.pdb" />
-    <file platform="macos,windows" src="lib/net6.0/HarfBuzzSharp.xml" />
-    <file platform="macos,windows" src="lib/net6.0-android/HarfBuzzSharp.dll" target="lib/net6.0-android30.0/HarfBuzzSharp.dll" />
-    <file platform="macos,windows" src="lib/net6.0-android/HarfBuzzSharp.pdb" target="lib/net6.0-android30.0/HarfBuzzSharp.pdb" />
-    <file platform="macos,windows" src="lib/net6.0-android/HarfBuzzSharp.xml" target="lib/net6.0-android30.0/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/net6.0-ios/HarfBuzzSharp.dll" target="lib/net6.0-ios13.6/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/net6.0-ios/HarfBuzzSharp.pdb" target="lib/net6.0-ios13.6/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-ios/HarfBuzzSharp.xml" target="lib/net6.0-ios13.6/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/HarfBuzzSharp.dll" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/HarfBuzzSharp.pdb" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/HarfBuzzSharp.xml" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/net6.0-tvos/HarfBuzzSharp.dll" target="lib/net6.0-tvos13.4/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/net6.0-tvos/HarfBuzzSharp.pdb" target="lib/net6.0-tvos13.4/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-tvos/HarfBuzzSharp.xml" target="lib/net6.0-tvos13.4/HarfBuzzSharp.xml" />
-    <file platform="macos" src="lib/net6.0-macos/HarfBuzzSharp.dll" target="lib/net6.0-macos10.15/HarfBuzzSharp.dll" />
-    <file platform="macos" src="lib/net6.0-macos/HarfBuzzSharp.pdb" target="lib/net6.0-macos10.15/HarfBuzzSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-macos/HarfBuzzSharp.xml" target="lib/net6.0-macos10.15/HarfBuzzSharp.xml" />
+    <file src="lib/netcoreapp3.1/HarfBuzzSharp.dll" />
+    <file src="lib/netcoreapp3.1/HarfBuzzSharp.pdb" />
+    <file src="lib/netcoreapp3.1/HarfBuzzSharp.xml" />
+    <file src="lib/net5.0/HarfBuzzSharp.dll" />
+    <file src="lib/net5.0/HarfBuzzSharp.pdb" />
+    <file src="lib/net5.0/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0-android/HarfBuzzSharp.dll" target="lib/net6.0-android30.0/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0-android/HarfBuzzSharp.pdb" target="lib/net6.0-android30.0/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0-android/HarfBuzzSharp.xml" target="lib/net6.0-android30.0/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0-ios/HarfBuzzSharp.dll" target="lib/net6.0-ios13.6/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0-ios/HarfBuzzSharp.pdb" target="lib/net6.0-ios13.6/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0-ios/HarfBuzzSharp.xml" target="lib/net6.0-ios13.6/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0-maccatalyst/HarfBuzzSharp.dll" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0-maccatalyst/HarfBuzzSharp.pdb" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0-maccatalyst/HarfBuzzSharp.xml" target="lib/net6.0-maccatalyst13.5/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0-tvos/HarfBuzzSharp.dll" target="lib/net6.0-tvos13.4/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0-tvos/HarfBuzzSharp.pdb" target="lib/net6.0-tvos13.4/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0-tvos/HarfBuzzSharp.xml" target="lib/net6.0-tvos13.4/HarfBuzzSharp.xml" />
+    <file src="lib/net6.0-macos/HarfBuzzSharp.dll" target="lib/net6.0-macos10.15/HarfBuzzSharp.dll" />
+    <file src="lib/net6.0-macos/HarfBuzzSharp.pdb" target="lib/net6.0-macos10.15/HarfBuzzSharp.pdb" />
+    <file src="lib/net6.0-macos/HarfBuzzSharp.xml" target="lib/net6.0-macos10.15/HarfBuzzSharp.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.NativeAssets.Android.nuspec b/nuget/SkiaSharp.NativeAssets.Android.nuspec
index eed5e6050c8..63e93b4f82a 100644
--- a/nuget/SkiaSharp.NativeAssets.Android.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.Android.nuspec
@@ -44,10 +44,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-android/SkiaSharp.targets" target="buildTransitive/net6.0-android30.0/SkiaSharp.NativeAssets.Android.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos,windows" src="runtimes/android-x64/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-x86/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm/native/libSkiaSharp.so" />
-    <file platform="macos,windows" src="runtimes/android-arm64/native/libSkiaSharp.so" />
+    <file src="runtimes/android-x64/native/libSkiaSharp.so" />
+    <file src="runtimes/android-x86/native/libSkiaSharp.so" />
+    <file src="runtimes/android-arm/native/libSkiaSharp.so" />
+    <file src="runtimes/android-arm64/native/libSkiaSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/monoandroid1.0/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
index 34c8740b543..7f6e27c7944 100644
--- a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
@@ -62,10 +62,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.NativeAssets.Linux.NoDependencies.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="linux" src="runtimes/linuxnodeps-x64/native/libSkiaSharp.so" target="runtimes/linux-x64/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linuxnodeps-arm/native/libSkiaSharp.so" target="runtimes/linux-arm/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linuxnodeps-arm64/native/libSkiaSharp.so" target="runtimes/linux-arm64/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linuxnodeps-musl-x64/native/libSkiaSharp.so" target="runtimes/linux-musl-x64/native/libSkiaSharp.so" />
+    <file src="runtimes/linuxnodeps-x64/native/libSkiaSharp.so" target="runtimes/linux-x64/native/libSkiaSharp.so" />
+    <file src="runtimes/linuxnodeps-arm/native/libSkiaSharp.so" target="runtimes/linux-arm/native/libSkiaSharp.so" />
+    <file src="runtimes/linuxnodeps-arm64/native/libSkiaSharp.so" target="runtimes/linux-arm64/native/libSkiaSharp.so" />
+    <file src="runtimes/linuxnodeps-musl-x64/native/libSkiaSharp.so" target="runtimes/linux-musl-x64/native/libSkiaSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.Linux.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.nuspec
index a55f0690ae0..9492359fb63 100644
--- a/nuget/SkiaSharp.NativeAssets.Linux.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.Linux.nuspec
@@ -50,10 +50,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.NativeAssets.Linux.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="linux" src="runtimes/linux-x64/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linux-arm/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linux-arm64/native/libSkiaSharp.so" />
-    <file platform="linux" src="runtimes/linux-musl-x64/native/libSkiaSharp.so" />
+    <file src="runtimes/linux-x64/native/libSkiaSharp.so" />
+    <file src="runtimes/linux-arm/native/libSkiaSharp.so" />
+    <file src="runtimes/linux-arm64/native/libSkiaSharp.so" />
+    <file src="runtimes/linux-musl-x64/native/libSkiaSharp.so" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.MacCatalyst.nuspec b/nuget/SkiaSharp.NativeAssets.MacCatalyst.nuspec
index f4d1dfe4ffc..d36beee372e 100644
--- a/nuget/SkiaSharp.NativeAssets.MacCatalyst.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.MacCatalyst.nuspec
@@ -40,7 +40,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-maccatalyst/SkiaSharp.targets" target="buildTransitive/net6.0-maccatalyst13.5/SkiaSharp.NativeAssets.MacCatalyst.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/maccatalyst/native/libSkiaSharp.framework.zip" target="runtimes/maccatalyst/native/libSkiaSharp.framework.zip" />
+    <file src="runtimes/maccatalyst/native/libSkiaSharp.framework.zip" target="runtimes/maccatalyst/native/libSkiaSharp.framework.zip" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net6.0-maccatalyst13.5/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec b/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec
index 00a2c642fd2..42123170dd9 100644
--- a/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec
@@ -46,7 +46,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.NativeAssets.NanoServer.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/nanoserver-x64/native/libSkiaSharp.dll" target="runtimes/win-x64/native/libSkiaSharp.dll" />
+    <file src="runtimes/nanoserver-x64/native/libSkiaSharp.dll" target="runtimes/win-x64/native/libSkiaSharp.dll" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.UWP.nuspec b/nuget/SkiaSharp.NativeAssets.UWP.nuspec
index 92653b2d5f3..cc6d90833ff 100644
--- a/nuget/SkiaSharp.NativeAssets.UWP.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.UWP.nuspec
@@ -38,38 +38,38 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- the build bits -->
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libGLESv2.dll" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libGLESv2.pdb" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libGLESv2.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libGLESv2.pdb" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libGLESv2.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libGLESv2.pdb" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libGLESv2.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libGLESv2.pdb" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libEGL.dll" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libEGL.pdb" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.pdb" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.pdb" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.pdb" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/zlib1.dll" />
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/zlib.pdb" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/zlib1.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/zlib.pdb" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/zlib1.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/zlib.pdb" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/zlib1.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/zlib.pdb" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libSkiaSharp.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libSkiaSharp.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libSkiaSharp.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libSkiaSharp.pdb" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libGLESv2.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libGLESv2.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libGLESv2.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libGLESv2.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libGLESv2.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libGLESv2.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libGLESv2.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libGLESv2.pdb" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libEGL.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/libEGL.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.pdb" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/zlib1.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/zlib.pdb" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/zlib1.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/zlib.pdb" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/zlib1.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/zlib.pdb" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/zlib1.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/zlib.pdb" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/uap10.0.10240/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.Win32.nuspec b/nuget/SkiaSharp.NativeAssets.Win32.nuspec
index b4abf27c6f9..f2c26e7dd15 100644
--- a/nuget/SkiaSharp.NativeAssets.Win32.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.Win32.nuspec
@@ -46,12 +46,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.NativeAssets.Win32.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="windows" src="runtimes/win-x64/native/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win-x64/native/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win-x86/native/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win-x86/native/libSkiaSharp.pdb" />
-    <file platform="windows" src="runtimes/win-arm64/native/libSkiaSharp.dll" />
-    <file platform="windows" src="runtimes/win-arm64/native/libSkiaSharp.pdb" />
+    <file src="runtimes/win-x64/native/libSkiaSharp.dll" />
+    <file src="runtimes/win-x64/native/libSkiaSharp.pdb" />
+    <file src="runtimes/win-x86/native/libSkiaSharp.dll" />
+    <file src="runtimes/win-x86/native/libSkiaSharp.pdb" />
+    <file src="runtimes/win-arm64/native/libSkiaSharp.dll" />
+    <file src="runtimes/win-arm64/native/libSkiaSharp.pdb" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/net462/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.iOS.nuspec b/nuget/SkiaSharp.NativeAssets.iOS.nuspec
index fed4c4f1551..a34b462127f 100644
--- a/nuget/SkiaSharp.NativeAssets.iOS.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.iOS.nuspec
@@ -44,7 +44,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-ios/SkiaSharp.targets" target="buildTransitive/net6.0-ios13.6/SkiaSharp.NativeAssets.iOS.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/ios/native/libSkiaSharp.framework/**/*" target="runtimes/ios/native/libSkiaSharp.framework" />
+    <file src="runtimes/ios/native/libSkiaSharp.framework/**/*" target="runtimes/ios/native/libSkiaSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinios1.0/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.macOS.nuspec b/nuget/SkiaSharp.NativeAssets.macOS.nuspec
index 3cb8c0edf8c..32352b09184 100644
--- a/nuget/SkiaSharp.NativeAssets.macOS.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.macOS.nuspec
@@ -54,7 +54,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.NativeAssets.macOS.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/osx/native/libSkiaSharp.dylib" />
+    <file src="runtimes/osx/native/libSkiaSharp.dylib" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinmac2.0/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.tvOS.nuspec b/nuget/SkiaSharp.NativeAssets.tvOS.nuspec
index 7273a8d9743..b3a7301aa6c 100644
--- a/nuget/SkiaSharp.NativeAssets.tvOS.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.tvOS.nuspec
@@ -44,7 +44,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/net6.0-tvos/SkiaSharp.targets" target="buildTransitive/net6.0-tvos13.4/SkiaSharp.NativeAssets.tvOS.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/tvos/native/libSkiaSharp.framework/**/*" target="runtimes/tvos/native/libSkiaSharp.framework" />
+    <file src="runtimes/tvos/native/libSkiaSharp.framework/**/*" target="runtimes/tvos/native/libSkiaSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarintvos1.0/_._" />
diff --git a/nuget/SkiaSharp.NativeAssets.watchOS.nuspec b/nuget/SkiaSharp.NativeAssets.watchOS.nuspec
index 3ff3e27f01a..038c64910c9 100644
--- a/nuget/SkiaSharp.NativeAssets.watchOS.nuspec
+++ b/nuget/SkiaSharp.NativeAssets.watchOS.nuspec
@@ -40,7 +40,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="build/xamarinwatchos1.0/SkiaSharp.targets" target="buildTransitive/xamarinwatchos1.0/SkiaSharp.NativeAssets.watchOS.targets" />
 
     <!-- libSkiaSharp.dll and other native files -->
-    <file platform="macos" src="runtimes/watchos/native/libSkiaSharp.framework/**/*" target="runtimes/watchos/native/libSkiaSharp.framework" />
+    <file src="runtimes/watchos/native/libSkiaSharp.framework/**/*" target="runtimes/watchos/native/libSkiaSharp.framework" />
 
     <!-- placeholders -->
     <file src="_._" target="lib/xamarinwatchos1.0/_._" />
diff --git a/nuget/SkiaSharp.Skottie.nuspec b/nuget/SkiaSharp.Skottie.nuspec
index a1aaa053604..17c50bb5110 100644
--- a/nuget/SkiaSharp.Skottie.nuspec
+++ b/nuget/SkiaSharp.Skottie.nuspec
@@ -89,80 +89,116 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- SkiaSharp.Skottie.dll -->
     <file src="lib/net462/SkiaSharp.Skottie.dll" />
     <file src="lib/net462/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net462/SkiaSharp.Skottie.xml" />
     <file src="lib/netstandard1.3/SkiaSharp.Skottie.dll" />
     <file src="lib/netstandard1.3/SkiaSharp.Skottie.pdb" />
+    <file src="lib/netstandard1.3/SkiaSharp.Skottie.xml" />
     <file src="lib/netstandard2.0/SkiaSharp.Skottie.dll" />
     <file src="lib/netstandard2.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/netstandard2.0/SkiaSharp.Skottie.xml" />
     <file src="lib/netstandard2.1/SkiaSharp.Skottie.dll" />
     <file src="lib/netstandard2.1/SkiaSharp.Skottie.pdb" />
+    <file src="lib/netstandard2.1/SkiaSharp.Skottie.xml" />
     <file src="lib/monoandroid10.0/SkiaSharp.Skottie.dll" />
     <file src="lib/monoandroid10.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/monoandroid10.0/SkiaSharp.Skottie.xml" />
     <file src="lib/xamarinios1.0/SkiaSharp.Skottie.dll" />
     <file src="lib/xamarinios1.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Skottie.xml" />
     <file src="lib/xamarintvos1.0/SkiaSharp.Skottie.dll" />
     <file src="lib/xamarintvos1.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.Skottie.xml" />
     <file src="lib/xamarinwatchos1.0/SkiaSharp.Skottie.dll" />
     <file src="lib/xamarinwatchos1.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.Skottie.xml" />
     <file src="lib/xamarinmac2.0/SkiaSharp.Skottie.dll" />
     <file src="lib/xamarinmac2.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Skottie.xml" />
     <file src="lib/netcoreapp3.1/SkiaSharp.Skottie.dll" />
     <file src="lib/netcoreapp3.1/SkiaSharp.Skottie.pdb" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Skottie.xml" />
     <file src="lib/net5.0/SkiaSharp.Skottie.dll" />
     <file src="lib/net5.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net5.0/SkiaSharp.Skottie.xml" />
     <file src="lib/net6.0/SkiaSharp.Skottie.dll" />
     <file src="lib/net6.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Skottie.xml" />
 
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.Skottie.dll" target="lib/net6.0-android30.0/SkiaSharp.Skottie.dll" />
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.Skottie.pdb" target="lib/net6.0-android30.0/SkiaSharp.Skottie.pdb" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.Skottie.dll" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.dll" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.Skottie.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.pdb" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.dll" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.pdb" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.Skottie.dll" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.dll" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.Skottie.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.pdb" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.Skottie.dll" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.dll" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.Skottie.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.pdb" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.Skottie.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.dll" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.Skottie.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Skottie.dll" target="lib/net6.0-android30.0/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.Skottie.pdb" target="lib/net6.0-android30.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Skottie.xml" target="lib/net6.0-android30.0/SkiaSharp.Skottie.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.Skottie.dll" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.Skottie.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.Skottie.xml" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.xml" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Skottie.dll" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Skottie.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Skottie.xml" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.xml" />
+    <file src="lib/net6.0-macos/SkiaSharp.Skottie.dll" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-macos/SkiaSharp.Skottie.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-macos/SkiaSharp.Skottie.xml" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Skottie.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Skottie.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Skottie.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.xml" />
 
     <!-- SkiaSharp.SceneGraph.dll -->
     <file src="lib/net462/SkiaSharp.SceneGraph.dll" />
     <file src="lib/net462/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net462/SkiaSharp.SceneGraph.xml" />
     <file src="lib/netstandard1.3/SkiaSharp.SceneGraph.dll" />
     <file src="lib/netstandard1.3/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/netstandard1.3/SkiaSharp.SceneGraph.xml" />
     <file src="lib/netstandard2.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/netstandard2.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/netstandard2.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/netstandard2.1/SkiaSharp.SceneGraph.dll" />
     <file src="lib/netstandard2.1/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/netstandard2.1/SkiaSharp.SceneGraph.xml" />
     <file src="lib/monoandroid10.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/monoandroid10.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/monoandroid10.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/xamarinios1.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/xamarinios1.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/xamarintvos1.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/xamarintvos1.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/xamarinwatchos1.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/xamarinwatchos1.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/xamarinmac2.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/xamarinmac2.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.dll" />
     <file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.SceneGraph.xml" />
     <file src="lib/net5.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/net5.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net5.0/SkiaSharp.SceneGraph.xml" />
     <file src="lib/net6.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/net6.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0/SkiaSharp.SceneGraph.xml" />
 
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.SceneGraph.dll" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.pdb" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.SceneGraph.dll" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.pdb" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.pdb" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.pdb" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.pdb" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.dll" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.SceneGraph.dll" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.SceneGraph.xml" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.SceneGraph.dll" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.SceneGraph.xml" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.xml" />
+    <file src="lib/net6.0-tvos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-tvos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-tvos/SkiaSharp.SceneGraph.xml" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.xml" />
+    <file src="lib/net6.0-macos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-macos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-macos/SkiaSharp.SceneGraph.xml" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.SceneGraph.xml" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Blazor.nuspec b/nuget/SkiaSharp.Views.Blazor.nuspec
index 510130fcf63..88a1e3bd02b 100644
--- a/nuget/SkiaSharp.Views.Blazor.nuspec
+++ b/nuget/SkiaSharp.Views.Blazor.nuspec
@@ -40,6 +40,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- SkiaSharp.Views.UWP.dll -->
     <file src="lib/net6.0/SkiaSharp.Views.Blazor.dll" />
     <file src="lib/net6.0/SkiaSharp.Views.Blazor.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Blazor.xml" />
 
     <!-- the build bits -->
     <file src="build/net6.0/SkiaSharp.Views.Blazor.props" />
diff --git a/nuget/SkiaSharp.Views.Forms.GTK.nuspec b/nuget/SkiaSharp.Views.Forms.GTK.nuspec
index bda4949caee..b79bacb5460 100644
--- a/nuget/SkiaSharp.Views.Forms.GTK.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.GTK.nuspec
@@ -42,12 +42,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.Forms.dll -->
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/net462/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/net462/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/net462/SkiaSharp.Views.Forms.xml" />
 
     <!-- the build bits -->
-    <file platform="macos,linux" src="build/net462/SkiaSharp.Views.Forms.GTK.props" />
+    <file src="build/net462/SkiaSharp.Views.Forms.GTK.props" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec
index c000404e099..07e6e5315e3 100644
--- a/nuget/SkiaSharp.Views.Forms.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.nuspec
@@ -121,35 +121,35 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/netstandard2.0/SkiaSharp.Views.Forms.xml" target="ref/netstandard2.0/SkiaSharp.Views.Forms.xml" />
 
     <!-- the platforms also need to be in the ref as they have more things in them and ref overrides everything -->
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.dll" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.pdb" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.xml" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.dll" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.pdb" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.xml" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.dll" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.xml" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.dll" target="ref/uap10.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.pdb" target="ref/uap10.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.xml" target="ref/uap10.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.dll" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.pdb" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.xml" target="ref/monoandroid1.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.dll" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.pdb" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.xml" target="ref/xamarinios1.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.dll" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.xml" target="ref/xamarinmac2.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.dll" target="ref/uap10.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.pdb" target="ref/uap10.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.xml" target="ref/uap10.0/SkiaSharp.Views.Forms.xml" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.dll" target="ref/tizen40/SkiaSharp.Views.Forms.dll" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.pdb" target="ref/tizen40/SkiaSharp.Views.Forms.pdb" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.xml" target="ref/tizen40/SkiaSharp.Views.Forms.xml" />
 
     <!-- SkiaSharp.Views.Forms.dll -->
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.xml" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.dll" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.pdb" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.xml" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.dll" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.pdb" />
+    <file src="lib/uap10.0/SkiaSharp.Views.Forms.xml" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.dll" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.pdb" />
     <file src="lib/tizen40/SkiaSharp.Views.Forms.xml" />
diff --git a/nuget/SkiaSharp.Views.Gtk2.nuspec b/nuget/SkiaSharp.Views.Gtk2.nuspec
index 7bf6c2642da..d1ff9f130e5 100644
--- a/nuget/SkiaSharp.Views.Gtk2.nuspec
+++ b/nuget/SkiaSharp.Views.Gtk2.nuspec
@@ -37,9 +37,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Gtk.dll" />
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Gtk.pdb" />
-    <file platform="macos,linux" src="lib/net462/SkiaSharp.Views.Gtk.xml" />
+    <file src="lib/net462/SkiaSharp.Views.Gtk.dll" />
+    <file src="lib/net462/SkiaSharp.Views.Gtk.pdb" />
+    <file src="lib/net462/SkiaSharp.Views.Gtk.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec
index 98ccd6ee73c..0c1f75d7f8d 100644
--- a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec
+++ b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec
@@ -51,18 +51,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.Maui.Controls.Compatibility.dll -->
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.Compatibility.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.Compatibility.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.xml" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Maui.Controls.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.nuspec
index 29a333d7fb5..af340a45d32 100644
--- a/nuget/SkiaSharp.Views.Maui.Controls.nuspec
+++ b/nuget/SkiaSharp.Views.Maui.Controls.nuspec
@@ -51,18 +51,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.Maui.Controls.dll -->
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Controls.pdb" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.pdb" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.pdb" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.pdb" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.pdb" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.dll" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Controls.xml" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Controls.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Controls.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Controls.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Controls.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.xml" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.xml" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Maui.Core.nuspec b/nuget/SkiaSharp.Views.Maui.Core.nuspec
index 7b0637465b4..73c4f635450 100644
--- a/nuget/SkiaSharp.Views.Maui.Core.nuspec
+++ b/nuget/SkiaSharp.Views.Maui.Core.nuspec
@@ -56,18 +56,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.Maui.Core.dll -->
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0/SkiaSharp.Views.Maui.Core.pdb" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Core.pdb" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Core.pdb" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.pdb" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.pdb" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.dll" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0/SkiaSharp.Views.Maui.Core.xml" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Maui.Core.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Maui.Core.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Maui.Core.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.Maui.Core.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.xml" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.xml" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec
index 577e8ab3c5c..24796b430bd 100644
--- a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec
+++ b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec
@@ -68,18 +68,18 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="uno-runtime/skia/SkiaSharp.Views.Windows.dll" />
     <file src="uno-runtime/skia/SkiaSharp.Views.Windows.pdb" />
     <file src="uno-runtime/skia/SkiaSharp.Views.Windows.xml" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Windows.dll" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.dll"/>
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.pdb"/>
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Windows.xml" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.xml"/>
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Windows.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.dll"/>
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.pdb"/>
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.Windows.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.xml"/>
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Windows.dll" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.dll"/>
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.pdb"/>
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Windows.xml" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.xml"/>
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.dll"/>
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.pdb"/>
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.xml"/>
+    <file src="lib/net6.0-android/SkiaSharp.Views.Windows.dll" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.dll"/>
+    <file src="lib/net6.0-android/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.pdb"/>
+    <file src="lib/net6.0-android/SkiaSharp.Views.Windows.xml" target="lib/net6.0-android3.0/SkiaSharp.Views.Windows.xml"/>
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Windows.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.dll"/>
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.pdb"/>
+    <file src="lib/net6.0-ios/SkiaSharp.Views.Windows.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.Windows.xml"/>
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Windows.dll" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.dll"/>
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.pdb"/>
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Windows.xml" target="lib/net6.0-macos12.1/SkiaSharp.Views.Windows.xml"/>
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.dll"/>
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.pdb"/>
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.Windows.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Windows.xml"/>
     
     <!-- Fallback to avoid netstandard2.0 to be used incorrectly and cause hard to troubleshoot build errors -->
     <file src="_._" target="lib/net5.0-windows10.0.18362.0/_._" />
diff --git a/nuget/SkiaSharp.Views.Uno.nuspec b/nuget/SkiaSharp.Views.Uno.nuspec
index c6ffca8ca7e..9c77e9c83ca 100644
--- a/nuget/SkiaSharp.Views.Uno.nuspec
+++ b/nuget/SkiaSharp.Views.Uno.nuspec
@@ -64,15 +64,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="uno-runtime/skia/SkiaSharp.Views.UWP.dll" />
     <file src="uno-runtime/skia/SkiaSharp.Views.UWP.pdb" />
     <file src="uno-runtime/skia/SkiaSharp.Views.UWP.xml" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.UWP.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.UWP.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.UWP.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.UWP.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.UWP.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.UWP.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.xml" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.UWP.dll" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.UWP.pdb" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.UWP.xml" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.UWP.dll" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.UWP.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.UWP.xml" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.dll" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.UWP.xml" />
     <file src="_._" target="lib/uap10.0/_._" />
 
     <!-- the build bits -->
diff --git a/nuget/SkiaSharp.Views.WPF.nuspec b/nuget/SkiaSharp.Views.WPF.nuspec
index df8934fa19e..b9975b8f0ae 100644
--- a/nuget/SkiaSharp.Views.WPF.nuspec
+++ b/nuget/SkiaSharp.Views.WPF.nuspec
@@ -41,12 +41,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.dll" />
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.pdb" />
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.xml" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WPF.dll" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WPF.pdb" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WPF.xml" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.dll" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.pdb" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.xml" />
+    <file src="lib/net462/SkiaSharp.Views.WPF.dll" />
+    <file src="lib/net462/SkiaSharp.Views.WPF.pdb" />
+    <file src="lib/net462/SkiaSharp.Views.WPF.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.WinUI.nuspec b/nuget/SkiaSharp.Views.WinUI.nuspec
index 8e09c87d0b7..4ae67d5e33c 100644
--- a/nuget/SkiaSharp.Views.WinUI.nuspec
+++ b/nuget/SkiaSharp.Views.WinUI.nuspec
@@ -45,15 +45,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <file platform="windows" src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
-    <file platform="windows" src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
-    <file platform="windows" src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
-    <file platform="windows" src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
-    <file platform="windows" src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
-    <file platform="windows" src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
-    <file platform="windows" src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.dll" />
-    <file platform="windows" src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.pdb" />
-    <file platform="windows" src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.xml" />
+    <file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
+    <file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
+    <file src="lib/net5.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
+    <file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.dll" />
+    <file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.pdb" />
+    <file src="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Windows.xml" />
+    <file src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.dll" />
+    <file src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.pdb" />
+    <file src="lib/net6.0-windows10.0.19041.0/SkiaSharp.Views.Windows.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.WindowsForms.nuspec b/nuget/SkiaSharp.Views.WindowsForms.nuspec
index 6062579301c..4f7825e5c9d 100644
--- a/nuget/SkiaSharp.Views.WindowsForms.nuspec
+++ b/nuget/SkiaSharp.Views.WindowsForms.nuspec
@@ -45,12 +45,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WindowsForms.dll" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WindowsForms.pdb" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.WindowsForms.xml" />
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.dll" />
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.pdb" />
-    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.xml" />
+    <file src="lib/net462/SkiaSharp.Views.WindowsForms.dll" />
+    <file src="lib/net462/SkiaSharp.Views.WindowsForms.pdb" />
+    <file src="lib/net462/SkiaSharp.Views.WindowsForms.xml" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.dll" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.pdb" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.WindowsForms.xml" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec
index 5dedb94b051..465b769d8fe 100644
--- a/nuget/SkiaSharp.Views.nuspec
+++ b/nuget/SkiaSharp.Views.nuspec
@@ -79,54 +79,54 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.Desktop.dll" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.Desktop.pdb" />
-    <file platform="windows" src="lib/net462/SkiaSharp.Views.Desktop.xml" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.UWP.dll" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.UWP.pdb" />
-    <file platform="windows" src="lib/uap10.0/SkiaSharp.Views.UWP.xml" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Android.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Android.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Android.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.iOS.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.iOS.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.iOS.xml" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.dll" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.pdb" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.xml" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.dll" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.pdb" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.xml" />
+    <file src="lib/net462/SkiaSharp.Views.Desktop.dll" />
+    <file src="lib/net462/SkiaSharp.Views.Desktop.pdb" />
+    <file src="lib/net462/SkiaSharp.Views.Desktop.xml" />
+    <file src="lib/uap10.0/SkiaSharp.Views.UWP.dll" />
+    <file src="lib/uap10.0/SkiaSharp.Views.UWP.pdb" />
+    <file src="lib/uap10.0/SkiaSharp.Views.UWP.xml" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Android.dll" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Android.pdb" />
+    <file src="lib/monoandroid1.0/SkiaSharp.Views.Android.xml" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.iOS.dll" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.iOS.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.Views.iOS.xml" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.dll" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.pdb" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.Views.tvOS.xml" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.dll" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.pdb" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.Views.watchOS.xml" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.dll" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.Views.Mac.xml" />
     <file src="lib/tizen40/SkiaSharp.Views.Tizen.dll" />
     <file src="lib/tizen40/SkiaSharp.Views.Tizen.pdb" />
     <file src="lib/tizen40/SkiaSharp.Views.Tizen.xml" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Android.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.dll" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Android.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.pdb" />
-    <file platform="windows" src="lib/net6.0-android/SkiaSharp.Views.Android.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.xml" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.iOS.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.dll" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.iOS.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.pdb" />
-    <file platform="windows" src="lib/net6.0-ios/SkiaSharp.Views.iOS.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.xml" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.dll" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.pdb" />
-    <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.xml" />
-    <file platform="windows" src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.dll" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.dll" />
-    <file platform="windows" src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.pdb" />
-    <file platform="windows" src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.xml" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.xml" />
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.dll" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.dll" />
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.pdb" />
-    <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.xml" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.xml" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.dll" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.pdb" />
-    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.xml" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Android.dll" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Android.pdb" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.Views.Android.xml" target="lib/net6.0-android30.0/SkiaSharp.Views.Android.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.iOS.dll" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.iOS.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.Views.iOS.xml" target="lib/net6.0-ios13.6/SkiaSharp.Views.iOS.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.Views.iOS.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.iOS.xml" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.dll" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.dll" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.pdb" />
+    <file src="lib/net6.0-tvos/SkiaSharp.Views.tvOS.xml" target="lib/net6.0-tvos13.4/SkiaSharp.Views.tvOS.xml" />
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Mac.dll" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.dll" />
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Mac.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.pdb" />
+    <file src="lib/net6.0-macos/SkiaSharp.Views.Mac.xml" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.xml" />
 
     <!-- SkiaSharp.Views.Interop.UWP.dll -->
-    <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
-    <file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-x86/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-arm/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
+    <file src="runtimes/win10-arm64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />
diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
index eee0d877abc..2fa214ff1bb 100644
--- a/nuget/SkiaSharp.nuspec
+++ b/nuget/SkiaSharp.nuspec
@@ -123,57 +123,57 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/netstandard2.1/SkiaSharp.dll" />
     <file src="lib/netstandard2.1/SkiaSharp.pdb" />
     <file src="lib/netstandard2.1/SkiaSharp.xml" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.dll" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.pdb" />
-    <file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.xml" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.dll" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/xamarinios1.0/SkiaSharp.xml" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.dll" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/xamarintvos1.0/SkiaSharp.xml" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.dll" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/xamarinwatchos1.0/SkiaSharp.xml" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.dll" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.xml" />
-    <file platform="windows" src="lib/uap10.0.10240/SkiaSharp.dll" />
-    <file platform="windows" src="lib/uap10.0.10240/SkiaSharp.pdb" />
-    <file platform="windows" src="lib/uap10.0.10240/SkiaSharp.xml" />
-    <file platform="windows" src="lib/uap10.0.16299/SkiaSharp.dll" />
-    <file platform="windows" src="lib/uap10.0.16299/SkiaSharp.pdb" />
-    <file platform="windows" src="lib/uap10.0.16299/SkiaSharp.xml" />
+    <file src="lib/monoandroid1.0/SkiaSharp.dll" />
+    <file src="lib/monoandroid1.0/SkiaSharp.pdb" />
+    <file src="lib/monoandroid1.0/SkiaSharp.xml" />
+    <file src="lib/xamarinios1.0/SkiaSharp.dll" />
+    <file src="lib/xamarinios1.0/SkiaSharp.pdb" />
+    <file src="lib/xamarinios1.0/SkiaSharp.xml" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.dll" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.pdb" />
+    <file src="lib/xamarintvos1.0/SkiaSharp.xml" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.dll" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.pdb" />
+    <file src="lib/xamarinwatchos1.0/SkiaSharp.xml" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.dll" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.pdb" />
+    <file src="lib/xamarinmac2.0/SkiaSharp.xml" />
+    <file src="lib/uap10.0.10240/SkiaSharp.dll" />
+    <file src="lib/uap10.0.10240/SkiaSharp.pdb" />
+    <file src="lib/uap10.0.10240/SkiaSharp.xml" />
+    <file src="lib/uap10.0.16299/SkiaSharp.dll" />
+    <file src="lib/uap10.0.16299/SkiaSharp.pdb" />
+    <file src="lib/uap10.0.16299/SkiaSharp.xml" />
     <file src="lib/tizen40/SkiaSharp.dll" />
     <file src="lib/tizen40/SkiaSharp.pdb" />
     <file src="lib/tizen40/SkiaSharp.xml" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/SkiaSharp.dll" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/SkiaSharp.pdb" />
-    <file platform="macos,windows" src="lib/netcoreapp3.1/SkiaSharp.xml" />
-    <file platform="macos,windows" src="lib/net5.0/SkiaSharp.dll" />
-    <file platform="macos,windows" src="lib/net5.0/SkiaSharp.pdb" />
-    <file platform="macos,windows" src="lib/net5.0/SkiaSharp.xml" />
-    <file platform="macos,windows" src="lib/net6.0/SkiaSharp.dll" />
-    <file platform="macos,windows" src="lib/net6.0/SkiaSharp.pdb" />
-    <file platform="macos,windows" src="lib/net6.0/SkiaSharp.xml" />
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.dll" target="lib/net6.0-android30.0/SkiaSharp.dll" />
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.pdb" target="lib/net6.0-android30.0/SkiaSharp.pdb" />
-    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.xml" target="lib/net6.0-android30.0/SkiaSharp.xml" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.dll" target="lib/net6.0-ios13.6/SkiaSharp.dll" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.pdb" target="lib/net6.0-ios13.6/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.xml" target="lib/net6.0-ios13.6/SkiaSharp.xml" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.dll" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.xml" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.dll" target="lib/net6.0-tvos13.4/SkiaSharp.dll" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.xml" target="lib/net6.0-tvos13.4/SkiaSharp.xml" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.dll" target="lib/net6.0-macos10.15/SkiaSharp.dll" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.pdb" target="lib/net6.0-macos10.15/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.xml" target="lib/net6.0-macos10.15/SkiaSharp.xml" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.dll" target="lib/net6.0-tizen7.0/SkiaSharp.dll" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.pdb" />
-    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.xml" target="lib/net6.0-tizen7.0/SkiaSharp.xml" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.dll" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.pdb" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.xml" />
+    <file src="lib/net5.0/SkiaSharp.dll" />
+    <file src="lib/net5.0/SkiaSharp.pdb" />
+    <file src="lib/net5.0/SkiaSharp.xml" />
+    <file src="lib/net6.0/SkiaSharp.dll" />
+    <file src="lib/net6.0/SkiaSharp.pdb" />
+    <file src="lib/net6.0/SkiaSharp.xml" />
+    <file src="lib/net6.0-android/SkiaSharp.dll" target="lib/net6.0-android30.0/SkiaSharp.dll" />
+    <file src="lib/net6.0-android/SkiaSharp.pdb" target="lib/net6.0-android30.0/SkiaSharp.pdb" />
+    <file src="lib/net6.0-android/SkiaSharp.xml" target="lib/net6.0-android30.0/SkiaSharp.xml" />
+    <file src="lib/net6.0-ios/SkiaSharp.dll" target="lib/net6.0-ios13.6/SkiaSharp.dll" />
+    <file src="lib/net6.0-ios/SkiaSharp.pdb" target="lib/net6.0-ios13.6/SkiaSharp.pdb" />
+    <file src="lib/net6.0-ios/SkiaSharp.xml" target="lib/net6.0-ios13.6/SkiaSharp.xml" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.dll" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.pdb" />
+    <file src="lib/net6.0-maccatalyst/SkiaSharp.xml" target="lib/net6.0-maccatalyst13.5/SkiaSharp.xml" />
+    <file src="lib/net6.0-tvos/SkiaSharp.dll" target="lib/net6.0-tvos13.4/SkiaSharp.dll" />
+    <file src="lib/net6.0-tvos/SkiaSharp.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.pdb" />
+    <file src="lib/net6.0-tvos/SkiaSharp.xml" target="lib/net6.0-tvos13.4/SkiaSharp.xml" />
+    <file src="lib/net6.0-macos/SkiaSharp.dll" target="lib/net6.0-macos10.15/SkiaSharp.dll" />
+    <file src="lib/net6.0-macos/SkiaSharp.pdb" target="lib/net6.0-macos10.15/SkiaSharp.pdb" />
+    <file src="lib/net6.0-macos/SkiaSharp.xml" target="lib/net6.0-macos10.15/SkiaSharp.xml" />
+    <file src="lib/net6.0-tizen/SkiaSharp.dll" target="lib/net6.0-tizen7.0/SkiaSharp.dll" />
+    <file src="lib/net6.0-tizen/SkiaSharp.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.pdb" />
+    <file src="lib/net6.0-tizen/SkiaSharp.xml" target="lib/net6.0-tizen7.0/SkiaSharp.xml" />
 
     <!-- .NET interactive -->
     <file src="interactive-extensions/dotnet/SkiaSharp.DotNet.Interactive.dll" />

From 0f250519aab70020b9a5338fead876859937cc14 Mon Sep 17 00:00:00 2001
From: mgood7123 <smallville7123@gmail.com>
Date: Sat, 9 Jul 2022 14:13:44 +1000
Subject: [PATCH 3/3] expose AVIF image encode format (#2154)

* add /.idea to git ignore

* expose AVIF image encode format
---
 binding/Binding/SkiaApi.generated.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/binding/Binding/SkiaApi.generated.cs b/binding/Binding/SkiaApi.generated.cs
index 8a70b541341..b5758168fb5 100644
--- a/binding/Binding/SkiaApi.generated.cs
+++ b/binding/Binding/SkiaApi.generated.cs
@@ -15888,6 +15888,8 @@ public enum SKEncodedImageFormat {
 		Dng = 10,
 		// HEIF_SK_ENCODED_FORMAT = 11
 		Heif = 11,
+		// AVIF_SK_ENCODED_FORMAT = 12
+		Avif = 12,
 	}
 
 	// sk_encodedorigin_t