From 01b593e3b85a2d509ed539272e0b4c5ac8d21f12 Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 19:14:52 +0200
Subject: [PATCH 1/6] chore: drop net7.0 support

---
 .github/workflows/check.yml                                     | 1 -
 .github/workflows/publish.yml                                   | 1 -
 .github/workflows/test-version.yml                              | 1 -
 .../CSharpFunctionalExtensions.HttpResults.Tests.csproj         | 2 +-
 .../CSharpFunctionalExtensions.HttpResults.csproj               | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 141430a..2e77080 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -34,7 +34,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            7
             8
             9.0.201
             10.0.100
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6f3e6bf..8b36fec 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -32,7 +32,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            7
             8
             9.0.201
             10.0.100
diff --git a/.github/workflows/test-version.yml b/.github/workflows/test-version.yml
index 0b76125..46a1b01 100644
--- a/.github/workflows/test-version.yml
+++ b/.github/workflows/test-version.yml
@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            7
             8
             9.0.201
             10.0.100
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
index dc50d37..bb57f4e 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj b/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj
index 631c3dc..bceace0 100644
--- a/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj
+++ b/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>

From 18057216fcb5dbd0691d1a54dcd1f797a05d872b Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:27:36 +0200
Subject: [PATCH 2/6] chore: update deps

---
 .github/workflows/check.yml                                 | 2 +-
 .github/workflows/publish.yml                               | 2 +-
 .github/workflows/test-version.yml                          | 2 +-
 .../CSharpFunctionalExtensions.HttpResults.Examples.csproj  | 6 +++---
 ...FunctionalExtensions.HttpResults.Generators.Tests.csproj | 4 ++--
 .../CSharpFunctionalExtensions.HttpResults.Tests.csproj     | 4 ++--
 global.json                                                 | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 2e77080..8b8513f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -36,7 +36,7 @@ jobs:
           dotnet-version: |
             8
             9.0.201
-            10.0.100
+            10.0.302
 
       - name: Install .NET tools
         run: dotnet tool restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8b36fec..757b0e5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -34,7 +34,7 @@ jobs:
           dotnet-version: |
             8
             9.0.201
-            10.0.100
+            10.0.302
 
       - name: Install .NET tools
         run: dotnet tool restore
diff --git a/.github/workflows/test-version.yml b/.github/workflows/test-version.yml
index 46a1b01..3469679 100644
--- a/.github/workflows/test-version.yml
+++ b/.github/workflows/test-version.yml
@@ -31,7 +31,7 @@ jobs:
           dotnet-version: |
             8
             9.0.201
-            10.0.100
+            10.0.302
 
       - name: Override CSharpFunctionalExtensions Version
         run: |
diff --git a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
index f691891..713828e 100644
--- a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
@@ -7,9 +7,9 @@
 
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="CSharpFunctionalExtensions" Version="3.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.10.3" />
+    <PackageReference Include="CSharpFunctionalExtensions" Version="3.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.10" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.16.13" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
index 1b697ba..4ffa5d7 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
@@ -7,14 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="7.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
index bb57f4e..57091fd 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="7.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
+    <PackageReference Include="coverlet.collector" Version="10.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/global.json b/global.json
index 69e101b..0b82a98 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "10.0.100",
+    "version": "10.0.302",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }
-}
\ No newline at end of file
+}

From bfb10f847045bb5c0071455e05da29476fe75611 Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:58:00 +0200
Subject: [PATCH 3/6] chore: replace FluentAssertions with AwesomeAssertions

