Add .NET 10 to the list of test TFMs and update CI

.github/workflows/build-and-test.yml

@@ -32,10 +32,9 @@ jobs:
         uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            6.x
-            7.x
             8.x
             9.x
+            10.x
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -51,7 +50,10 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: |
+            8.x
+            9.x
+            10.x
       - name: Restore tools
         run: dotnet tool restore
       - name: Build solution

.github/workflows/publish.yml

@@ -34,10 +34,9 @@ jobs:
         uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            6.x
-            7.x
             8.x
             9.x
+            10.x
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -55,10 +54,9 @@ jobs:
         uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            6.x
-            7.x
             8.x
             9.x
+            10.x
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })

tests/Giraffe.Tests/Giraffe.Tests.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <AssemblyName>Giraffe.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -46,6 +46,10 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.*" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.*" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.*" />

tests/Giraffe.Tests/Helpers.fs

@@ -14,6 +14,7 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.AspNetCore.TestHost
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
+open Microsoft.Extensions.Hosting
 open Xunit
 open NSubstitute
 open Giraffe
@@ -94,10 +95,22 @@ let createHost
     (configureServices: IServiceCollection -> unit)
     (args: 'Tuple)
     =
+#if NET10_0_OR_GREATER
+    HostBuilder()
+        .ConfigureWebHost(fun webHostBuilder ->
+            webHostBuilder
+                .UseTestServer()
+                .UseContentRoot(Path.GetFullPath("TestFiles"))
+                .Configure(Action<IApplicationBuilder>(configureApp args))
+                .ConfigureServices(Action<IServiceCollection> configureServices)
+            |> ignore
+        )
+#else
     (WebHostBuilder())
         .UseContentRoot(Path.GetFullPath("TestFiles"))
         .Configure(Action<IApplicationBuilder>(configureApp args))
         .ConfigureServices(Action<IServiceCollection> configureServices)
+#endif
 
 let mockJson (ctx: HttpContext) =
 
@@ -131,7 +144,15 @@ let createRequest (method: HttpMethod) (path: string) =
 
 let makeRequest configureApp configureServices args (request: HttpRequestMessage) =
     task {
+#if NET10_0_OR_GREATER
+        // https://github.com/aspnet/Announcements/issues/526
+        use host = createHost configureApp configureServices args |> _.Build()
+
+        let! _ = host.StartAsync()
+        use server = host.GetTestServer()
+#else
         use server = new TestServer(createHost configureApp configureServices args)
+#endif
         use client = server.CreateClient()
         let! response = request |> client.SendAsync
         return response