.NET 10 (#271)

akade · akade · commit ac77370fb5e8 · 2025-12-14T21:32:55.000+01:00
* Added Net 10 support
* Benchmarks with .NET 10
* Updated build files
* Added spatial queries to readme.md
* Readme.md fitted with snippet links
* Benchmarks.md fitted with SnippetLink
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -6,7 +6,15 @@
       "version": "5.4.18",
       "commands": [
         "reportgenerator"
-      ]
+      ],
+      "rollForward": false
+    },
+    "akade.snippetlink": {
+      "version": "0.2.1",
+      "commands": [
+        "snippet-link"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -21,6 +21,7 @@ jobs:
         dotnet-version: |
            8.x
            9.x
+           10.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -58,6 +58,7 @@ jobs:
         dotnet-version: |
            8.x
            9.x
+           10.x
 
     - name: Build
       run: dotnet build
diff --git a/.github/workflows/publish-to-nuget-org.yml b/.github/workflows/publish-to-nuget-org.yml
@@ -19,6 +19,7 @@ jobs:
         dotnet-version: |
            8.x
            9.x
+           10.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/Akade.IndexedSet.Benchmarks/Akade.IndexedSet.Benchmarks.csproj b/Akade.IndexedSet.Benchmarks/Akade.IndexedSet.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<IsPackable>false</IsPackable>
@@ -15,6 +15,7 @@
     <PackageReference Include="Fastenshtein" Version="1.0.11" />
     <PackageReference Include="RBush" Version="4.0.0" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Onnx" Version="1.66.0-alpha" />
+    <PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.3.36714.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Akade.IndexedSet.Benchmarks/ConcurrentSetBenchmarks.cs b/Akade.IndexedSet.Benchmarks/ConcurrentSetBenchmarks.cs
@@ -8,6 +8,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
 [MemoryDiagnoser]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class ConcurrentSetBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/FullTextIndexBenchmarks.cs b/Akade.IndexedSet.Benchmarks/FullTextIndexBenchmarks.cs
@@ -6,6 +6,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class FullTextIndexBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/MultiValueIndexBenchmarks.cs b/Akade.IndexedSet.Benchmarks/MultiValueIndexBenchmarks.cs
@@ -5,6 +5,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [DisassemblyDiagnoser]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class MultiValueIndexBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/PrefixIndexBenchmarks.cs b/Akade.IndexedSet.Benchmarks/PrefixIndexBenchmarks.cs
@@ -8,6 +8,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class PrefixIndexBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/RangeIndexBenchmarks.cs b/Akade.IndexedSet.Benchmarks/RangeIndexBenchmarks.cs
@@ -6,6 +6,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class RangeIndexBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/RealWorld/EventSourcedAggregateCache/QueryBenchmarks.cs b/Akade.IndexedSet.Benchmarks/RealWorld/EventSourcedAggregateCache/QueryBenchmarks.cs
@@ -5,6 +5,7 @@
 namespace Akade.IndexedSet.Benchmarks.RealWorld.EventSourcedAggregateCache;
 
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 public class QueryBenchmarks
 {
     private readonly ConcurrentIndexedSet<AggregateId, Aggregate> _set = IndexedSetBuilder<Aggregate>.Create(x => x.Id)
diff --git a/Akade.IndexedSet.Benchmarks/RealWorld/EventSourcedAggregateCache/RehydrationBenchmark.cs b/Akade.IndexedSet.Benchmarks/RealWorld/EventSourcedAggregateCache/RehydrationBenchmark.cs
@@ -4,6 +4,7 @@
 namespace Akade.IndexedSet.Benchmarks.RealWorld.EventSourcedAggregateCache;
 
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 public class RehydrationBenchmark
 {
     private readonly ConcurrentIndexedSet<AggregateId, Aggregate> _set = IndexedSetBuilder<Aggregate>.Create(x => x.Id)
diff --git a/Akade.IndexedSet.Benchmarks/SpatialIndexBenchmark.cs b/Akade.IndexedSet.Benchmarks/SpatialIndexBenchmark.cs
@@ -12,6 +12,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class SpatialIndexBenchmark
 {
diff --git a/Akade.IndexedSet.Benchmarks/UniqueIndexBenchmarks.cs b/Akade.IndexedSet.Benchmarks/UniqueIndexBenchmarks.cs
@@ -5,6 +5,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [DisassemblyDiagnoser]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class UniqueIndexBenchmarks
 {
diff --git a/Akade.IndexedSet.Benchmarks/VectorBenchmarks.cs b/Akade.IndexedSet.Benchmarks/VectorBenchmarks.cs
@@ -11,6 +11,7 @@ namespace Akade.IndexedSet.Benchmarks;
 [MemoryDiagnoser]
 [DisassemblyDiagnoser]
 [SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]
+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]
 [JsonExporter]
 public class VectorBenchmarks
 {
diff --git a/Akade.IndexedSet.SampleData/Akade.IndexedSet.SampleData.csproj b/Akade.IndexedSet.SampleData/Akade.IndexedSet.SampleData.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Akade.IndexedSet.Tests/Akade.IndexedSet.Tests.csproj b/Akade.IndexedSet.Tests/Akade.IndexedSet.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
diff --git a/Akade.IndexedSet.Tests/Samples/Readme.cs b/Akade.IndexedSet.Tests/Samples/Readme.cs
@@ -1,4 +1,5 @@
 ﻿using Akade.IndexedSet.Concurrency;
+using Akade.IndexedSet.StringUtilities;
 
 namespace Akade.IndexedSet.Tests.Samples;
 
@@ -8,6 +9,8 @@ public class Readme
     private record Data(int PrimaryKey, int SecondaryKey, string Text = "")
     {
         public int MutableProperty { get; set; }
+
+        public IEnumerable<int> AlternativeKeys { get; set; } = [];
     }
 
     [TestMethod]
@@ -38,6 +41,16 @@ public void Features_NonUniqueIndex_SingleKey()
         IEnumerable<Data> data = set.Where(x => x.SecondaryKey, 5);
     }
 
+    [TestMethod]
+    public void Features_UniqueIndex_MultipleKeys()
+    {
+        IndexedSet<int, Data> set = IndexedSetBuilder<Data>.Create(a => a.PrimaryKey)
+                                                   .WithUniqueIndex(x => x.AlternativeKeys) // Where AlternativeKeys returns an IEnumerable<int>
+                                                   .Build();
+
+        _ = set.Add(new(PrimaryKey: 1, SecondaryKey: 2) { AlternativeKeys = [3, 4] });
+        _ = set.Single(x => x.AlternativeKeys, contains: 3); // returns above element
+    }
     private record GraphNode(int Id, IEnumerable<int> ConnectsTo);
 
     [TestMethod]
@@ -104,6 +117,14 @@ public void Features_ComputedOrCompoundKey()
         result = set.Where(ComputedKey.SomeStaticMethod, 42);
     }
 
+    [TestMethod]
+    public void Features_Concurrency()
+    {
+        ConcurrentIndexedSet<Data> set = IndexedSetBuilder<Data>.Create()
+                                                                .WithIndex(x => x.SecondaryKey)
+                                                                .BuildConcurrent();
+    }
+
     [TestMethod]
     public void Features_StringQueries()
     {
@@ -141,9 +162,9 @@ public void FAQ_MultipleIndicesForSameProperty()
     public void FAQ_CaseInsensitiveFuzzyMatching()
     {
         IndexedSet<Data> set = IndexedSetBuilder<Data>.Create(x => x.PrimaryKey)
-                                                      .WithFullTextIndex(x => x.Text.ToLowerInvariant())
+                                                      .WithFullTextIndex(x => x.Text, CharEqualityComparer.OrdinalIgnoreCase)
                                                       .Build();
-        IEnumerable<Data> matches = set.FuzzyContains(x => x.Text.ToLowerInvariant(), "Search", maxDistance: 2);
+        IEnumerable<Data> matches = set.FuzzyContains(x => x.Text, "Search", maxDistance: 2);
     }
 
     [TestMethod]
diff --git a/Akade.IndexedSet/Akade.IndexedSet.csproj b/Akade.IndexedSet/Akade.IndexedSet.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -55,6 +55,5 @@
 		<AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
 		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
 		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
-
 	</ItemGroup>
 </Project>
diff --git a/Akade.IndexedSet/PublicAPI/net10.0/PublicAPI.Shipped.txt b/Akade.IndexedSet/PublicAPI/net10.0/PublicAPI.Shipped.txt
diff --git a/Akade.IndexedSet/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/Akade.IndexedSet/PublicAPI/net10.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,4 @@
+#nullable enable
+virtual Akade.IndexedSet.IndexedSetBuilder<TElement>.WithVectorIndex(System.Func<TElement, System.ReadOnlySpan<float>>! keyAccessor, string? indexName = null) -> Akade.IndexedSet.IndexedSetBuilder<TElement>!
+Akade.IndexedSet.Concurrency.ConcurrentIndexedSet<TElement>.ApproximateNearestNeighbors(System.Func<TElement, System.ReadOnlySpan<float>>! indexAccessor, System.ReadOnlySpan<float> value, int k, string? indexName = null) -> System.Collections.Generic.IEnumerable<TElement>!
+Akade.IndexedSet.IndexedSet<TElement>.ApproximateNearestNeighbors(System.Func<TElement, System.ReadOnlySpan<float>>! indexAccessor, System.ReadOnlySpan<float> value, int k, string? indexName = null) -> System.Collections.Generic.IEnumerable<TElement>!
diff --git a/Akade.IndexedSet/PublicAPI/net8.0/PublicAPI.Shipped.txt b/Akade.IndexedSet/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+ 
diff --git a/Analyzers/Akade.IndexedSet.Analyzers.Test/Akade.IndexedSet.Analyzers.Test.csproj b/Analyzers/Akade.IndexedSet.Analyzers.Test/Akade.IndexedSet.Analyzers.Test.csproj
@@ -1,7 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Akade.IndexedSet\Akade.IndexedSet.csproj" />
-	  <ProjectReference Include="..\Akade.IndexedSet.Analyzers\Akade.IndexedSet.Analyzers.csproj" />
-	  <ProjectReference Include="..\Akade.IndexedSet.Analyzers.Fixes\Akade.IndexedSet.Analyzers.Fixes.csproj" />
+    <ProjectReference Include="..\Akade.IndexedSet.Analyzers\Akade.IndexedSet.Analyzers.csproj" />
+    <ProjectReference Include="..\Akade.IndexedSet.Analyzers.Fixes\Akade.IndexedSet.Analyzers.Fixes.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Analyzers/Akade.IndexedSet.Analyzers.Test/NetRefAssemblies.cs b/Analyzers/Akade.IndexedSet.Analyzers.Test/NetRefAssemblies.cs
@@ -0,0 +1,18 @@
+﻿using Microsoft.CodeAnalysis.Testing;
+using System.IO;
+
+namespace Akade.IndexedSet.Analyzers.Test;
+
+internal static class NetRefAssemblies
+{
+    public static ReferenceAssemblies Current { get; } =
+#if NET8_0
+        ReferenceAssemblies.Net.Net80;
+#elif NET9_0
+        ReferenceAssemblies.Net.Net90;
+#elif NET10_0
+        new(targetFramework: "net10.0",
+            referenceAssemblyPackage: new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"),
+            referenceAssemblyPath: Path.Combine("ref", "net10.0"));
+#endif
+}
diff --git a/Analyzers/Akade.IndexedSet.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier+Test.cs b/Analyzers/Akade.IndexedSet.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier+Test.cs
@@ -18,7 +18,7 @@ public Test()
             string config = "Release";
             SetVersion(ref config);
 
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net90;
+            ReferenceAssemblies = NetRefAssemblies.Current;
 
             TestState.AdditionalReferences.Add(typeof(IndexedSet<>).Assembly);
 
diff --git a/Analyzers/Akade.IndexedSet.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs b/Analyzers/Akade.IndexedSet.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs
@@ -20,7 +20,7 @@ public Test()
             string config = "Release";
             SetVersion(ref config);
 
-            ReferenceAssemblies = ReferenceAssemblies.Net.Net90;
+            ReferenceAssemblies = NetRefAssemblies.Current;
 
             TestState.AdditionalReferences.Add(typeof(IndexedSet<>).Assembly);
 
diff --git a/README.md b/README.md
diff --git a/SourceGenerator/Akade.IndexedSet.InternalSourceGenerator.Tests/Akade.IndexedSet.InternalSourceGenerator.Tests.csproj b/SourceGenerator/Akade.IndexedSet.InternalSourceGenerator.Tests/Akade.IndexedSet.InternalSourceGenerator.Tests.csproj
diff --git a/docs/Benchmarks.md b/docs/Benchmarks.md

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,15 @@`
`6`	`6`	`"version": "5.4.18",`
`7`	`7`	`"commands": [`
`8`	`8`	`"reportgenerator"`
`9`		`- ]`
	`9`	`+ ],`
	`10`	`+ "rollForward": false`
	`11`	`+ },`
	`12`	`+ "akade.snippetlink": {`
	`13`	`+ "version": "0.2.1",`
	`14`	`+ "commands": [`
	`15`	`+ "snippet-link"`
	`16`	`+ ],`
	`17`	`+ "rollForward": false`
`10`	`18`	`}`
`11`	`19`	`}`
`12`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace Akade.IndexedSet.Benchmarks;`
`8`	`8`	`[GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]`
`9`	`9`	`[MemoryDiagnoser]`
`10`	`10`	`[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]`
	`11`	`+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]`
`11`	`12`	`[JsonExporter]`
`12`	`13`	`public class ConcurrentSetBenchmarks`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace Akade.IndexedSet.Benchmarks;`
`6`	`6`	`[MemoryDiagnoser]`
`7`	`7`	`[GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]`
`8`	`8`	`[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]`
	`9`	`+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]`
`9`	`10`	`[JsonExporter]`
`10`	`11`	`public class FullTextIndexBenchmarks`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace Akade.IndexedSet.Benchmarks;`
`5`	`5`	`[MemoryDiagnoser]`
`6`	`6`	`[DisassemblyDiagnoser]`
`7`	`7`	`[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net90)]`
	`8`	`+[SimpleJob(BenchmarkDotNet.Jobs.RuntimeMoniker.Net10_0)]`
`8`	`9`	`[JsonExporter]`
`9`	`10`	`public class MultiValueIndexBenchmarks`
`10`	`11`	`{`