Merge pull request #2 from VincentH-Net/net-9-orleans-9

Update to C# 13, .NET 9 and Orleans 9

Author: VincentH-Net

.editorconfig

@@ -1,5 +1,5 @@
-# Version 20240405 - C# 12
-# Origin: see https://github.com/Applicita/Modern.CSharp.Templates/blob/main/Editorconfig.md
+# Version 20250331 - C# 13
+# Origin: see https://github.com/VincentH-Net/Modern.CSharp.Templates/blob/main/Editorconfig.md
 
 # This file does not inherit .editorconfig settings from higher directories - where possible, place it at the root of the repository
 
@@ -14,7 +14,7 @@
 
 # References:
 # - To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-# - Set rule severity https://docs.microsoft.com/en-us/visualstudio/code-quality/use-roslyn-analyzers?view=vs-2019#set-rule-severity-in-an-editorconfig-file
+# - Set rule severity https://learn.microsoft.com/en-us/visualstudio/code-quality/use-roslyn-analyzers?view=vs-2022#set-rule-severity-in-an-editorconfig-file
 # - Configure analyzer rules https://github.com/dotnet/roslyn-analyzers/blob/main/docs/Analyzer%20Configuration.md
 
 # Note that choices to deviate from the default are governed by these goals:
@@ -49,6 +49,9 @@ tab_width = 2
 indent_size = 4
 tab_width = 4
 
+# See https://github.com/dotnet/roslyn/issues/68413#issuecomment-1943805603
+trim_trailing_whitespace = false
+
 # New line preferences
 insert_final_newline = true # Default: false
 
@@ -174,6 +177,11 @@ csharp_using_directive_placement = outside_namespace:warning # Default: outside_
     # It can also make attribute usage more concise
     # See https://stackoverflow.com/questions/125319/should-using-directives-be-inside-or-outside-the-namespace
 
+# Preferences added with .NET 9 / C# 13
+csharp_prefer_system_threading_lock = true:warning # Default: true:suggestion
+csharp_style_prefer_unbound_generic_type_in_nameof = true:warning # Default: true:suggestion
+csharp_prefer_static_anonymous_function = true:warning # Default: true:suggestion
+
 # New line preferences
 csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
 csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
@@ -314,6 +322,3 @@ dotnet_diagnostic.IDE0072.severity = suggestion
     # while truly unexpected returns should throw an exception. Since switch automatically throws a SwitchExpressionException, 
     # it is valid to not explicitly code cases that throw an exception to indicate the return is truly unexpected.
 dotnet_diagnostic.IDE0130.severity = suggestion # IDE0130 "Namespace does not match folder structure" can be deviated from to prevent overstructuring
-
-# Solution-specific settings
-dotnet_diagnostic.ORLEANS0010.severity = none # adding an alias to every grain contract type and member adds too much noise. This rule should be triggered only during refactoring

README.md

@@ -1,5 +1,5 @@
 # <img src="img/CSharp-Toolkit-Icon.png" alt="Backend Toolkit" width="64px" />Orleans.Multiservice
