test: get rid of separate TestServer package (#3035)

Author: mxschmitt

src/Playwright.Tests.TestServer/Playwright.Tests.TestServer.csproj

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests.Assertions;
 
 public class APIResponseAssertionsTests : PageTestEx

src/Playwright.Tests.TestServer/Properties/launchSettings.json

@@ -36,7 +36,7 @@ public static Task<HttpService> Register(WorkerAwareTest test)
         var workerIndex = test.WorkerIndex;
         return test.RegisterService("Http", async () =>
         {
-            var assetDir = Path.Combine(TestUtils.FindParentDirectory("Playwright.Tests.TestServer"), "assets");
+            var assetDir = Path.Combine(TestUtils.FindParentDirectory("Playwright.Tests"), "assets");
             var http = new HttpService
             {
                 Server = SimpleServer.Create(8907 + workerIndex * 2, assetDir),

src/Playwright.Tests/Assertions/APIResponseAssertionsTests.cs

@@ -24,7 +24,6 @@
  */
 
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/BaseTests/HttpService.cs

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 public class BrowserContextEventsTests : PageTestEx

src/Playwright.Tests/BrowserContextBasicTests.cs

@@ -24,7 +24,6 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/BrowserContextEventsTests.cs

@@ -25,7 +25,6 @@
 using System.Diagnostics;
 using System.IO.Compression;
 using System.Text;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Playwright.Helpers;
 
 namespace Microsoft.Playwright.Tests;

src/Playwright.Tests/BrowserContextFetchTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Globalization;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/BrowserTypeConnectTests.cs

@@ -24,9 +24,6 @@
 
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 
 namespace Microsoft.Playwright.Tests;

src/Playwright.Tests/CapabilitiesTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/ClientCertficatesTests.cs

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 ///<playwright-file>download.spec.ts</playwright-file>

src/Playwright.Tests/DefaultBrowserContext1Tests.cs

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 public class DownloadsPathTests : PlaywrightTestEx

src/Playwright.Tests/DownloadTests.cs

@@ -24,7 +24,6 @@
  */
 
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/DownloadsPathTests.cs

@@ -25,7 +25,6 @@
 using System.Globalization;
 using System.Text;
 using System.Text.Json;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/FrameGoToTests.cs

@@ -24,7 +24,6 @@
  */
 
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/GlobalFetchTests.cs

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 public class PageAutoWaitingBasicTests : PageTestEx

src/Playwright.Tests/IgnoreHttpsErrorsTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Text.Json;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageAutoWaitingBasicTests.cs

@@ -25,7 +25,6 @@
 
 using System.Globalization;
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageClockTests.cs

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 public class PageNavigationTests : PageTestEx

src/Playwright.Tests/PageGotoTests.cs

@@ -26,7 +26,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageNavigationTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Text.Json;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageNetworkIdleTests.cs

@@ -25,7 +25,6 @@
 using System.Net;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 
 namespace Microsoft.Playwright.Tests;

src/Playwright.Tests/PageNetworkRequestTest.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Net;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageNetworkResponseTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Text.Json;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageRequestFulfillTests.cs

@@ -25,7 +25,6 @@
 using System.Globalization;
 using System.Net;
 using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Playwright.Tests;

src/Playwright.Tests/PageRequestInterceptTests.cs

@@ -23,8 +23,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 ///<playwright-file>page-wait-for-load-state.ts</playwright-file>

src/Playwright.Tests/PageRouteTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/PageWaitForLoadStateTests.cs

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
         <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>12</LangVersion>
@@ -11,6 +11,12 @@
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
     <Import Project="../Common/SignAssembly.props" />
+    <ItemGroup>
+      <None Update="TestServer/key.pfx">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+      <Folder Include="assets\" />
+    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="3.1.2">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -27,7 +33,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Playwright\Playwright.csproj" />
-        <ProjectReference Include="..\Playwright.Tests.TestServer\Playwright.Tests.TestServer.csproj" />
         <ProjectReference Include="..\Playwright.NUnit\Playwright.NUnit.csproj" />
     </ItemGroup>
 </Project>

src/Playwright.Tests/PageWaitForUrlTests.cs

@@ -23,7 +23,6 @@
  */
 
 using System.Text;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests;
 

src/Playwright.Tests/Playwright.Tests.csproj

@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.AspNetCore.Http;
-
 namespace Microsoft.Playwright.Tests;
 
 ///<playwright-file>resource-timing.spec.ts</playwright-file>

src/Playwright.Tests/ProxyTests.cs

@@ -23,26 +23,16 @@
  * SOFTWARE.
  */
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.WebSockets;
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using NUnit.Framework.Internal;
 
 namespace Microsoft.Playwright.Tests.TestServer;
@@ -155,7 +145,7 @@ public SimpleServer(int port, string contentRoot, bool isHttps)
             {
                 if (isHttps)
                 {
-                    var cert = new X509Certificate2("key.pfx", "aaaa");
+                    var cert = new X509Certificate2("TestServer/key.pfx", "aaaa");
                     options.Listen(IPAddress.Loopback, port, listenOptions => listenOptions.UseHttps(cert));
                 }
                 else

src/Playwright.Tests/ResourceTimingTests.cs

@@ -22,12 +22,8 @@
  * SOFTWARE.
  */
 
-using System;
 using System.Net.WebSockets;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.Playwright.Tests.TestServer;
 

src/Playwright.Tests.TestServer/SimpleServer.cs src/Playwright.Tests/TestServer/SimpleServer.cs

@@ -113,7 +113,7 @@ internal static async Task RegisterEngineWithPathAsync(IPlaywright playwright, s
         }
     }
 
-    internal static string GetAsset(string path) => Path.Combine(FindParentDirectory("Playwright.Tests.TestServer"), "assets", path);
+    internal static string GetAsset(string path) => Path.Combine(FindParentDirectory("Playwright.Tests"), "assets", path);
 
     internal static async Task VerifyViewportAsync(IPage page, int width, int height)
     {