moved to .NET 10

mizrael · mizrael · commit 5994a01293f4 · 2025-11-15T14:37:26.000-05:00
diff --git a/Versions.props b/Versions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 	<PropertyGroup>
-		<TargetFrameworkVersion>net9.0</TargetFrameworkVersion>
+		<TargetFrameworkVersion>net10.0</TargetFrameworkVersion>
 		<RepositoryUrl>https://github.com/mizrael/EvenireDB</RepositoryUrl>
 		<PackageProjectUrl>https://deepwiki.com/mizrael/EvenireDB</PackageProjectUrl>
 	</PropertyGroup>
diff --git a/src/EvenireDB.Client/EvenireDB.Client.csproj b/src/EvenireDB.Client/EvenireDB.Client.csproj
@@ -39,10 +39,10 @@
 	</PropertyGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.33.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.33.1" />
 		<PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
 		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
 		<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
 	</ItemGroup>
 
diff --git a/src/EvenireDB.Server/EvenireDB.Server.csproj b/src/EvenireDB.Server/EvenireDB.Server.csproj
@@ -11,7 +11,7 @@
 	<ItemGroup>
     <PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.33.0" />
+    <PackageReference Include="Google.Protobuf" Version="3.33.1" />
     <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.71.0" />
   </ItemGroup>
 
diff --git a/src/EvenireDB/EvenireDB.csproj b/src/EvenireDB/EvenireDB.csproj
@@ -8,10 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
   </ItemGroup>
 
 	<ItemGroup>
diff --git a/src/EvenireDB/Workers/IncomingEventsPersistenceWorker.cs b/src/EvenireDB/Workers/IncomingEventsPersistenceWorker.cs
@@ -32,20 +32,21 @@ await Task.Run(async () =>
     private async Task ExecuteAsyncCore(CancellationToken cancellationToken)
     {
         while (!cancellationToken.IsCancellationRequested)
-            await _reader.ReadAllAsync(cancellationToken)
-               .ForEachAsync(async batch =>
-               {
-                   if (batch is null)
-                       return;
-                   try
-                   {
-                       await _repo.AppendAsync(batch.StreamId, batch.Events, cancellationToken)
-                                  .ConfigureAwait(false);
-                   }
-                   catch (Exception ex)
-                   {
-                       _logger.EventsGroupPersistenceError(batch.StreamId, ex.Message);
-                   }
-               }, cancellationToken);
+        {
+            await foreach(var batch in _reader.ReadAllAsync(cancellationToken))
+            {
+                if (batch is null)
+                    continue;
+                try
+                {
+                    await _repo.AppendAsync(batch.StreamId, batch.Events, cancellationToken)
+                               .ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.EventsGroupPersistenceError(batch.StreamId, ex.Message);
+                }
+            }
+        }
     }
 }
diff --git a/tests/EvenireDB.Client.Tests/EvenireDB.Client.Tests.csproj b/tests/EvenireDB.Client.Tests/EvenireDB.Client.Tests.csproj
@@ -14,10 +14,9 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		  <PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
 		<PackageReference Include="NSubstitute" Version="5.3.0" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.3" />
 		<PackageReference Include="xunit" Version="2.9.3" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/EvenireDB.Server.Tests/EvenireDB.Server.Tests.csproj b/tests/EvenireDB.Server.Tests/EvenireDB.Server.Tests.csproj
@@ -14,10 +14,9 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		  <PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
 		<PackageReference Include="NSubstitute" Version="5.3.0" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.3" />
 		<PackageReference Include="xunit" Version="2.9.3" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/EvenireDB.Server.Tests/GrpcTests.cs b/tests/EvenireDB.Server.Tests/GrpcTests.cs
@@ -27,7 +27,7 @@ public async Task Get_Archive_should_be_empty_when_no_events_available_for_strea
             StreamType = "lorem"
         };
         var response = client.Read(req);
-        var loadedEvents = await response.ResponseStream.ReadAllAsync().ToListAsync();
+        var loadedEvents = await response.ResponseStream.ReadAllAsync().ToArrayAsync();
         Assert.Empty(loadedEvents);
     }
 
diff --git a/tests/EvenireDB.Tests/EvenireDB.Tests.csproj b/tests/EvenireDB.Tests/EvenireDB.Tests.csproj
@@ -14,9 +14,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
 	<PackageReference Include="NSubstitute" Version="5.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.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.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tools/EvenireDB.Tools.Benchmark/EvenireDB.Tools.Benchmark.csproj b/tools/EvenireDB.Tools.Benchmark/EvenireDB.Tools.Benchmark.csproj
@@ -13,10 +13,10 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.15.5" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-		<PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.0.36525.3" />
+		<PackageReference Include="BenchmarkDotNet.TestAdapter" Version="0.15.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+		<PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.3.36714.1" />
 	</ItemGroup>
 
 