---
 ...rpFunctionalExtensions.HttpResults.Generators.Tests.csproj | 2 +-
 .../ExternalAssemblyErrorTypeTests.cs                         | 2 +-
 .../Rules/DuplicateMapperRuleTests.cs                         | 2 +-
 .../Rules/ParameterlessConstructorRuleTests.cs                | 2 +-
 .../CSharpFunctionalExtensions.HttpResults.Tests.csproj       | 2 +-
 .../ProblemDetailsMappingProviderTests.cs                     | 4 ++--
 .../ResultExtensions/ToAcceptedAtRouteHttpResultT.cs          | 2 +-
 .../ResultExtensions/ToAcceptedAtRouteHttpResultTE.cs         | 2 +-
 .../ResultExtensions/ToAcceptedHttpResultT.cs                 | 2 +-
 .../ResultExtensions/ToAcceptedHttpResultTE.cs                | 2 +-
 .../ResultExtensions/ToContentHttpResultString.cs             | 2 +-
 .../ResultExtensions/ToContentHttpResultStringE.cs            | 2 +-
 .../ResultExtensions/ToCreatedAtRouteHttpResultT.cs           | 2 +-
 .../ResultExtensions/ToCreatedAtRouteHttpResultTE.cs          | 2 +-
 .../ResultExtensions/ToCreatedHttpResultT.cs                  | 2 +-
 .../ResultExtensions/ToCreatedHttpResultTE.cs                 | 2 +-
 .../ResultExtensions/ToFileHttpResultByteArray.cs             | 2 +-
 .../ResultExtensions/ToFileHttpResultByteArrayE.cs            | 2 +-
 .../ResultExtensions/ToFileStreamHttpResultStream.cs          | 2 +-
 .../ResultExtensions/ToFileStreamHttpResultStreamE.cs         | 2 +-
 .../ResultExtensions/ToJsonHttpResultT.cs                     | 2 +-
 .../ResultExtensions/ToJsonHttpResultTE.cs                    | 4 ++--
 .../ResultExtensions/ToNoContentHttpResult.cs                 | 2 +-
 .../ResultExtensions/ToNoContentHttpResultT.cs                | 2 +-
 .../ResultExtensions/ToNoContentHttpResultTE.cs               | 2 +-
 .../ResultExtensions/ToOkHttpResultT.cs                       | 2 +-
 .../ResultExtensions/ToOkHttpResultTE.cs                      | 4 ++--
 .../ToServerSentEventsHttpResultIAsyncEnumerableT.cs          | 2 +-
 .../ToServerSentEventsHttpResultIAsyncEnumerableTE.cs         | 2 +-
 .../ResultExtensions/ToStatusCodeHttpResult.cs                | 2 +-
 .../ResultExtensions/ToStatusCodeHttpResultT.cs               | 2 +-
 .../ResultExtensions/ToStatusCodeHttpResultTE.cs              | 2 +-
 .../UnitResultExtensions/ToNoContentHttpResultE.cs            | 4 ++--
 .../UnitResultExtensions/ToStatusCodeHttpResultE.cs           | 4 ++--
 34 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
index 4ffa5d7..4fd8b51 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="9.4.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
index df57919..3b46932 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 
diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/DuplicateMapperRuleTests.cs b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/DuplicateMapperRuleTests.cs
index 48e19d6..fa119d5 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/DuplicateMapperRuleTests.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/DuplicateMapperRuleTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.CodeAnalysis;
 
 namespace CSharpFunctionalExtensions.HttpResults.Generators.Tests.Rules;
diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/ParameterlessConstructorRuleTests.cs b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/ParameterlessConstructorRuleTests.cs
index 40c48b4..98880c6 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/ParameterlessConstructorRuleTests.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/Rules/ParameterlessConstructorRuleTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.CodeAnalysis;
 
 namespace CSharpFunctionalExtensions.HttpResults.Generators.Tests.Rules;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
index 57091fd..ae2898a 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="7.2.0" />
+    <PackageReference Include="AwesomeAssertions" Version="9.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ProblemDetailsMappingProviderTests.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ProblemDetailsMappingProviderTests.cs
index 1cce3b5..80898e3 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ProblemDetailsMappingProviderTests.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ProblemDetailsMappingProviderTests.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
+using AwesomeAssertions;
+using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultT.cs
index cbd2b6d..4bb5656 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultT.cs
@@ -1,6 +1,6 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultTE.cs
index ca93d78..763dc89 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedAtRouteHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultT.cs
index d67ae33..4bc0f8d 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultT.cs
@@ -1,6 +1,6 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultTE.cs
index 72a5370..ceb08a8 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToAcceptedHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultString.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultString.cs
index f7d5a09..9bd9306 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultString.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultString.cs
@@ -1,6 +1,6 @@
 using System.Text;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultStringE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultStringE.cs
index 11f0707..4969aea 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultStringE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToContentHttpResultStringE.cs
@@ -1,7 +1,7 @@
 using System.Text;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultT.cs
