Updates for .NET 10 - release-8.1 (#1647)

Author: particularbot

.github/workflows/ci.yml

@@ -29,20 +29,18 @@ jobs:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v5.1.0
         with:
-          dotnet-version: |
-            9.0.x
-            8.0.x
+          global-json-file: global.json
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages
         if: matrix.name == 'Windows'
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: NuGet packages
           path: nugets/
@@ -64,7 +62,7 @@ jobs:
           sqlcmd -Q "CREATE SCHEMA sender AUTHORIZATION db_owner" -d "nservicebus"
           sqlcmd -Q "CREATE SCHEMA db@ AUTHORIZATION db_owner" -d "nservicebus"
       - name: Azure login
-        uses: azure/login@v2.1.1
+        uses: azure/login@v2.3.0
         with:
           creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
       - name: Setup PostgreSql 15.x

.github/workflows/release.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v5.1.0
         with:
-          dotnet-version: 9.0.x
+          global-json-file: global.json
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages
@@ -31,7 +31,7 @@ jobs:
           client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
           certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: nugets
           path: nugets/*

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.0",
     "rollForward": "latestFeature"
   }
 }

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/ConfigurationHelpers.cs

@@ -1,7 +1,6 @@
 using NServiceBus;
 using NServiceBus.Configuration.AdvancedExtensibility;
 using NServiceBus.Transport;
-using NServiceBus.Transport.PostgreSql;
 
 static class ConfigurationHelpers
 {
@@ -19,4 +18,4 @@ public static string QuoteSchema(string schema)
     {
         return $"\"{schema}\"";
     }
-}
+}

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/ConfigureEndpointPostgreSqlTransport.cs

@@ -5,8 +5,6 @@
 using Npgsql;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
-using NServiceBus.Transport.PostgreSql;
-using NServiceBus.Transport.SqlServer;
 
 public class ConfigureEndpointPostgreSqlTransport : IConfigureEndpointTestExecution
 {
@@ -114,4 +112,4 @@ async Task TryDeleteTables(NpgsqlConnection conn, string commandText)
     PostgreSqlTransport transport;
     string connectionString;
     string endpointName;
-}
+}

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs

@@ -22,7 +22,7 @@ public async Task Error_should_be_sent_to_table_in_configured_schema()
                 .Done(c => c.FailedMessageProcessed)
                 .Run();
 
-            Assert.True(ctx.FailedMessageProcessed, "Message should be moved to error queue in custom schema");
+            Assert.That(ctx.FailedMessageProcessed, Is.True, "Message should be moved to error queue in custom schema");
         }
 
         public class Context : ScenarioContext
@@ -89,4 +89,4 @@ public class Message : ICommand { }
 
         const string ErrorSpySchema = "receiver";
     }
-}
+}

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/NServiceBus.Transport.PostgreSql.AcceptanceTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -13,9 +13,10 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.2" GeneratePathProperty="true" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.8" GeneratePathProperty="true" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(PkgNServiceBus_AcceptanceTests_Sources)' != ''">
@@ -53,4 +54,4 @@
     <Compile Include="..\NServiceBus.Transport.SqlServer.AcceptanceTests\TransactionScope\When_using_scope_timeout_greater_than_machine_max.cs" LinkBase="TransactionScope" />
   </ItemGroup>
 
-</Project>
+</Project>

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/NServiceBusAcceptanceTest.cs

@@ -70,23 +70,23 @@ public void TearDown()
 
             if (Environment.GetEnvironmentVariable("CI") != "true" || Environment.GetEnvironmentVariable("VERBOSE_TEST_LOGGING")?.ToLower() == "true")
             {
-                TestContext.WriteLine($@"Test settings:
+                TestContext.Out.WriteLine($@"Test settings:
 {string.Join(Environment.NewLine, runDescriptor.Settings.Select(setting => $"   {setting.Key}: {setting.Value}"))}");
 
-                TestContext.WriteLine($@"Context:
+                TestContext.Out.WriteLine($@"Context:
 {string.Join(Environment.NewLine, scenarioContext.GetType().GetProperties().Select(p => $"{p.Name} = {p.GetValue(scenarioContext, null)}"))}");
             }
 
             if (TestExecutionContext.CurrentContext.CurrentResult.ResultState == ResultState.Failure || TestExecutionContext.CurrentContext.CurrentResult.ResultState == ResultState.Error)
             {
-                TestContext.WriteLine(string.Empty);
-                TestContext.WriteLine($"Log entries (log level: {scenarioContext.LogLevel}):");
-                TestContext.WriteLine("--- Start log entries ---------------------------------------------------");
+                TestContext.Out.WriteLine(string.Empty);
+                TestContext.Out.WriteLine($"Log entries (log level: {scenarioContext.LogLevel}):");
+                TestContext.Out.WriteLine("--- Start log entries ---------------------------------------------------");
                 foreach (var logEntry in scenarioContext.Logs)
                 {
-                    TestContext.WriteLine($"{logEntry.Timestamp:T} {logEntry.Level} {logEntry.Endpoint ?? TestContext.CurrentContext.Test.Name}: {logEntry.Message}");
+                    TestContext.Out.WriteLine($"{logEntry.Timestamp:T} {logEntry.Level} {logEntry.Endpoint ?? TestContext.CurrentContext.Test.Name}: {logEntry.Message}");
                 }
-                TestContext.WriteLine("--- End log entries ---------------------------------------------------");
+                TestContext.Out.WriteLine("--- End log entries ---------------------------------------------------");
             }
         }
     }

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/NativeTimeouts/When_deferring_a_message_to_invalid_queue.cs

@@ -43,8 +43,8 @@ public async Task Should_forward_it_to_the_error_queue(TransportTransactionMode
                 .Done(c => c.MessageForwardedToErrorQueue)
                 .Run();
 
-            Assert.IsTrue(context.MessageForwardedToErrorQueue);
-            Assert.AreEqual("InvalidDestination__", context.Headers[FaultsHeaderKeys.FailedQ]);
+            Assert.That(context.MessageForwardedToErrorQueue, Is.True);
+            Assert.That(context.Headers[FaultsHeaderKeys.FailedQ], Is.EqualTo("InvalidDestination__"));
         }
 
         public class Context : ScenarioContext
@@ -93,4 +93,4 @@ public class MyMessage : IMessage
         {
         }
     }
-}
+}

src/NServiceBus.Transport.PostgreSql.AcceptanceTests/When_a_corrupted_message_is_received.cs

@@ -72,7 +72,7 @@ await Scenario.Define<Context>()
                     })
                     .Run();
 
-                Assert.True(MessageExistsInErrorQueue(connectionString), "The message should have been moved to the error queue");
+                Assert.That(MessageExistsInErrorQueue(connectionString), Is.True, "The message should have been moved to the error queue");
             }
             finally
             {
@@ -137,4 +137,4 @@ public class MyMessage : IMessage
         {
         }
     }
-}
+}