-Prevent microservices pain with logical service separation in a modular monolith for [Microsoft Orleans 8](https://learn.microsoft.com/en-us/dotnet/orleans/)
+Prevent microservices pain with logical service separation in a modular monolith for [Microsoft Orleans 9](https://learn.microsoft.com/en-us/dotnet/orleans/)
 
 Orleans.Multiservice is an automated code structuring pattern for logical service separation within a Microsoft Orleans (micro)service.
 
@@ -28,9 +28,9 @@ Orleans.Multiservice consists of:
 - An example application that demonstrates the pattern in 2 stages of the application's life cycle:
 
   1) The application starts out as a single microservice, built by a single team, that contains two logical services - one of which depends on the other<br />
-     Source: [Single Team/Microservice eShop](https://github.com/Applicita/Orleans.Multiservice/tree/main/src/Example/eShopBySingleTeam/TeamA)
+     Source: [Single Team/Microservice eShop](https://github.com/VincentH-Net/Orleans.Multiservice/tree/main/src/Example/eShopBySingleTeam/TeamA)
   2) Then a second team is added that will become owner of one of the logical services. A second microservice is added and one logical service is moved into that (in a real world application this could also be moving 5 out of 10 logical services to a second microservice)<br />
-     Source: [Two Team/Microservice eShop](https://github.com/Applicita/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams)
+     Source: [Two Team/Microservice eShop](https://github.com/VincentH-Net/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams)
 
 - A `dotnet new mcs-orleans-multiservice` template to set up a new multiservice, and to add a logical service in an existing multiservice
 
@@ -39,7 +39,7 @@ Orleans.Multiservice consists of:
 > The code analyzer / unit tests will be added in a future release. Note that the multiservice pattern can be used without the analyzer by following the code structure of the template and the [pattern rules](#pattern-rules)
 
 ## Template usage
-1) On the command line, ensure that the [mcs-orleans-multiservice template](https://github.com/Applicita/Modern.CSharp.Templates#readme) is installed:
+1) On the command line, ensure that the [mcs-orleans-multiservice template](https://github.com/VincentH-Net/Modern.CSharp.Templates#readme) is installed:
     ```
     dotnet new install Modern.CSharp.Templates
     ```
@@ -52,7 +52,7 @@ Orleans.Multiservice consists of:
 
 3) To create a new multiservice with one logical service in it, enter e.g.:
     ```
-    dotnet new mcs-orleans-multiservice --RootNamespace Applicita.eShop --Multiservice TeamA --Logicalservice Catalog --allow-scripts Yes
+    dotnet new mcs-orleans-multiservice --RootNamespace InnoWvateDotNet.eShop --Multiservice TeamA --Logicalservice Catalog --allow-scripts Yes
     ```
 
 4) To add a logical service to an existing multiservice solution, type e.g. this command in PowerShell while in the solution folder:
@@ -81,13 +81,13 @@ The only code change needed to move the `CatalogService` to the Team B microserv
 
 ### How to run the example
 Single team solution:
-- Debug [eShopTeamA.sln](https://github.com/Applicita/Orleans.Multiservice/tree/main/src/Example/eShopBySingleTeam/TeamA)
+- Debug [eShopTeamA.sln](https://github.com/VincentH-Net/Orleans.Multiservice/tree/main/src/Example/eShopBySingleTeam/TeamA)
 
 Two team solution:
-- Ensure you have the latest [.NET OpenAPI tool](https://learn.microsoft.com/en-us/aspnet/core/web-api/microsoft.dotnet-openapi?view=aspnetcore-8.0) for .NET 8 installed:<br />
+- Ensure you have the latest [.NET OpenAPI tool](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/openapi/openapi-tools?view=aspnetcore-9.0) for .NET 9 installed:<br />
   `dotnet tool install --global Microsoft.dotnet-openapi`<br />
   On build, this will generate the `CatalogServiceClient` from `CatalogService.json`
-- Debug [eShopTeamAof2.sln](https://github.com/Applicita/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams/TeamA) and [eShopTeamBof2.sln](https://github.com/Applicita/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams/TeamB)
+- Debug [eShopTeamAof2.sln](https://github.com/VincentH-Net/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams/TeamA) and [eShopTeamBof2.sln](https://github.com/VincentH-Net/Orleans.Multiservice/tree/main/src/Example/eShopByTwoTeams/TeamB)
 
 ### How to test the example
 When testing the API in the generated swagger UI, you can use any integer for `buyerId`.

src/Example/eShopBySingleTeam/TeamA/AddLogicalService.ps1

@@ -6,7 +6,7 @@
 
 # Function to update the Program.cs file to add a new parameter to the RegisterEndpoints method
 function Update-RegisterEndpoints {
-    $newParameter = "`n    typeof(Applicita.eShop.Apis.${Name}Api.${Name}Endpoints)`n"
+    $newParameter = "`n    typeof(InnoWvateDotNet.eShop.Apis.${Name}Api.${Name}Endpoints)`n"
     $apisDirectory = Join-Path -Path $PWD -ChildPath "Apis"
     $programFile = Get-ChildItem -Path $apisDirectory -Recurse -Filter "Program.cs" -ErrorAction SilentlyContinue | Select-Object -First 1
 
@@ -25,6 +25,6 @@ function Update-RegisterEndpoints {
     Write-Warning "Could not automatically add below parameter to the RegisterEndpoints(...) call; please add it manually:$newParameter"
 }
 
-dotnet new mcs-orleans-multiservice --RootNamespace Applicita.eShop -M . --Logicalservice $Name --allow-scripts Yes
+dotnet new mcs-orleans-multiservice --RootNamespace InnoWvateDotNet.eShop -M . --Logicalservice $Name --allow-scripts Yes
 
 Update-RegisterEndpoints

src/Example/eShopBySingleTeam/TeamA/Apis/Apis.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
 
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <AnalysisLevel>preview-All</AnalysisLevel>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 
-        <AssemblyName>Applicita.eShop.$(MSBuildProjectName).TeamA</AssemblyName>
-        <RootNamespace>Applicita.eShop.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+        <AssemblyName>InnoWvateDotNet.eShop.$(MSBuildProjectName).TeamA</AssemblyName>
+        <RootNamespace>InnoWvateDotNet.eShop.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -19,10 +19,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Orleans.Sdk" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+        <PackageReference Include="Microsoft.Orleans.Persistence.Memory" Version="9.1.2" />
+        <PackageReference Include="Microsoft.Orleans.Sdk" Version="9.1.2" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

src/Example/eShopBySingleTeam/TeamA/Apis/BasketApi/BasketsEndpoints.cs

@@ -1,6 +1,6 @@
-using Applicita.eShop.Contracts.BasketContract;
+using InnoWvateDotNet.eShop.Contracts.BasketContract;
 
-namespace Applicita.eShop.Apis.BasketApi;
+namespace InnoWvateDotNet.eShop.Apis.BasketApi;
 
 public class BasketsEndpoints(IClusterClient orleans) : IEndpoints
 {

src/Example/eShopBySingleTeam/TeamA/Apis/CatalogApi/CatalogEndpoints.cs

@@ -1,6 +1,6 @@
-using Applicita.eShop.Contracts.CatalogContract;
+using InnoWvateDotNet.eShop.Contracts.CatalogContract;
 
-namespace Applicita.eShop.Apis.CatalogApi;
+namespace InnoWvateDotNet.eShop.Apis.CatalogApi;
 
 public class CatalogEndpoints(IClusterClient orleans) : IEndpoints
 {

src/Example/eShopBySingleTeam/TeamA/Apis/Foundation/Extensions.cs

@@ -1,4 +1,4 @@
-namespace Applicita.eShop.Apis.Foundation;
+namespace InnoWvateDotNet.eShop.Apis.Foundation;
 
 public interface IEndpoints
 {

src/Example/eShopBySingleTeam/TeamA/Apis/Foundation/GlobalUsings.cs

@@ -1,4 +1,4 @@
 global using System.Collections.Immutable;
 global using Microsoft.AspNetCore.Http.HttpResults;
 global using static Microsoft.AspNetCore.Http.TypedResults;
-global using Applicita.eShop.Apis.Foundation;
+global using InnoWvateDotNet.eShop.Apis.Foundation;

src/Example/eShopBySingleTeam/TeamA/Apis/Foundation/Program.cs

@@ -19,8 +19,8 @@
     _ = app.UseSwagger().UseSwaggerUI(options => options.EnableTryItOutByDefault());
 
 app.RegisterEndpoints(
-    typeof(Applicita.eShop.Apis.BasketApi.BasketsEndpoints),
-    typeof(Applicita.eShop.Apis.CatalogApi.CatalogEndpoints)
+    typeof(InnoWvateDotNet.eShop.Apis.BasketApi.BasketsEndpoints),
+    typeof(InnoWvateDotNet.eShop.Apis.CatalogApi.CatalogEndpoints)
 );
 
 app.Run();

src/Example/eShopBySingleTeam/TeamA/BasketService/BasketGrain.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using System.Globalization;
 
-namespace Applicita.eShop.BasketService;
+namespace InnoWvateDotNet.eShop.BasketService;
 
 sealed class BasketGrain : Grain, IBasketGrain
 {