Merge branch 'develop' into dev/dotnet-6.0

build.cake

@@ -726,7 +726,7 @@ Task ("nuget-special")
                 var platform = id.Substring (id.IndexOf (".") + 1);
                 var files = xdoc.Root.Element ("files");
                 files.Add (new XElement ("file",
-                    new XAttribute ("src", $"*/**"),
+                    new XAttribute ("src", $"**"),
                     new XAttribute ("target", $"tools/{platform}")));
             }
 

nuget/_NativeAssets.nuspec

@@ -16,7 +16,7 @@
   </metadata>
   <files>
 
-    <!-- <file src="*/**" target="tools/" /> -->
+    <!-- <file src="**" target="tools/" /> -->
 
   </files>
 </package>

scripts/azure-pipelines.yml

@@ -35,6 +35,7 @@ variables:
   NUGET_DIFF_PRERELEASE: false
   ENABLE_CODE_COVERAGE: true
   EMSCRIPTEN_VERSION: 2.0.12
+  XHARNESS_VERSION: 1.0.0-prerelease.21180.1
 
 resources:
   repositories:
@@ -566,7 +567,7 @@ stages:
                 dotnet tool install Microsoft.DotNet.XHarness.CLI `
                   --global `
                   --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json `
-                  --version "1.0.0-prerelease*"
+                  --version "$env:XHARNESS_VERSION"
               displayName: Install the xharness .NET Core tool
             - bash: |
                 sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"emulator\" \"system-images;android-30;google_apis_playstore;x86\""
@@ -603,7 +604,7 @@ stages:
                 dotnet tool install Microsoft.DotNet.XHarness.CLI `
                   --global `
                   --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json `
-                  --version "1.0.0-prerelease*"
+                  --version "$env:XHARNESS_VERSION"
               displayName: Install the xharness .NET Core tool
           postBuildSteps:
             - task: PublishTestResults@2

tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj

@@ -68,7 +68,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -76,6 +75,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="xunit.skippablefact" Version="1.3.12" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj">