Update to .NET 5.0 (#1697)

2021-05-08 01:49:57 +02:00 · 2021-05-08 01:49:57 +02:00 · 4e9a505aef
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@ -19,6 +19,7 @@ GLibSharp                                       release     3.22.24.37
 AtkSharp                                        release     3.22.24.37
 System.Memory                                   release     4.5.3
 System.IO.UnmanagedMemoryStream                 release     4.3.0
+System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     2.4.4

--- a/binding/Binding/SkiaApi.cs
+++ b/binding/Binding/SkiaApi.cs
@ -4,20 +4,8 @@ namespace SkiaSharp
 {
 	internal partial class SkiaApi
 	{
-#if __TVOS__ && __UNIFIED__
+#if __IOS__ || __TVOS__ || __WATCHOS__
 		private const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp";
-#elif __WATCHOS__ && __UNIFIED__
-		private const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp";
-#elif __IOS__ && __UNIFIED__
-		private const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp";
-#elif __ANDROID__
-		private const string SKIA = "libSkiaSharp.so";
-#elif __MACOS__
-		private const string SKIA = "libSkiaSharp.dylib";
-#elif WINDOWS_UWP
-		private const string SKIA = "libSkiaSharp.dll";
-#elif __TIZEN__
-		private const string SKIA = "libSkiaSharp.so";
 #else
 		private const string SKIA = "libSkiaSharp";
 #endif
--- a/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs
+++ b/binding/HarfBuzzSharp.Shared/HarfBuzzApi.cs
@ -4,22 +4,8 @@ namespace HarfBuzzSharp
 {
 	internal unsafe partial class HarfBuzzApi
 	{
-#if __TVOS__ && __UNIFIED__
+#if __IOS__ || __TVOS__ || __WATCHOS__
 		private const string HARFBUZZ = "__Internal";
-#elif __WATCHOS__ && __UNIFIED__
-		private const string HARFBUZZ = "__Internal";
-#elif __IOS__ && __UNIFIED__
-		private const string HARFBUZZ = "__Internal";
-#elif __ANDROID__
-		private const string HARFBUZZ = "libHarfBuzzSharp.so";
-#elif __MACOS__
-		private const string HARFBUZZ = "libHarfBuzzSharp.dylib";
-#elif __DESKTOP__
-		private const string HARFBUZZ = "libHarfBuzzSharp";
-#elif WINDOWS_UWP
-		private const string HARFBUZZ = "libHarfBuzzSharp.dll";
-#elif NET_STANDARD
-		private const string HARFBUZZ = "libHarfBuzzSharp";
 #else
 		private const string HARFBUZZ = "libHarfBuzzSharp";
 #endif
--- a/binding/HarfBuzzSharp.Shared/NativeObject.cs
+++ b/binding/HarfBuzzSharp.Shared/NativeObject.cs
@ -62,7 +62,7 @@ namespace HarfBuzzSharp

 		internal static int SizeOf<T> ()
 		{
-#if WINDOWS_UWP || NET_STANDARD
+#if WINDOWS_UWP || NETSTANDARD || NET5_0_OR_GREATER
 			return Marshal.SizeOf<T> ();
 #else
 			return Marshal.SizeOf (typeof (T));
--- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
+++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
@ -4,7 +4,7 @@
    <RootNamespace>HarfBuzzSharp</RootNamespace>
    <AssemblyName>HarfBuzzSharp</AssemblyName>
    <PackagingGroup>HarfBuzzSharp</PackagingGroup>
-    <DefineConstants>$(DefineConstants);NET_STANDARD;HARFBUZZ</DefineConstants>
+    <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="System.Memory" Version="4.5.3" />
--- a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj
+++ b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj
@ -6,11 +6,8 @@
    <PackagingGroup>HarfBuzzSharp</PackagingGroup>
    <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
-  </PropertyGroup>
  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants>$(DefineConstants);USE_DELEGATES;__DESKTOP__</DefineConstants>
+    <DefineConstants>$(DefineConstants);USE_DELEGATES</DefineConstants>
  </PropertyGroup>
  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@ -4,7 +4,6 @@
    <RootNamespace>SkiaSharp</RootNamespace>
    <AssemblyName>SkiaSharp</AssemblyName>
    <PackagingGroup>SkiaSharp</PackagingGroup>
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="System.Memory" Version="4.5.3" />
--- a/binding/SkiaSharp/SkiaSharp.csproj
+++ b/binding/SkiaSharp/SkiaSharp.csproj
@ -5,11 +5,8 @@
    <AssemblyName>SkiaSharp</AssemblyName>
    <PackagingGroup>SkiaSharp</PackagingGroup>
  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
-  </PropertyGroup>
  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants>$(DefineConstants);USE_DELEGATES;__DESKTOP__</DefineConstants>
+    <DefineConstants>$(DefineConstants);USE_DELEGATES</DefineConstants>
  </PropertyGroup>
  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
--- a/nuget/SkiaSharp.Views.Desktop.Common.nuspec
+++ b/nuget/SkiaSharp.Views.Desktop.Common.nuspec
@ -29,12 +29,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
    <dependencies>
      <group targetFramework="net462">
        <dependency id="SkiaSharp" version="1.0.0" />
+        <dependency id="System.Drawing.Common" version="4.5.1" />
      </group>
-      <group targetFramework="netcoreapp3.0">
+      <group targetFramework="netcoreapp3.1">
        <dependency id="SkiaSharp" version="1.0.0" />
+        <dependency id="System.Drawing.Common" version="4.5.1" />
      </group>
      <group targetFramework="netstandard2.0">
        <dependency id="SkiaSharp" version="1.0.0" />
+        <dependency id="System.Drawing.Common" version="4.5.1" />
      </group>
    </dependencies>

@ -44,8 +47,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
    <!-- SkiaSharp.Views.*.dll -->
    <file src="lib/net462/SkiaSharp.Views.Desktop.Common.dll" />
    <file src="lib/net462/SkiaSharp.Views.Desktop.Common.xml" />
-    <file src="lib/netcoreapp3.0/SkiaSharp.Views.Desktop.Common.dll" />
-    <file src="lib/netcoreapp3.0/SkiaSharp.Views.Desktop.Common.xml" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.Desktop.Common.dll" />
+    <file src="lib/netcoreapp3.1/SkiaSharp.Views.Desktop.Common.xml" />
    <file src="lib/netstandard2.0/SkiaSharp.Views.Desktop.Common.dll" />
    <file src="lib/netstandard2.0/SkiaSharp.Views.Desktop.Common.xml" />

--- a/nuget/SkiaSharp.Views.WPF.nuspec
+++ b/nuget/SkiaSharp.Views.WPF.nuspec
@ -31,7 +31,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
      </group>
-      <group targetFramework="netcoreapp3.0">
+      <group targetFramework="netcoreapp3.1">
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
      </group>
@ -41,8 +41,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
  <files>

    <!-- SkiaSharp.Views.*.dll -->
-    <file platform="windows" src="lib/netcoreapp3.0/SkiaSharp.Views.WPF.dll" />
-    <file platform="windows" src="lib/netcoreapp3.0/SkiaSharp.Views.WPF.xml" />
+    <file platform="windows" src="lib/netcoreapp3.1/SkiaSharp.Views.WPF.dll" />
+    <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.xml" />

--- a/nuget/SkiaSharp.Views.WindowsForms.nuspec
+++ b/nuget/SkiaSharp.Views.WindowsForms.nuspec
@ -33,7 +33,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
        <dependency id="OpenTK" version="3.1.0" />
        <dependency id="OpenTK.GLControl" version="3.1.0" />
      </group>
-      <group targetFramework="netcoreapp3.0">
+      <group targetFramework="netcoreapp3.1">
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
        <dependency id="OpenTK" version="3.1.0" />
@ -47,8 +47,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
    <!-- SkiaSharp.Views.*.dll -->
    <file platform="windows" src="lib/net462/SkiaSharp.Views.WindowsForms.dll" />
    <file platform="windows" src="lib/net462/SkiaSharp.Views.WindowsForms.xml" />
-    <file platform="windows" src="lib/netcoreapp3.0/SkiaSharp.Views.WindowsForms.dll" />
-    <file platform="windows" src="lib/netcoreapp3.0/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.xml" />

    <!-- legal -->
    <file src="LICENSE.txt" />
--- a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <LangVersion>8.0</LangVersion>
  </PropertyGroup>

--- a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <LangVersion>8.0</LangVersion>
  </PropertyGroup>

--- a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <UseWPF>true</UseWPF>
    <LangVersion>8.0</LangVersion>
    <ApplicationIcon>icon.ico</ApplicationIcon>
--- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj
+++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
    <LangVersion>8.0</LangVersion>
  </PropertyGroup>

--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@ -23,7 +23,8 @@ variables:
  MONO_VERSION_MACOS: 'Latest'
  MONO_VERSION_LINUX: ''
  XCODE_VERSION: 12.4
-  DOTNET_VERSION: 3.1.405
+  DOTNET_VERSION_PREVIOUS: 3.1.408
+  DOTNET_VERSION: 5.0.202
  CONFIGURATION: 'Release'
  VM_IMAGE_WINDOWS: windows-2019
  VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016
--- a/scripts/azure-templates-bootstrapper.yml
+++ b/scripts/azure-templates-bootstrapper.yml
@ -99,6 +99,12 @@ jobs:

      # install extra bits for the manged builds
      - ${{ if not(startsWith(parameters.name, 'native_')) }}:
+        - task: UseDotNet@2
+          inputs:
+            packageType: 'sdk'
+            version: $(DOTNET_VERSION_PREVIOUS)
+            performMultiLevelLookup: true
+          displayName: Install the previous version of .NET Core
        - task: UseDotNet@2
          inputs:
            packageType: 'sdk'
@ -189,7 +195,7 @@ jobs:
      # publish artifacts
      - task: PublishBuildArtifacts@1
        displayName: Publish the ${{ parameters.name }} artifacts
-        condition: ${{ parameters.shouldPublish }}
+        condition: or(${{ parameters.shouldPublish }}, failed())
        inputs:
          artifactName: ${{ parameters.name }}
          pathToPublish: 'output'
--- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj
+++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj
@ -5,12 +5,6 @@
    <AssemblyName>SkiaSharp.HarfBuzz</AssemblyName>
    <PackagingGroup>SkiaSharp.HarfBuzz</PackagingGroup>
  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants>$(DefineConstants);__DESKTOP__</DefineConstants>
-  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
    <ProjectReference Include="..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj" />
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
@ -5,7 +5,6 @@
    <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>
    <SignAssembly>false</SignAssembly>
    <PackagingGroup>SkiaSharp.Views.Forms</PackagingGroup>
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
--- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj
@ -1,14 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;netcoreapp3.1</TargetFrameworks>
    <RootNamespace>SkiaSharp.Views.Desktop</RootNamespace>
    <AssemblyName>SkiaSharp.Views.Desktop.Common</AssemblyName>
    <PackagingGroup>SkiaSharp.Views.Desktop.Common</PackagingGroup>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>$(DefineConstants);__DESKTOP__;NET_STANDARD</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
    <DefineConstants>$(DefineConstants);__DESKTOP__</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
@ -17,7 +12,7 @@
  <ItemGroup>
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup>
    <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
  </ItemGroup>
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Extensions.cs
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Extensions.cs
@ -106,7 +106,7 @@ namespace SkiaSharp.Views.Tizen
 			return new System.Drawing.Size(size.Width, size.Height);
 		}

-#if __DESKTOP__ && !NET_STANDARD
+#if __DESKTOP__

 		// System.Drawing.Bitmap

--- a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
  <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
    <UseWpf>true</UseWpf>
    <RootNamespace>SkiaSharp.Views.WPF</RootNamespace>
    <AssemblyName>SkiaSharp.Views.WPF</AssemblyName>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
  <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
    <UseWindowsForms>true</UseWindowsForms>
    <RootNamespace>SkiaSharp.Views.Desktop</RootNamespace>
    <AssemblyName>SkiaSharp.Views.WindowsForms</AssemblyName>
--- a/source/SkiaSharp.Vulkan/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.csproj
+++ b/source/SkiaSharp.Vulkan/SkiaSharp.Vulkan.SharpVk/SkiaSharp.Vulkan.SharpVk.csproj
@ -5,7 +5,6 @@
    <AssemblyName>SkiaSharp.Vulkan.SharpVk</AssemblyName>
    <SignAssembly>false</SignAssembly>
    <PackagingGroup>SkiaSharp.Vulkan.SharpVk</PackagingGroup>
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="SharpVk" Version="0.4.2" />
--- a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj
+++ b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <DefineConstants>$(DefineConstants);NET_STANDARD;USE_LIBRARY_LOADER</DefineConstants>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DefineConstants>$(DefineConstants);USE_LIBRARY_LOADER</DefineConstants>
    <RootNamespace>SkiaSharp.Tests</RootNamespace>
    <AssemblyName>SkiaSharp.Tests</AssemblyName>
    <SkipGenerateAssemblyVersionInfo>true</SkipGenerateAssemblyVersionInfo>
@ -13,7 +13,7 @@
    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
    <PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
    <PackageReference Include="xunit.skippablefact" Version="1.3.12" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.0.3" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj" />
--- a/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj
+++ b/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <RootNamespace>SkiaSharp.Vulkan.Tests</RootNamespace>
    <AssemblyName>SkiaSharp.Vulkan.Tests</AssemblyName>
    <SignAssembly>false</SignAssembly>
@ -16,7 +15,7 @@
    <PackageReference Include="xunit.skippablefact" Version="1.3.12" />
    <PackageReference Include="SharpVk" Version="0.4.2" />
    <PackageReference Include="SharpVk.Glfw" Version="0.4.1" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.0.3" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj" />
--- a/tests/Tests/BaseTest.cs
+++ b/tests/Tests/BaseTest.cs
@ -36,7 +36,7 @@ namespace SkiaSharp.Tests
 			PathToImages = Path.Combine(PathToAssembly, "images");

 			// some platforms run the tests from a temporary location, so copy the native files
-#if !NET_STANDARD && !__ANDROID__ && !__IOS__
+#if !NETCOREAPP && !__ANDROID__ && !__IOS__
 			var skiaRoot = Path.GetDirectoryName(typeof(SkiaSharp.SKImageInfo).Assembly.Location);
 			var harfRoot = Path.GetDirectoryName(typeof(HarfBuzzSharp.Buffer).Assembly.Location);

--- a/utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj
+++ b/utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>

--- a/utils/WasmTestRunner/WasmTestRunner.csproj
+++ b/utils/WasmTestRunner/WasmTestRunner.csproj
@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<LangVersion>8.0</LangVersion>
 		<AssemblyName>wasm-test</AssemblyName>
 	</PropertyGroup>