From 84c958a9f0ba81987ac1d0518755dd506805bac6 Mon Sep 17 00:00:00 2001
From: Mattias Karlsson <matkar@wcom.se>
Date: Wed, 11 Nov 2026 17:28:56 +0100
Subject: [PATCH] Update to .NET 11 GA (11.0.100), Cake.Sdk 7.0.0, drop
 net8.0/net9.0

- global.json: SDK 11.0.100
- cake.cs: Cake.Sdk 7.0.0
- Target net10.0;net11.0 only; remove net8.0/net9.0 dependency groups
- Routes.cs: use System.Threading.Lock unconditionally
- Remove System.Linq.Async (only used by net8.0/net9.0)
- Microsoft.AspNetCore.TestHost, Microsoft.Extensions.Http, Microsoft.Net.Http.Headers 11.0.0 GA for net11.0, 10.0.15 for net10.0
- Devlead.Console 2026.11.11.1030, Devlead.SourcePack 2026.11.11.161, Microsoft.NET.Test.Sdk 18.12.0
- CI: install only .NET SDK 10.0.x besides global.json
---
 .github/workflows/build.yml                     |  4 +---
 cake.cs                                         |  2 +-
 global.json                                     |  2 +-
 .../Devlead.Testing.MockHttp.Tests.csproj       |  3 +--
 .../Devlead.Testing.MockHttp.Dependencies.props | 17 ++---------------
 .../Devlead.Testing.MockHttp.csproj             |  2 +-
 src/Devlead.Testing.MockHttp/Routes.cs          |  6 +-----
 src/Directory.Packages.props                    | 15 +++++++--------
 8 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20eca4e..caf4726 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,12 +31,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install .NET SDK 8.0.x, 9.0.x & 10.0.x
+      - name: Install .NET SDK 10.0.x
         uses: actions/setup-dotnet@v6
         with:
           dotnet-version: |
-            8.0.x
-            9.0.x
             10.0.x
 
       - name: Install .NET SDK from global.json
diff --git a/cake.cs b/cake.cs
index 8be72c4..2ac6200 100644
--- a/cake.cs
+++ b/cake.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/env dotnet
-#:sdk Cake.Sdk@6.3.0
+#:sdk Cake.Sdk@7.0.0
 #:property IncludeAdditionalFiles=./build/*.cs
 
 
diff --git a/global.json b/global.json
index 8f27119..0bda696 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
-    "version": "11.0.100-rc.3.26522.148"
+    "version": "11.0.100"
   }
 }
\ No newline at end of file
diff --git a/src/Devlead.Testing.MockHttp.Tests/Devlead.Testing.MockHttp.Tests.csproj b/src/Devlead.Testing.MockHttp.Tests/Devlead.Testing.MockHttp.Tests.csproj
index 564bfd5..c974f79 100644
--- a/src/Devlead.Testing.MockHttp.Tests/Devlead.Testing.MockHttp.Tests.csproj
+++ b/src/Devlead.Testing.MockHttp.Tests/Devlead.Testing.MockHttp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net11.0;net10.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -27,7 +27,6 @@
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="System.Linq.Async" Condition="'$(TargetFramework)' != 'net10.0' AND '$(TargetFramework)' != 'net11.0'"  />
     <PackageReference Include="Verify.NUnit" />
   </ItemGroup>
 
diff --git a/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.Dependencies.props b/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.Dependencies.props
index ccd9f5e..944bc5d 100644
--- a/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.Dependencies.props
+++ b/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.Dependencies.props
@@ -3,19 +3,6 @@
     <PackageReference Include="Argon.Xml" />
     <PackageReference Include="Verify" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Verify.Http" VersionOverride="6.4.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="8.0.1" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="8.0.33" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="8.0.3" />
-    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="8.10.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Verify.Http" VersionOverride="7.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.0.22" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="9.0.22" />
-    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="9.10.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
     <PackageReference Include="Verify.Http" />
     <PackageReference Include="Microsoft.Extensions.Http" />
@@ -24,8 +11,8 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
     <PackageReference Include="Verify.Http" />
-    <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="11.0.0-rc.3.26522.148" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="11.0.0-rc.3.26522.148" />
+    <PackageReference Include="Microsoft.Extensions.Http" VersionOverride="11.0.0" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="11.0.0" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.csproj b/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.csproj
index 163b119..510fb33 100644
--- a/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.csproj
+++ b/src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/Devlead.Testing.MockHttp/Routes.cs b/src/Devlead.Testing.MockHttp/Routes.cs
index bcd3098..09f444b 100644
--- a/src/Devlead.Testing.MockHttp/Routes.cs
+++ b/src/Devlead.Testing.MockHttp/Routes.cs
@@ -60,11 +60,7 @@ string AbsoluteUri
 
 
     private static readonly
-#if NET9_0_OR_GREATER
-        Lock 
-#else
-        object
-#endif
+        Lock
         _lock = new ();
 
     private static ImmutableDictionary<(HttpMethod Method, string PathAndQuery), Func<HttpRequestMessage, HttpResponseMessage>> InitializeRoutesFromResource()
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 9b2e235..850dcb9 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -8,21 +8,20 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Argon.Xml" Version="0.38.2" />
-    <PackageVersion Include="Devlead.Console" Version="2026.10.26.1021" />
-    <PackageVersion Include="Devlead.SourcePack" Version="2026.10.26.148" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="11.0.0-rc.3.26522.148" Condition="'$(TargetFramework)' == 'net11.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.14" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <PackageVersion Include="Devlead.Console" Version="2026.11.11.1030" />
+    <PackageVersion Include="Devlead.SourcePack" Version="2026.11.11.161" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="11.0.0" Condition="'$(TargetFramework)' == 'net11.0'" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.15" Condition="'$(TargetFramework)' == 'net10.0'" />
     <PackageVersion Include="Verify" Version="33.3.4" />
     <PackageVersion Include="coverlet.collector" Version="10.1.0" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.11.0" />
-    <PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.14" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.14" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
+    <PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.15" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.15" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.12.0" />
     <PackageVersion Include="MimeTypes" Version="2.5.2" />
     <PackageVersion Include="NUnit" Version="5.0.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.15.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.3.1" />
-    <PackageVersion Include="System.Linq.Async" Version="7.0.1" />
     <PackageVersion Include="Verify.NUnit" Version="33.3.4" />
     <PackageVersion Include="Verify.Http" Version="8.0.1" />
   </ItemGroup>