Upgrade tolling and tests to .NET 6 (#1889)

kblok · web-flow · commit 498d65120753 · 2022-01-12T12:23:50.000-03:00
diff --git a/appveyor-demo.yml b/appveyor-demo.yml
@@ -2,12 +2,12 @@ version: 1.0.{build}
 branches:
   only:
   - master
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 environment:
   matrix:
     - framework: net471
-    - framework: netcoreapp3.1
+    - framework: net6.0
 before_build:
 - ps: >-
     dotnet restore .\demos\PuppeteerSharpDemos-Local.sln
@@ -20,4 +20,4 @@ test_script:
 - cmd: >-
     cd .\demos\PuppeteerSharpPdfDemo
 
-    dotnet run -p PuppeteerSharpPdfDemo-Local.csproj -f %framework% auto-exit
+    dotnet run -p PuppeteerSharpPdfDemo-Local.csproj -f %framework% auto-exit
diff --git a/appveyor-edge.yml b/appveyor-edge.yml
@@ -2,7 +2,7 @@ version: 1.0.{build}
 branches:
   only:
   - disabled
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 environment:
   git_access_token:
@@ -33,6 +33,6 @@ test_script:
 - cmd: >-
     cd .\lib\PuppeteerSharp.Tests
 
-    dotnet test -f net5.0 -s test.runsettings
+    dotnet test -f net6.0 -s test.runsettings
 cache:
-  - $HOME/.nuget/packages
+  - $HOME/.nuget/packages
diff --git a/appveyor-fullframework.yml b/appveyor-fullframework.yml
@@ -2,7 +2,7 @@ version: 1.0.{build}
 branches:
   only:
   - master
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 clone_folder: C:\projects\puppeteer-sharp
 environment:
diff --git a/appveyor-linux.yml b/appveyor-linux.yml
@@ -9,9 +9,9 @@ environment:
   git_access_token:
     secure: FxcQ9C8a/NgcQB5dFdZts6ZWEDT4zMhA4qPQAYwWc7huMmhmTIl1sbFEIaAWQMTL
   matrix:
-    - framework: net5.0
+    - framework: net6.0
       PRODUCT: CHROMIUM
-    - framework: net5.0
+    - framework: net6.0
       PRODUCT: FIREFOX
 
 before_build:
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,21 +2,21 @@ version: 1.0.{build}
 branches:
   only:
   - master
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration: Release
 environment:
   git_access_token:
     secure: FxcQ9C8a/NgcQB5dFdZts6ZWEDT4zMhA4qPQAYwWc7huMmhmTIl1sbFEIaAWQMTL
   matrix:
     - framework: net48
-    - framework: net5.0
+    - framework: net6.0
     - framework: net48
       ENQUEUE_ASYNC_MESSAGES: true
-    - framework: net5.0
+    - framework: net6.0
       ENQUEUE_ASYNC_MESSAGES: true
 install:
 - ps: >-
-    if($env:APPVEYOR_REPO_TAG -eq 'True' -And $env:framework -eq 'netcoreapp2.0') {
+    if($env:APPVEYOR_REPO_TAG -eq 'True' -And $env:framework -eq 'net6.0') {
         choco install docfx
     }
 before_build:
diff --git a/appveyor/GenerateDocs.ps1 b/appveyor/GenerateDocs.ps1
@@ -1,4 +1,4 @@
-if($env:APPVEYOR_REPO_TAG -eq 'True' -And $env:framework -eq 'netcoreapp2.2' -And $env:ENQUEUE_ASYNC_MESSAGES -eq 'true') {
+if($env:APPVEYOR_REPO_TAG -eq 'True' -And $env:framework -eq 'net6.0' -And $env:ENQUEUE_ASYNC_MESSAGES -eq 'true') {
     git config --global credential.helper store
     Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:git_access_token):x-oauth-basic@github.com`n"
 
@@ -13,4 +13,4 @@ if($env:APPVEYOR_REPO_TAG -eq 'True' -And $env:framework -eq 'netcoreapp2.2' -An
     git add docs/* -f
     git commit -m "Docs version $($env:APPVEYOR_REPO_TAG_NAME)"
     git subtree push --prefix docs pages gh-pages
-}
+}
diff --git a/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo-Local.csproj b/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo-Local.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net471</TargetFrameworks>
+    <TargetFrameworks>net6.0;net471</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net471'">
diff --git a/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo.csproj b/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="PuppeteerSharp" Version="3.0.0" />
diff --git a/lib/PuppeteerSharp.DevicesFetcher/PuppeteerSharp.DevicesFetcher.csproj b/lib/PuppeteerSharp.DevicesFetcher/PuppeteerSharp.DevicesFetcher.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
diff --git a/lib/PuppeteerSharp.TestServer/PuppeteerSharp.TestServer.csproj b/lib/PuppeteerSharp.TestServer/PuppeteerSharp.TestServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
diff --git a/lib/PuppeteerSharp.TestServer/SimpleCompressionMiddleware.cs b/lib/PuppeteerSharp.TestServer/SimpleCompressionMiddleware.cs
@@ -40,7 +40,11 @@ public async Task Invoke(HttpContext context)
                 context.Response.Headers["Content-Encoding"] = "gzip";
                 context.Response.Headers["Content-Length"] = stream.Length.ToString();
                 stream.Position = 0;
+#if NETCOREAPP
+                await stream.CopyToAsync(response);
+#else
                 stream.CopyTo(response);
+#endif
                 context.Response.Body = response;
             }
         }
diff --git a/lib/PuppeteerSharp.Tests.DumpIO/PuppeteerSharp.Tests.DumpIO.csproj b/lib/PuppeteerSharp.Tests.DumpIO/PuppeteerSharp.Tests.DumpIO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\PuppeteerSharp\PuppeteerSharp.csproj" />
diff --git a/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs b/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs
@@ -132,7 +132,7 @@ private string GetSubprocessWorkingDir(string dir)
                 dir,
                 "bin",
                 build,
-                "net5.0");
+                "net6.0");
 #else
             return Path.Combine(
                 TestUtils.FindParentDirectory("lib"),
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj b/lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48;net5.0</TargetFrameworks>
+		<TargetFrameworks>net48;net6.0</TargetFrameworks>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="MarkdownSnippets.MsBuild" Version="23.1.1" PrivateAssets="All" />
+		<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.2.2" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
 		<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
 		<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0-preview.2.21154.6" />
 	</ItemGroup>
diff --git a/lib/PuppeteerSharp.Tests/RequestInterceptionTests/RequestContinueTests.cs b/lib/PuppeteerSharp.Tests/RequestInterceptionTests/RequestContinueTests.cs
@@ -132,11 +132,18 @@ public async Task ShouldAmendBothPostDataAndMethodOnNavigation()
                 Method = HttpMethod.Post,
                 PostData = "doggo"
             });
-            var serverRequest = Server.WaitForRequest("/empty.html", req => new { req.Method, Body = new StreamReader(req.Body).ReadToEnd() });
+            
+            var serverRequestTask = Server.WaitForRequest("/empty.html", async req =>
+            {
+                var body = await new StreamReader(req.Body).ReadToEndAsync();
+                return new { req.Method, Body = body };
+            });
+            
             await Task.WhenAll(
-                serverRequest,
+                serverRequestTask,
                 Page.GoToAsync(TestConstants.EmptyPage)
             );
+            var serverRequest = await serverRequestTask;
             Assert.Equal(HttpMethod.Post.Method, serverRequest.Result.Method);
             Assert.Equal("doggo", serverRequest.Result.Body);
         }
diff --git a/lib/PuppeteerSharp.Tooling/PuppeteerSharp.Tooling.csproj b/lib/PuppeteerSharp.Tooling/PuppeteerSharp.Tooling.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<CodeAnalysisRuleSet>../PuppeteerSharp.ruleset</CodeAnalysisRuleSet>
 		<IsTool>true</IsTool>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/lib/PuppeteerSharp.Xunit/PuppeteerSharp.Xunit.csproj b/lib/PuppeteerSharp.Xunit/PuppeteerSharp.Xunit.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net48</TargetFrameworks>
+		<TargetFrameworks>net6.0;net48</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../Common/SignAssembly.props" />
 </Project>
diff --git a/samples/complex-js-objects/complex-js-objects.csproj b/samples/complex-js-objects/complex-js-objects.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>complex_js_objects</RootNamespace>
   </PropertyGroup>
 
diff --git a/samples/get-all-links/get-all-links.csproj b/samples/get-all-links/get-all-links.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Example</RootNamespace>
   </PropertyGroup>
 
diff --git a/samples/reuse-downloaded-chrome/reuse-downloaded-chrome.csproj b/samples/reuse-downloaded-chrome/reuse-downloaded-chrome.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Exaxmple</RootNamespace>
   </PropertyGroup>
 
diff --git a/samples/searching/searching.csproj b/samples/searching/searching.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
