Dropping .NET Framework test builds (#2305)

kblok · web-flow · commit 73a6419dde59 · 2023-09-05T15:25:57.000-03:00
* Add missing cookies tests

* https urls

* add some page to frame

* fix https url

* fix test

* fix cert install

* bump to net7

* more bumps

* Remove framework reference

* Test only in net core

* demo cleanup

* fix build

* undo triage code

* improve cookies tests in firefox
diff --git a/.github/workflows/PushNugetPackageToIntNugetOrg.yml b/.github/workflows/PushNugetPackageToIntNugetOrg.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+  DOTNET_VERSION: '7.0.x' # The .NET SDK version to use
 
 jobs:
   PushToIntNugetOrg:
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: |
         dotnet restore lib/PuppeteerSharp.sln
diff --git a/.github/workflows/PushNugetPackageToNugetOrg.yml b/.github/workflows/PushNugetPackageToNugetOrg.yml
@@ -7,7 +7,7 @@ on:
         - v*
 
 env:
-  DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+  DOTNET_VERSION: '7.0.x' # The .NET SDK version to use
 
 jobs:
    PushToNugetOrg:
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         os: [windows-2022, macos-latest]
     env:
-      DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+      DOTNET_VERSION: '7.0.x' # The .NET SDK version to use
 
     steps:
     - uses: actions/checkout@v2
@@ -38,4 +38,4 @@ jobs:
     - name: Run Project
       working-directory: ./demos/PuppeteerSharpPdfDemo
       run: |
-          dotnet run -p PuppeteerSharpPdfDemo-Local.csproj -f net6.0 auto-exit
+          dotnet run --project PuppeteerSharpPdfDemo-Local.csproj auto-exit
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,7 +15,7 @@ on:
     - '**.runsettings'
 
 env:
-  DOTNET_VERSION: '6.0.x' # The .NET SDK version to use
+  DOTNET_VERSION: '7.0.x' # The .NET SDK version to use
 
 jobs:
   build:
@@ -43,6 +43,7 @@ jobs:
     - name: Install dependencies (Linux)
       if: matrix.os == 'ubuntu-latest'
       run: |
+        dotnet dev-certs https --clean
         dotnet dev-certs https -ep lib/PuppeteerSharp.TestServer/testCert.cer
         sudo openssl x509 -inform der -in lib/PuppeteerSharp.TestServer/testCert.cer -out /usr/local/share/ca-certificates/testCert.crt -outform pem
         sudo update-ca-certificates
@@ -62,11 +63,12 @@ jobs:
           Xvfb :1 -screen 5 1024x768x8 &
           export DISPLAY=:1.5
           cd lib/PuppeteerSharp.Tests
-          dotnet test -f net6.0 -s test.runsettings -c Debug --logger "trx;LogFileName=TestResults.xml"
+          dotnet test -s test.runsettings -c Debug --logger "trx;LogFileName=TestResults.xml"
     - name: Test (Windows)
       if: matrix.os == 'windows-latest'
       env:
         PRODUCT: ${{ matrix.browser }}
       run: |
         cd .\lib\PuppeteerSharp.Tests
-        dotnet test -f net6.0 -s test.runsettings
+        dotnet test -s test.runsettings
+
diff --git a/demos/PuppeteerSharpPdfDemo/Program.cs b/demos/PuppeteerSharpPdfDemo/Program.cs
@@ -16,6 +16,7 @@ public static async Task Main(string[] args)
             };
 
             Console.WriteLine("Downloading chromium");
+
             using var browserFetcher = new BrowserFetcher();
             await browserFetcher.DownloadAsync();
 
diff --git a/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo-Local.csproj b/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo-Local.csproj
@@ -2,12 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net471</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net471'">
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\PuppeteerSharp\PuppeteerSharp.csproj" />
   </ItemGroup>
diff --git a/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo.csproj b/demos/PuppeteerSharpPdfDemo/PuppeteerSharpPdfDemo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/lib/PuppeteerSharp.Nunit/PuppeteerSharp.Nunit.csproj b/lib/PuppeteerSharp.Nunit/PuppeteerSharp.Nunit.csproj
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 	  <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/lib/PuppeteerSharp.TestServer/PuppeteerSharp.TestServer.csproj b/lib/PuppeteerSharp.TestServer/PuppeteerSharp.TestServer.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
@@ -10,10 +9,6 @@
     </Content>
   </ItemGroup>
   <Import Project="../Common/SignAssembly.props" />
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-  </ItemGroup>
   <Target Name="testCertCheck" BeforeTargets="BeforeBuild" Condition="!Exists('testCert.cer')">
     <Error Text="Follow https://github.com/hardkoded/puppeteer-sharp/blob/master/CONTRIBUTING.md#getting-setup to setup a development certificate." />
   </Target>
