Update test targets to supported .NET versions (#85)

DamianEdwards · Copilot · web-flow · commit cb476b5ad6c1 · 2026-05-03T21:13:49.000-07:00
* Update test targets to supported .NET versions

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;

* Refresh TypeDescriptor cache when attributes change

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;

* Migrate solution file to slnx

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;

---------

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
@@ -19,7 +19,10 @@ jobs:
     - name: Install .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          8.0.x
+          9.0.x
+          10.0.x
         global-json-file: "./global.json"
     
     - name: Restore dependencies
diff --git a/MiniValidation.sln b/MiniValidation.sln
diff --git a/MiniValidation.slnx b/MiniValidation.slnx
@@ -0,0 +1,22 @@
+<Solution>
+  <Folder Name="/samples/">
+    <Project Path="samples/Samples.Console/Samples.Console.csproj" />
+    <Project Path="samples/Samples.Web/Samples.Web.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+    <File Path="ThirdPartyNotices.txt" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <Project Path="src/MiniValidation/MiniValidation.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/MiniValidation.Benchmarks/MiniValidation.Benchmarks.csproj" />
+    <Project Path="tests/MiniValidation.UnitTests/MiniValidation.UnitTests.csproj" />
+  </Folder>
+</Solution>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
-}
+}
diff --git a/samples/Samples.Console/Samples.Console.csproj b/samples/Samples.Console/Samples.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
diff --git a/samples/Samples.Web/Samples.Web.csproj b/samples/Samples.Web/Samples.Web.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/MiniValidation/MiniValidation.csproj b/src/MiniValidation/MiniValidation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A minimalist validation library built atop the existing validation features in .NET's `System.ComponentModel.DataAnnotations` namespace.</Description>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <PackageTags>ComponentModel DataAnnotations validation</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <LangVersion>10.0</LangVersion>
diff --git a/src/MiniValidation/TypeDetailsCache.cs b/src/MiniValidation/TypeDetailsCache.cs
@@ -14,19 +14,35 @@ internal class TypeDetailsCache
     private static readonly PropertyDetails[] _emptyPropertyDetails = Array.Empty<PropertyDetails>();
     private readonly ConcurrentDictionary<Type, (PropertyDetails[] Properties, bool RequiresAsync)> _cache = new();
 
+    public TypeDetailsCache()
+    {
+        TypeDescriptor.Refreshed += args =>
+        {
+            if (args.TypeChanged is { } type)
+            {
+                _cache.TryRemove(type, out _);
+            }
+            else
+            {
+                _cache.Clear();
+            }
+        };
+    }
+
     public (PropertyDetails[] Properties, bool RequiresAsync) Get(Type? type)
     {
         if (type is null)
         {
             return (_emptyPropertyDetails, false);
         }
 
-        if (!_cache.ContainsKey(type))
+        (PropertyDetails[] Properties, bool RequiresAsync) details;
+        while (!_cache.TryGetValue(type, out details))
         {
             Visit(type);
         }
 
-        return _cache[type];
+        return details;
     }
 
     private void Visit(Type type)
diff --git a/tests/MiniValidation.Benchmarks/MiniValidation.Benchmarks.csproj b/tests/MiniValidation.Benchmarks/MiniValidation.Benchmarks.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <TargetFrameworks Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">net471;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10</LangVersion>
diff --git a/tests/MiniValidation.UnitTests/MiniValidation.UnitTests.csproj b/tests/MiniValidation.UnitTests/MiniValidation.UnitTests.csproj
@@ -1,8 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">net471;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "10.0.100",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,19 +14,35 @@ internal class TypeDetailsCache`
`14`	`14`	`private static readonly PropertyDetails[] _emptyPropertyDetails = Array.Empty<PropertyDetails>();`
`15`	`15`	`private readonly ConcurrentDictionary<Type, (PropertyDetails[] Properties, bool RequiresAsync)> _cache = new();`
`16`	`16`
	`17`	`+ public TypeDetailsCache()`
	`18`	`+ {`
	`19`	`+ TypeDescriptor.Refreshed += args =>`
	`20`	`+ {`
	`21`	`+ if (args.TypeChanged is { } type)`
	`22`	`+ {`
	`23`	`+ _cache.TryRemove(type, out _);`
	`24`	`+ }`
	`25`	`+ else`
	`26`	`+ {`
	`27`	`+ _cache.Clear();`
	`28`	`+ }`
	`29`	`+ };`
	`30`	`+ }`
	`31`	`+`
`17`	`32`	`public (PropertyDetails[] Properties, bool RequiresAsync) Get(Type? type)`
`18`	`33`	`{`
`19`	`34`	`if (type is null)`
`20`	`35`	`{`
`21`	`36`	`return (_emptyPropertyDetails, false);`
`22`	`37`	`}`
`23`	`38`
`24`		`- if (!_cache.ContainsKey(type))`
	`39`	`+ (PropertyDetails[] Properties, bool RequiresAsync) details;`
	`40`	`+ while (!_cache.TryGetValue(type, out details))`
`25`	`41`	`{`
`26`	`42`	`Visit(type);`
`27`	`43`	`}`
`28`	`44`
`29`		`- return _cache[type];`
	`45`	`+ return details;`
`30`	`46`	`}`
`31`	`47`
`32`	`48`	`private void Visit(Type type)`