diff --git a/tools/EvenireDB.Tools.EventsGenerator/EvenireDB.Tools.EventsGenerator.csproj b/tools/EvenireDB.Tools.EventsGenerator/EvenireDB.Tools.EventsGenerator.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
     <ItemGroup>
-	    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+	    <PackageReference Include="System.CommandLine" Version="2.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/tools/EvenireDB.Tools.EventsGenerator/Program.cs b/tools/EvenireDB.Tools.EventsGenerator/Program.cs
@@ -10,44 +10,64 @@
 var defaultGrpcPort = 5243;
 var defaultHttpPort = 5001;
 
-var serverOption = new Option<Uri>(
-           name: "--server",
-           getDefaultValue: () => defaultServerUri,
-           description: $"The server uri. Defaults to {defaultServerUri}.");
-var useGrpc = new Option<bool>(
-              name: "--useGrpc",
-              description: "Use gRPC instead of HTTP. Defaults to false.");
-var grpcPort = new Option<int>(
-              name: "--grpcPort",
-              getDefaultValue: () => defaultGrpcPort,
-              description: $"HTTP Port. Defaults to {defaultGrpcPort}.");
-var httpPort = new Option<int>(
-              name: "--httpPort",
-              getDefaultValue: () => defaultHttpPort,
-              description: $"HTTP Port. Defaults to {defaultHttpPort}.");
-var eventsCount = new Option<int>(
-              name: "--count",
-              getDefaultValue: () => defaultEventsCount,
-              description: $"Count of events to send. Defaults to {defaultEventsCount}.");
-
-var streamIdOption = new Option<Guid>(
-              name: "--stream",
-              description: "The stream to use.");
-var streamTypeOption = new Option<string>(
-              name: "--type",
-              description: "The stream type to use.");
+var serverOption = new Option<Uri>(name: "--server")
+{
+    Description = $"The server uri. Defaults to {defaultServerUri}.",
+    DefaultValueFactory = _ => defaultServerUri
+};
+
+var useGrpcOption = new Option<bool>(name: "--useGrpc")
+{
+    Description = "Use gRPC instead of HTTP. Defaults to false."
+};
+
+var grpcPortOption = new Option<int>(name: "--grpcPort")
+{
+    Description = $"HTTP Port. Defaults to {defaultGrpcPort}.",
+    DefaultValueFactory = _ => defaultGrpcPort
+};
+
+var httpPortOption = new Option<int>(name: "--httpPort")
+{
+    Description = $"HTTP Port. Defaults to {defaultHttpPort}.",
+    DefaultValueFactory = _ => defaultHttpPort
+};
+
+var eventsCountOption = new Option<int>(name: "--count")
+{
+    Description = $"Count of events to send. Defaults to {defaultEventsCount}.",
+    DefaultValueFactory = _ => defaultEventsCount
+};
+
+var streamIdOption = new Option<Guid>(name: "--stream")
+{
+    Description = "The stream to use."
+};
+
+var streamTypeOption = new Option<string>(name: "--type")
+{
+    Description = "The stream type.",
+};
 
 var rootCommand = new RootCommand
 {
     serverOption,
-    useGrpc,
-    grpcPort,
-    httpPort,
-    eventsCount,
+    useGrpcOption,
+    grpcPortOption,
+    httpPortOption,
+    eventsCountOption,
     streamIdOption,
     streamTypeOption
 };
-rootCommand.SetHandler(async (streamKey, streamType, uri, useGrpc, grpcPort, httpPort, eventsCount) => {
+rootCommand.SetAction( async parseResult => {
+    var uri = parseResult.GetValue(serverOption) ?? defaultServerUri;
+    var useGrpc = parseResult.GetValue(useGrpcOption);
+    var grpcPort = parseResult.GetValue(grpcPortOption);
+    var httpPort = parseResult.GetValue(httpPortOption);
+    var streamKey = parseResult.GetValue(streamIdOption);
+    var streamType = parseResult.GetValue(streamTypeOption);
+    var eventsCount = parseResult.GetValue(eventsCountOption);
+
     var clientConfig = new EvenireClientConfig()
     {
         ServerUri = uri,
@@ -83,6 +103,6 @@
     Console.WriteLine("Done.");
 
     Console.ResetColor();
-}, streamIdOption, streamTypeOption, serverOption, useGrpc, grpcPort, httpPort, eventsCount);
+});
 
-await rootCommand.InvokeAsync(args);
+await rootCommand.Parse(args).InvokeAsync();

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public async Task Get_Archive_should_be_empty_when_no_events_available_for_strea`
`27`	`27`	`StreamType = "lorem"`
`28`	`28`	`};`
`29`	`29`	`var response = client.Read(req);`
`30`		`- var loadedEvents = await response.ResponseStream.ReadAllAsync().ToListAsync();`
	`30`	`+ var loadedEvents = await response.ResponseStream.ReadAllAsync().ToArrayAsync();`
`31`	`31`	`Assert.Empty(loadedEvents);`
`32`	`32`	`}`
`33`	`33`