diff --git a/lib/PuppeteerSharp.TestServer/SimpleServer.cs b/lib/PuppeteerSharp.TestServer/SimpleServer.cs
@@ -75,6 +75,7 @@ public SimpleServer(int port, string contentRoot, bool isHttps)
                     }))
                 .UseKestrel(options =>
                 {
+                    options.ConfigureEndpointDefaults(lo => lo.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1);
                     if (isHttps)
                     {
                         options.Listen(IPAddress.Loopback, port, listenOptions => listenOptions.UseHttps("testCert.cer"));
diff --git a/lib/PuppeteerSharp.Tests.DumpIO/PuppeteerSharp.Tests.DumpIO.csproj b/lib/PuppeteerSharp.Tests.DumpIO/PuppeteerSharp.Tests.DumpIO.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\PuppeteerSharp\PuppeteerSharp.csproj" />
diff --git a/lib/PuppeteerSharp.Tests.SingleFileDeployment/PuppeteerSharp.Tests.SingleFileDeployment.csproj b/lib/PuppeteerSharp.Tests.SingleFileDeployment/PuppeteerSharp.Tests.SingleFileDeployment.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10</LangVersion>
diff --git a/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs b/lib/PuppeteerSharp.Tests/CookiesTests/SetCookiesTests.cs
@@ -221,6 +221,26 @@ await Page.SetCookieAsync(new CookieParam
             Assert.True(cookie.Secure);
         }
 
+        [PuppeteerTest("cookies.spec.ts", "Page.setCookie", "should be able to set insecure cookie for HTTP website")]
+        [Skip(SkipAttribute.Targets.Firefox)]
+        public async Task ShouldDefaultToSettingSecureCookieForHttpWebsites()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            var SecureUrl = "http://example.com";
+
+            await Page.SetCookieAsync(new CookieParam
+            {
+                Url = SecureUrl,
+                Name = "foo",
+                Value = "bar"
+            });
+
+            var cookies = await Page.GetCookiesAsync(SecureUrl);
+            Assert.That(cookies, Has.Exactly(1).Items);
+            var cookie = cookies.First();
+            Assert.False(cookie.Secure);
+        }
+
         [PuppeteerTest("cookies.spec.ts", "Page.setCookie", "should be able to set unsecure cookie for HTTP website")]
         [Skip(SkipAttribute.Targets.Firefox)]
         public async Task ShouldBeAbleToSetUnsecureCookieForHttpWebSite()
@@ -306,5 +326,52 @@ await Page.EvaluateFunctionAsync(@"src => {
             Assert.False(cookie.Secure);
             Assert.True(cookie.Session);
         }
+
+        [PuppeteerTest("cookies.spec.ts", "Page.setCookie", "should set secure same-site cookies from a frame")]
+        public async Task ShouldSetSecureSameSiteCookiesFromAFrame()
+        {
+            var options = TestConstants.DefaultBrowserOptions();
+            options.IgnoreHTTPSErrors = true;
+
+            await using var browser = await Puppeteer.LaunchAsync(options, TestConstants.LoggerFactory);
+            await using var page = await browser.NewPageAsync();
+            await page.GoToAsync(TestConstants.HttpsPrefix + "/grid.html");
+            await page.EvaluateFunctionAsync(@"src => {
+                    let fulfill;
+                    const promise = new Promise(x => fulfill = x);
+                    const iframe = document.createElement('iframe');
+                    document.body.appendChild(iframe);
+                    iframe.onload = fulfill;
+                    iframe.src = src;
+                    return promise;
+                }", TestConstants.CrossProcessHttpsPrefix + "/grid.html");
+            await page.SetCookieAsync(
+                new CookieParam
+                {
+                    Name = "127-cookie",
+                    Value = "best",
+                    Url = TestConstants.CrossProcessHttpsPrefix + "/grid.html",
+                    SameSite = SameSite.None,
+                });
+            Assert.AreEqual("127-cookie=best", await page.FirstChildFrame().EvaluateExpressionAsync<string>("document.cookie"));
+            var cookies = await page.GetCookiesAsync(TestConstants.CrossProcessHttpsPrefix + "/grid.html");
+            Assert.That(cookies, Has.Exactly(1).Items);
+            var cookie = cookies.First();
+            Assert.AreEqual("127-cookie", cookie.Name);
+            Assert.AreEqual("best", cookie.Value);
+            Assert.AreEqual("127.0.0.1", cookie.Domain);
+            Assert.AreEqual("/", cookie.Path);
+            Assert.AreEqual(cookie.Expires, -1);
+            Assert.AreEqual(14, cookie.Size);
+
+            // Puppeteer uses expectCookieEquals which excludes SameSite attribute
+            if(TestConstants.IsChrome)
+            {
+                Assert.AreEqual(SameSite.None, cookie.SameSite);
+            }
+            Assert.False(cookie.HttpOnly);
+            Assert.True(cookie.Secure);
+            Assert.True(cookie.Session);
+        }
     }
 }
diff --git a/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs b/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs
@@ -131,7 +131,7 @@ private string GetSubprocessWorkingDir(string dir)
                 dir,
                 "bin",
                 build,
-                "net6.0");
+                "net7.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,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 	<ItemGroup>
diff --git a/lib/PuppeteerSharp.Tests/TestConstants.cs b/lib/PuppeteerSharp.Tests/TestConstants.cs
@@ -19,6 +19,7 @@ public static class TestConstants
         public const string HttpsPrefix = "https://localhost:8082";
         public const string AboutBlank = "about:blank";
         public static readonly string CrossProcessHttpPrefix = "http://127.0.0.1:8081";
+        public static readonly string CrossProcessHttpsPrefix = "https://127.0.0.1:8082";
         public static readonly string EmptyPage = $"{ServerUrl}/empty.html";
         public static readonly string CrossProcessUrl = ServerIpUrl;
         public static readonly string ExtensionPath = Path.Combine(AppContext.BaseDirectory, "Assets", "simple-extension");
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>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<IsTool>true</IsTool>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.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>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
