Merge pull request #545 from Particular/support-net9

Updates for .NET 9
Particular · Feb 3, 2025 · 03f376a · 03f376a
2 parents e63fcb7 + b9706b4
commit 03f376a
Show file tree

Hide file tree

Showing 32 changed files with 169 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/ParticularTemplates/NServiceBusEndpoint/.template.config/template.json b/src/ParticularTemplates/NServiceBusEndpoint/.template.config/template.json
@@ -22,13 +22,17 @@
       "description": "The target framework for the project.",
       "datatype": "choice",
       "choices": [
+        {
+          "choice": "net9.0",
+          "description": "Target net9.0"
+        },
         {
           "choice": "net8.0",
           "description": "Target net8.0"
         }
       ],
       "replaces": "TARGET_FRAMEWORK",
-      "defaultValue": "net8.0"
+      "defaultValue": "net9.0"
     },
     "transport": {
       "type": "parameter",

diff --git a/src/Tests/ApprovalFiles/TemplateTests.Handler.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.Handler.approved.txt
@@ -26,7 +26,7 @@ Handler.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpoint.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpoint.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpoint.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.ConsoleApp.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.ConsoleApp.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointHostingConsoleApp.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.Docker.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.Docker.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointHostingDocker.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnableSdkContainerSupport>true</EnableSdkContainerSupport>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.WindowsService.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointHosting.WindowsService.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointHostingWindowsService.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.AzureTable.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.AzureTable.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceAzureTable.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.CosmosDB.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.CosmosDB.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceCosmosDB.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.DynamoDB.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.DynamoDB.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceDynamoDB.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...provalFiles/TemplateTests.NServiceBusEndpointPersistence.LearningPersistence.approved.txt b/...provalFiles/TemplateTests.NServiceBusEndpointPersistence.LearningPersistence.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceLearningPersistence.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MSSQL.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MSSQL.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceMSSQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MongoDB.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MongoDB.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceMongoDB.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MySQL.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.MySQL.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceMySQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.Oracle.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.Oracle.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceOracle.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.PostgreSQL.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.PostgreSQL.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistencePostgreSQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.RavenDB.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointPersistence.RavenDB.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointPersistenceRavenDB.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTargetFramework.net9.0.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTargetFramework.net9.0.approved.txt
@@ -0,0 +1,134 @@
+---------------------------------------------------------------
+NServiceBusEndpointTargetFrameworknet9.0.csproj
+---------------------------------------------------------------
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <!--
+  Wildcards are used in PackageReferences below to ensure projects created from the template reference the latest versions of packages.
+  Consider changing the wildcard versions to explicit versions to have more control over which versions are being used.
+  -->
+  <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="(VERSION)" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="(VERSION)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings*.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Remove="appsettings*.json" />
+    <ProjectCapability Include="DynamicFileNestingEnabled" />
+  </ItemGroup>
+
+</Project>
+---------------------------------------------------------------
+Program.cs
+---------------------------------------------------------------
+using Microsoft.Extensions.Hosting;
+
+var builder = Host.CreateApplicationBuilder(args);
+
+// TODO: consider moving common endpoint configuration into a shared project
+// for use by all endpoints in the system
+
+var endpointConfiguration = new EndpointConfiguration("NServiceBusEndpointTargetFrameworknet9._0");
+
+// Learning Transport: https://docs.particular.net/transports/learning/
+var routing = endpointConfiguration.UseTransport(new LearningTransport());
+
+// Define routing for commands: https://docs.particular.net/nservicebus/messaging/routing#command-routing
+// routing.RouteToEndpoint(typeof(MessageType), "DestinationEndpointForType");
+// routing.RouteToEndpoint(typeof(MessageType).Assembly, "DestinationForAllCommandsInAssembly");
+
+// Learning Persistence: https://docs.particular.net/persistence/learning/
+endpointConfiguration.UsePersistence<LearningPersistence>();
+
+// Message serialization
+endpointConfiguration.UseSerialization<SystemJsonSerializer>();
+
+endpointConfiguration.DefineCriticalErrorAction(OnCriticalError);
+
+// Installers are useful in development. Consider disabling in production.
+// https://docs.particular.net/nservicebus/operations/installers
+endpointConfiguration.EnableInstallers();
+
+builder.UseNServiceBus(endpointConfiguration);
+
+var app = builder.Build();
+app.Run();
+
+static async Task OnCriticalError(ICriticalErrorContext context, CancellationToken cancellationToken)
+{
+    // TODO: decide if stopping the endpoint and exiting the process is the best response to a critical error
+    // https://docs.particular.net/nservicebus/hosting/critical-errors
+    // and consider setting up service recovery
+    // https://docs.particular.net/nservicebus/hosting/windows-service#installation-restart-recovery
+    try
+    {
+        await context.Stop(cancellationToken);
+    }
+    finally
+    {
+        FailFast($"Critical error, shutting down: {context.Error}", context.Exception);
+    }
+}
+
+static void FailFast(string message, Exception exception)
+{
+    try
+    {
+        // TODO: decide what kind of last resort logging is necessary
+        // TODO: when using an external logging framework it is important to flush any pending entries prior to calling FailFast
+        // https://docs.particular.net/nservicebus/hosting/critical-errors#when-to-override-the-default-critical-error-action
+    }
+    finally
+    {
+        Environment.FailFast(message, exception);
+    }
+}
+
+---------------------------------------------------------------
+launchSettings.json
+---------------------------------------------------------------
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "NServiceBusEndpointTargetFrameworknet9._0": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
+
+---------------------------------------------------------------
+appsettings.Development.json
+---------------------------------------------------------------
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
+
+---------------------------------------------------------------
+appsettings.json
+---------------------------------------------------------------
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
+
diff --git a/...ts/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.AzureServiceBus.approved.txt b/...ts/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.AzureServiceBus.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsAzureServiceBus.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.AzureStorageQueues.approved.txt b/...ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.AzureStorageQueues.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsAzureStorageQueues.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/.../ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.LearningTransport.approved.txt b/.../ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.LearningTransport.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsLearningTransport.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.PostgreSQL.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.PostgreSQL.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsPostgreSQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.RabbitMQ.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.RabbitMQ.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsRabbitMQ.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.SQL.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.SQL.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsSQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.SQS.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.NServiceBusEndpointTransports.SQS.approved.txt
@@ -5,7 +5,7 @@ NServiceBusEndpointTransportsSQS.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/ApprovalFiles/TemplateTests.Saga.approved.txt b/src/Tests/ApprovalFiles/TemplateTests.Saga.approved.txt
@@ -40,7 +40,7 @@ Saga.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...alFiles/TemplateTests.TransportPersistenceCombinations.PostgreSQL-PostgreSQL.approved.txt b/...alFiles/TemplateTests.TransportPersistenceCombinations.PostgreSQL-PostgreSQL.approved.txt
@@ -99,7 +99,7 @@ TransportPersistenceCombinationsPostgreSQL-PostgreSQL.csproj
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>