index a3f5d11..18457fe 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultT.cs
@@ -1,6 +1,6 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultTE.cs
index 1104adf..0ca2ce2 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedAtRouteHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultT.cs
index ec05260..94ca447 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultT.cs
@@ -1,6 +1,6 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultTE.cs
index e9b2f49..d3d0c82 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToCreatedHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArray.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArray.cs
index 7dbff44..76dc0e0 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArray.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArray.cs
@@ -1,6 +1,6 @@
 using System.Net.Mime;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Net.Http.Headers;
 
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArrayE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArrayE.cs
index 67736fb..a456c8f 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArrayE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileHttpResultByteArrayE.cs
@@ -1,6 +1,6 @@
 using System.Net.Mime;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Net.Http.Headers;
 
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
index afddd07..a349c38 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
@@ -1,6 +1,6 @@
 using System.Net.Mime;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Net.Http.Headers;
 
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
index efae667..e77f532 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
@@ -1,6 +1,6 @@
 using System.Net.Mime;
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Net.Http.Headers;
 
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultT.cs
index 7471a57..7fbee4e 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultT.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultTE.cs
index 110ea44..17bb74f 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToJsonHttpResultTE.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
+using AwesomeAssertions;
+using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResult.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResult.cs
index 907f04e..e8e2c84 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResult.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResult.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultT.cs
index 70ab14b..4933435 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultT.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultTE.cs
index 7b88493..c0d4ee1 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToNoContentHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultT.cs
index 42929dd..410fab5 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultT.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultTE.cs
index a69eb31..e9ffe6d 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToOkHttpResultTE.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
+using AwesomeAssertions;
+using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableT.cs
index 5cd6303..fb896a5 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableT.cs
@@ -3,7 +3,7 @@
 using System.Net.Mime;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Utils;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableTE.cs
index 4beac36..1758680 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToServerSentEventsHttpResultIAsyncEnumerableTE.cs
@@ -4,7 +4,7 @@
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
 using CSharpFunctionalExtensions.HttpResults.Tests.Utils;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResult.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResult.cs
index 951cc7b..a6d1045 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResult.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResult.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultT.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultT.cs
index 92df11d..e34d7d2 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultT.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultT.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.ResultExtensions;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultTE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultTE.cs
index daad43a..d323af9 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultTE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToStatusCodeHttpResultTE.cs
@@ -1,5 +1,5 @@
+using AwesomeAssertions;
 using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.ResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToNoContentHttpResultE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToNoContentHttpResultE.cs
index 696fe54..28591b8 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToNoContentHttpResultE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToNoContentHttpResultE.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
+using AwesomeAssertions;
+using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.UnitResultExtensions;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToStatusCodeHttpResultE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToStatusCodeHttpResultE.cs
index d3cfe61..2071eca 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToStatusCodeHttpResultE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/UnitResultExtensions/ToStatusCodeHttpResultE.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
-using FluentAssertions;
+using AwesomeAssertions;
+using CSharpFunctionalExtensions.HttpResults.Tests.Shared;
 using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace CSharpFunctionalExtensions.HttpResults.Tests.UnitResultExtensions;

From 7bbc31f81ad43f45194110047bb1b4a69f30fe0a Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 19:20:04 +0200
Subject: [PATCH 4/6] fix: linting issues

---
 .../Utils/ServerSentEventsExtensions.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/Utils/ServerSentEventsExtensions.cs b/CSharpFunctionalExtensions.HttpResults.Tests/Utils/ServerSentEventsExtensions.cs
index 25b0c4e..0e3de8f 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/Utils/ServerSentEventsExtensions.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/Utils/ServerSentEventsExtensions.cs
@@ -50,7 +50,7 @@ IReadOnlyList<EventMessage> Values
   public record EventMessage
   {
     public string? Event { get; init; }
-    public string Data { get; init; }
+    public required string Data { get; init; }
   }
 }
 

From 26dee4aaecc41ca7bee385e0c509f4ae1f98deaf Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 19:25:32 +0200
Subject: [PATCH 5/6] chore: update Microsoft.OpenApi because of security
 vulnerability

---
 .../CSharpFunctionalExtensions.HttpResults.Examples.csproj       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
index 713828e..92fca03 100644
--- a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="Bogus" Version="35.6.5" />
     <PackageReference Include="CSharpFunctionalExtensions" Version="3.7.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.10" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.11.0" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.16.13" />
   </ItemGroup>
 

From 7213a1d2104067fd6fb4b77a0d3968f0a2cd84b1 Mon Sep 17 00:00:00 2001
From: Tim Schneider <43130816+DerStimmler@users.noreply.github.com>
Date: Thu, 16 Jul 2026 19:39:27 +0200
Subject: [PATCH 6/6] chore: update to xunit3

