Removing all .NET 5 SDK requirements (#2266)

mono · Oct 4, 2022 · 144b339 · 144b339
1 parent 06d7ed5
commit 144b339
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 85 deletions.
diff --git a/binding/HarfBuzzSharp.Shared/NativeObject.cs b/binding/HarfBuzzSharp.Shared/NativeObject.cs
@@ -60,18 +60,9 @@ public void Dispose ()
 			GC.SuppressFinalize (this);
 		}
 
-		internal static int SizeOf<T> ()
-		{
-#if WINDOWS_UWP || NETSTANDARD || NET5_0_OR_GREATER
-			return Marshal.SizeOf<T> ();
-#else
-			return Marshal.SizeOf (typeof (T));
-#endif
-		}
-
 		internal static IntPtr StructureArrayToPtr<T> (IReadOnlyList<T> items)
 		{
-			var size = SizeOf<T> ();
+			var size = Marshal.SizeOf<T> ();
 			var memory = Marshal.AllocCoTaskMem (size * items.Count);
 			for (var i = 0; i < items.Count; i++) {
 				var ptr = new IntPtr (memory.ToInt64 () + (i * size));

diff --git a/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec b/nuget/HarfBuzzSharp.NativeAssets.Win32.nuspec
@@ -33,7 +33,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       </group>
       <group targetFramework="netcoreapp3.1">
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
       </group>
     </dependencies>
 
@@ -56,7 +56,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec b/nuget/HarfBuzzSharp.NativeAssets.macOS.nuspec
@@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       </group>
       <group targetFramework="netcoreapp3.1">
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
       </group>
     </dependencies>
 
@@ -61,7 +61,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
@@ -36,7 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="netcoreapp3.1">
         <dependency id="HarfBuzzSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
         <dependency id="HarfBuzzSharp" version="1.0.0" />
       </group>
     </dependencies>
@@ -58,7 +58,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec
@@ -78,10 +78,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
         <dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
-        <dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="HarfBuzzSharp.NativeAssets.Win32" version="1.0.0" />
         <dependency id="HarfBuzzSharp.NativeAssets.macOS" version="1.0.0" />
@@ -146,9 +142,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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" />

diff --git a/nuget/SkiaSharp.HarfBuzz.nuspec b/nuget/SkiaSharp.HarfBuzz.nuspec
@@ -47,10 +47,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="HarfBuzzSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SkiaSharp" version="1.0.0" />
-        <dependency id="HarfBuzzSharp" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="HarfBuzzSharp" version="1.0.0" />
@@ -76,9 +72,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.dll" />
     <file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.pdb" />
     <file src="lib/netcoreapp3.1/SkiaSharp.HarfBuzz.xml" />
-    <file src="lib/net5.0/SkiaSharp.HarfBuzz.dll" />
-    <file src="lib/net5.0/SkiaSharp.HarfBuzz.pdb" />
-    <file src="lib/net5.0/SkiaSharp.HarfBuzz.xml" />
     <file src="lib/net6.0/SkiaSharp.HarfBuzz.dll" />
     <file src="lib/net6.0/SkiaSharp.HarfBuzz.pdb" />
     <file src="lib/net6.0/SkiaSharp.HarfBuzz.xml" />

diff --git a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
@@ -49,7 +49,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="netcoreapp3.1">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
     </dependencies>
@@ -71,7 +71,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.NativeAssets.Linux.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.nuspec
@@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="netcoreapp3.1">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
     </dependencies>
@@ -59,7 +59,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.NativeAssets.Win32.nuspec b/nuget/SkiaSharp.NativeAssets.Win32.nuspec
@@ -34,7 +34,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       </group>
       <group targetFramework="netcoreapp3.1">
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
       </group>
     </dependencies>
 
@@ -57,7 +57,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.NativeAssets.macOS.nuspec b/nuget/SkiaSharp.NativeAssets.macOS.nuspec
@@ -38,7 +38,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       </group>
       <group targetFramework="netcoreapp3.1">
       </group>
-      <group targetFramework="net5.0">
+      <group targetFramework="net6.0">
       </group>
     </dependencies>
 
@@ -62,7 +62,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="_._" target="lib/net462/_._" />
     <file src="_._" target="lib/netstandard1.3/_._" />
     <file src="_._" target="lib/netcoreapp3.1/_._" />
-    <file src="_._" target="lib/net5.0/_._" />
+    <file src="_._" target="lib/net6.0/_._" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.Skottie.nuspec b/nuget/SkiaSharp.Skottie.nuspec
@@ -57,9 +57,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="netcoreapp3.1">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SkiaSharp" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
@@ -117,9 +114,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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" />
@@ -174,9 +168,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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" />

diff --git a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec
@@ -48,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="Uno.WinUI" version="1.0.0" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0-windows10.0.18362.0">
+      <group targetFramework="net6.0-windows10.0.18362.0">
         <dependency id="Uno.WinUI" version="1.0.0" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
@@ -82,7 +82,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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/_._" />
+    <file src="_._" target="lib/net6.0-windows10.0.18362.0/_._" />
 
     <!-- the build bits -->
     <file src="build/netstandard2.0/SkiaSharp.Views.Uno.WinUI.targets" />

diff --git a/nuget/SkiaSharp.Views.WinUI.nuspec b/nuget/SkiaSharp.Views.WinUI.nuspec
@@ -27,10 +27,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
 
     <dependencies>
-      <group targetFramework="net5.0-windows10.0.18362.0">
-        <dependency id="SkiaSharp" version="1.0.0" />
-        <dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0-windows10.0.18362.0">
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
@@ -45,9 +41,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
-    <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" />

diff --git a/nuget/SkiaSharp.Vulkan.SharpVk.nuspec b/nuget/SkiaSharp.Vulkan.SharpVk.nuspec
@@ -39,10 +39,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SharpVk" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SkiaSharp" version="1.0.0" />
-        <dependency id="SharpVk" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SharpVk" version="1.0.0" />
@@ -62,9 +58,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.dll" />
     <file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.pdb" />
     <file src="lib/netcoreapp3.1/SkiaSharp.Vulkan.SharpVk.xml" />
-    <file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.dll" />
-    <file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.pdb" />
-    <file src="lib/net5.0/SkiaSharp.Vulkan.SharpVk.xml" />
     <file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.dll" />
     <file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.pdb" />
     <file src="lib/net6.0/SkiaSharp.Vulkan.SharpVk.xml" />

diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
@@ -79,10 +79,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
         <dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
       </group>
-      <group targetFramework="net5.0">
-        <dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
-        <dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="SkiaSharp.NativeAssets.Win32" version="1.0.0" />
         <dependency id="SkiaSharp.NativeAssets.macOS" version="1.0.0" />
@@ -150,9 +146,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <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" />

diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
@@ -33,7 +33,7 @@
     <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
     <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Controls.dll" />
     <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Core\bin\Debug\net6.0-windows10.0.19041.0\SkiaSharp.Views.Maui.Core.dll" />
-    <Reference Include="..\..\..\..\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\bin\Debug\net5.0-windows10.0.18362.0\SkiaSharp.Views.Windows.dll" />-->
+    <Reference Include="..\..\..\..\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\bin\Debug\net6.0-windows10.0.18362.0\SkiaSharp.Views.Windows.dll" />-->
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\SkiaSharp.Views.Maui.Controls.Compatibility.csproj" />
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\SkiaSharp.Views.Maui.Controls.csproj" />

diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
@@ -41,7 +41,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\SkiaSharpSample\SkiaSharpSample.csproj</EntryPointProjectUniqueName>
-    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 	<PropertyGroup>
     <DefineConstants>$(DefineConstants);WINUI</DefineConstants>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Condition="exists('..\SkiaSharpSample.UWP')">
     <EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />

diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
@@ -174,13 +174,6 @@ jobs:
               version: 3.1.x
             retryCountOnTaskFailure: 3
             displayName: Install .NET Core 3.1.x
-          - task: UseDotNet@2
-            condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
-            inputs:
-              packageType: 'sdk'
-              version: 5.0.x
-            retryCountOnTaskFailure: 3
-            displayName: Install .NET Core 5.0.x
           - task: UseDotNet@2
             condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
             inputs:
@@ -192,6 +185,10 @@ jobs:
             displayName: Install the preview version of .NET Core
             retryCountOnTaskFailure: 3
             condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables.DOTNET_VERSION_PREVIEW, ''))
+          - ${{ if endsWith(parameters.name, '_linux') }}:
+            - pwsh: .\scripts\patch-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet"
+              displayName: Fix the Microsoft.WinFX.* file
+              condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
           # display dotnet info
           - pwsh: dotnet --info
             displayName: Display all the .NET information