From f6f4bc085fd68441e8002e3fd00104519b0e96fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <webmaster@am-wd.de>
Date: Thu, 13 Nov 2025 20:43:19 +0100
Subject: [PATCH] Added support for .NET 10.0 and C#14, removed support for
 .NET 6.0

---
 .gitlab-ci.yml                                   |  2 +-
 CHANGELOG.md                                     | 10 ++++++----
 Directory.Build.props                            |  2 +-
 .../AMWD.Common.AspNetCore.csproj                |  2 +-
 .../AMWD.Common.EntityFrameworkCore.csproj       | 16 ++++++++--------
 .../AMWD.Common.MessagePack.csproj               |  4 ++--
 src/AMWD.Common/AMWD.Common.csproj               |  6 +++++-
 .../AMWD.Common.AspNetCore.Tests.csproj          |  2 +-
 test/AMWD.Common.Tests/AMWD.Common.Tests.csproj  |  2 +-
 9 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d70913..715bb69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 # The image should use the same version as the UnitTests are
-image: mcr.microsoft.com/dotnet/sdk:8.0
+image: mcr.microsoft.com/dotnet/sdk:10.0
 
 variables:
   TZ: Europe/Berlin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcde64f..3e594ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,21 +22,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `DomainComparer` ordering alphabetically from TLD to sub-domain
 - `IPAddressComparer` able to compare IPv4 and IPv6
 - `VersionStringComparer` to compare version strings (SemVer)
+- Support for .NET 10.0 LTS
 
 ### Changed
 
 - Solution restructured to use multiple test projects
-- Optimized for C# 12
+- Optimized for C# 14
 - `IPNetwork` is used from (as `Microsoft.AspNetCore.HttpOverrides` is tagged as "out of support"):
-  - .NET Standard 2.0 and .NET 6.0: `Microsoft.AspNetCore.HttpOverrides.IPNetwork`
-  - .NET 8.0: `System.Net.IPNetwork`
+  - .NET Standard 2.0: `Microsoft.AspNetCore.HttpOverrides.IPNetwork`
+  - .NET 8.0 and later: `System.Net.IPNetwork`
 - Moved `MessagePack` formatter extensions to own package `AMWD.Common.MessagePack`
 - `GetAlignedInterval()` (without Local/Utc) is now public accessible
-- Using native `Convert.FromHexString` on .NET 8.0 on `HexToBytes` extension
+- Using native `Convert.FromHexString` on .NET 8.0 and later on `HexToBytes` extension
 
 ### Removed
 
 - `GetDisplayName` for enum values was removed
+- Support for .NET 6.0 LTS
 
 
 ## asp/v3.0.0, efc/v3.0.0 - 2023-12-28
diff --git a/Directory.Build.props b/Directory.Build.props
index 8665a0f..f4ddf54 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>14.0</LangVersion>
 
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
diff --git a/src/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj b/src/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
index 1078be8..f1f3160 100644
--- a/src/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
+++ b/src/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
 
     <AssemblyName>amwd-common-aspnetcore</AssemblyName>
     <RootNamespace>AMWD.Common.AspNetCore</RootNamespace>
diff --git a/src/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj b/src/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
index b07b8ad..5e06b66 100644
--- a/src/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
+++ b/src/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
 
     <AssemblyName>amwd-common-efcore</AssemblyName>
     <RootNamespace>AMWD.Common.EntityFrameworkCore</RootNamespace>
@@ -11,13 +11,6 @@
     <Product>AM.WD Common Library for EntityFramework Core</Product>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
@@ -25,4 +18,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/AMWD.Common.MessagePack/AMWD.Common.MessagePack.csproj b/src/AMWD.Common.MessagePack/AMWD.Common.MessagePack.csproj
index 8e91e8a..3dc47eb 100644
--- a/src/AMWD.Common.MessagePack/AMWD.Common.MessagePack.csproj
+++ b/src/AMWD.Common.MessagePack/AMWD.Common.MessagePack.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
 
     <AssemblyName>amwd-common-msgpack</AssemblyName>
     <RootNamespace>AMWD.Common.MessagePack</RootNamespace>
@@ -15,7 +15,7 @@
     <PackageReference Include="MessagePack" Version="2.5.198" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
   </ItemGroup>
 
diff --git a/src/AMWD.Common/AMWD.Common.csproj b/src/AMWD.Common/AMWD.Common.csproj
index 1960e8e..56dbc5b 100644
--- a/src/AMWD.Common/AMWD.Common.csproj
+++ b/src/AMWD.Common/AMWD.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
 
     <AssemblyName>amwd-common</AssemblyName>
     <RootNamespace>AMWD.Common</RootNamespace>
@@ -24,4 +24,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/AMWD.Common.AspNetCore.Tests/AMWD.Common.AspNetCore.Tests.csproj b/test/AMWD.Common.AspNetCore.Tests/AMWD.Common.AspNetCore.Tests.csproj
index 17ec0fa..bb801f9 100644
--- a/test/AMWD.Common.AspNetCore.Tests/AMWD.Common.AspNetCore.Tests.csproj
+++ b/test/AMWD.Common.AspNetCore.Tests/AMWD.Common.AspNetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/AMWD.Common.Tests/AMWD.Common.Tests.csproj b/test/AMWD.Common.Tests/AMWD.Common.Tests.csproj
index d1fd1e9..99a6e17 100644
--- a/test/AMWD.Common.Tests/AMWD.Common.Tests.csproj
+++ b/test/AMWD.Common.Tests/AMWD.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>