---
 ...nsions.HttpResults.Generators.Tests.csproj |  4 +++-
 .../ExternalAssemblyErrorTypeTests.cs         | 21 +++++++++++++------
 ...ctionalExtensions.HttpResults.Tests.csproj |  3 ++-
 .../ToFileStreamHttpResultStream.cs           |  2 +-
 .../ToFileStreamHttpResultStreamE.cs          |  2 +-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
index 4fd8b51..52d3877 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj
@@ -4,6 +4,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,11 +18,11 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
index 3b46932..e321c6b 100644
--- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/ExternalAssemblyErrorTypeTests.cs
@@ -21,7 +21,10 @@ namespace MyApp.Infrastructure.Errors;
       public sealed record NotFoundError(string Message);
       """;
 
-    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(externalErrorTypeCode);
+    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(
+      externalErrorTypeCode,
+      cancellationToken: TestContext.Current.CancellationToken
+    );
     var externalCompilation = CSharpCompilation.Create(
       "ExternalAssembly",
       [externalAssemblySyntaxTree],
@@ -31,7 +34,7 @@ public sealed record NotFoundError(string Message);
 
     // Emit the external assembly to get a reference
     using var ms = new MemoryStream();
-    var emitResult = externalCompilation.Emit(ms);
+    var emitResult = externalCompilation.Emit(ms, cancellationToken: TestContext.Current.CancellationToken);
     emitResult.Success.Should().BeTrue("External assembly should compile");
 
     ms.Position = 0;
@@ -74,7 +77,10 @@ public sealed record NotFoundError(string Message);
       public sealed record ValidationError(string Message);
       """;
 
-    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(externalErrorTypesCode);
+    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(
+      externalErrorTypesCode,
+      cancellationToken: TestContext.Current.CancellationToken
+    );
     var externalCompilation = CSharpCompilation.Create(
       "ExternalAssembly",
       [externalAssemblySyntaxTree],
@@ -83,7 +89,7 @@ public sealed record ValidationError(string Message);
     );
 
     using var ms = new MemoryStream();
-    var emitResult = externalCompilation.Emit(ms);
+    var emitResult = externalCompilation.Emit(ms, cancellationToken: TestContext.Current.CancellationToken);
     emitResult.Success.Should().BeTrue();
 
     ms.Position = 0;
@@ -138,7 +144,10 @@ namespace MyApp.Infrastructure.Errors;
       public sealed record NotFoundError(string Message);
       """;
 
-    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(externalErrorTypeCode);
+    var externalAssemblySyntaxTree = CSharpSyntaxTree.ParseText(
+      externalErrorTypeCode,
+      cancellationToken: TestContext.Current.CancellationToken
+    );
     var externalCompilation = CSharpCompilation.Create(
       "ExternalAssembly",
       [externalAssemblySyntaxTree],
@@ -147,7 +156,7 @@ public sealed record NotFoundError(string Message);
     );
 
     using var ms = new MemoryStream();
-    var emitResult = externalCompilation.Emit(ms);
+    var emitResult = externalCompilation.Emit(ms, cancellationToken: TestContext.Current.CancellationToken);
     emitResult.Success.Should().BeTrue();
 
     ms.Position = 0;
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
index ae2898a..f4e3d02 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj
@@ -6,12 +6,12 @@
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" Version="9.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -20,6 +20,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
index a349c38..be60b87 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStream.cs
@@ -58,7 +58,7 @@ await Task.FromResult(Result.Success(sourceStream))
 
     await using var resultStream = new MemoryStream();
     result!.FileStream.Position = 0;
-    await result!.FileStream.CopyToAsync(resultStream);
+    await result!.FileStream.CopyToAsync(resultStream, TestContext.Current.CancellationToken);
     resultStream.ToArray().Should().BeEquivalentTo(value);
     result!.LastModified.Should().Be(lastModified);
     result!.FileDownloadName.Should().Be(fileDownloadName);
diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
index e77f532..8b20a24 100644
--- a/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
+++ b/CSharpFunctionalExtensions.HttpResults.Tests/ResultExtensions/ToFileStreamHttpResultStreamE.cs
@@ -58,7 +58,7 @@ await Task.FromResult(Result.Success<Stream, DocumentMissingError>(sourceStream)
 
     await using var resultStream = new MemoryStream();
     result!.FileStream.Position = 0;
-    await result!.FileStream.CopyToAsync(resultStream);
+    await result!.FileStream.CopyToAsync(resultStream, TestContext.Current.CancellationToken);
     resultStream.ToArray().Should().BeEquivalentTo(value);
     result!.LastModified.Should().Be(lastModified);
     result!.FileDownloadName.Should().Be(fileDownloadName);