From b43029affa73ea1eeba7b8894f7b81befdb2719f Mon Sep 17 00:00:00 2001
From: Antonis Kotis <antkotis@hotmail.com>
Date: Mon, 17 Nov 2025 18:33:40 +0200
Subject: [PATCH] Upgrade to .NET 10.0 and update dependencies

Updated target frameworks to include .NET 10.0 and removed support for .NET 6.0. Upgraded package references to their latest versions, including `Microsoft.Extensions.*`, `Microsoft.NET.Test.Sdk`, and `xunit.runner.visualstudio`. Bumped `FeatureMasterX` version to 10.0.0 and updated release notes accordingly.

Refactored `ListCheckFeatureFilterProvider.cs` to use nullable dictionary values in `ConfigurationBuilder.AddInMemoryCollection`. Made minor formatting adjustments in project files.
---
 .../FeatureMasterX.XUnitTest.csproj                | 12 ++++++------
 FeatureMasterX/FeatureMasterX.csproj               | 14 ++++++++------
 .../Filters/ListCheckFeatureFilterProvider.cs      |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/FeatureMasterX.XUnitTest/FeatureMasterX.XUnitTest.csproj b/FeatureMasterX.XUnitTest/FeatureMasterX.XUnitTest.csproj
index 5b95a42..313d1ec 100644
--- a/FeatureMasterX.XUnitTest/FeatureMasterX.XUnitTest.csproj
+++ b/FeatureMasterX.XUnitTest/FeatureMasterX.XUnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
@@ -14,12 +14,12 @@
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
 		<PackageReference Include="xunit" Version="2.9.3" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/FeatureMasterX/FeatureMasterX.csproj b/FeatureMasterX/FeatureMasterX.csproj
index c862452..a97809d 100644
--- a/FeatureMasterX/FeatureMasterX.csproj
+++ b/FeatureMasterX/FeatureMasterX.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<RepositoryUrl>https://github.com/SkJonko/FeatureMasterX</RepositoryUrl>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageIcon>image.png</PackageIcon>
@@ -14,10 +14,12 @@
 		<PackageProjectUrl>https://github.com/SkJonko/FeatureMasterX</PackageProjectUrl>
 		<Title>FeatureMasterX</Title>
 		<Description>A powerful and easy-to-use extension for Microsoft's FeatureManagement library</Description>
-		<Version>9.0.2</Version>
+		<Version>10.0.0</Version>
 		<Authors>SKJonko</Authors>
 		<Copyright>Copyright © 2025</Copyright>
 		<PackageReleaseNotes>
+			10.0.0
+			- Feature: Port in NET 10.0. Remove support for net6.0
 			9.0.2
 			- Feature: Add Scoped Dependency Injection of FeatureMasterX
 			9.0.1
@@ -32,16 +34,16 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
-			<Version Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</Version>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0">
 			<Version Condition="'$(TargetFramework)' == 'net8.0'">8.0.2</Version>
 			<Version Condition="'$(TargetFramework)' == 'net9.0'">9.0.1</Version>
+			<Version Condition="'$(TargetFramework)' == 'net9.0'">9.0.1</Version>
 		</PackageReference>
-		<PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
+		<PackageReference Include="Microsoft.FeatureManagement" Version="4.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Images\image.png" Pack="true" PackagePath=""/>
+		<None Include="Images\image.png" Pack="true" PackagePath="" />
 	</ItemGroup>
 
 </Project>
diff --git a/FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs b/FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs
index 289846b..ec46948 100644
--- a/FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs
+++ b/FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs
@@ -40,7 +40,7 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
                 {
                     Name = FeatureMasterXExtensions.ListCheck,
                     Parameters = new ConfigurationBuilder()
-                        .AddInMemoryCollection(new Dictionary<string, string>
+                        .AddInMemoryCollection(new Dictionary<string, string?>
                         {
                             { FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
                         })
@@ -69,7 +69,7 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
                     {
                         Name = FeatureMasterXExtensions.ListCheck,
                         Parameters = new ConfigurationBuilder()
-                            .AddInMemoryCollection(new Dictionary<string, string>
+                            .AddInMemoryCollection(new Dictionary<string, string?>
                             {
                                 { FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
                             })