Updates for .NET 10 - release-4.2 (#866)

particularbot · web-flow · commit d6fab4b3c722 · 2026-01-21T10:41:47.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,20 +25,18 @@ jobs:
       fail-fast: false
     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.3.1
+        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.6.2
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: NuGet packages
           path: nugets/
diff --git a/.github/workflows/release.yml b/.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.3.1
+        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.6.2
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: nugets
           path: nugets/*
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.0",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj b/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.Tests/ClientProvider.cs b/src/NServiceBus.Storage.MongoDB.Tests/ClientProvider.cs
@@ -7,19 +7,33 @@ static class ClientProvider
     {
         public static IMongoClient Client
         {
+#if NET10_0_OR_GREATER
             get
             {
-                if (client == null)
+                if (field == null)
                 {
                     var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
 
-                    client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
+                    field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
                 }
 
+                return field;
+            }
+#else
+            get
+            {
+                if (client == null)
+                {
+                    var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
+                    client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
+                }
                 return client;
             }
+#endif
         }
 
+#if !NET10_0_OR_GREATER
         static IMongoClient client;
+#endif
     }
 }
diff --git a/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj b/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.Tests/Sagas/SagaTestsConfiguration.cs b/src/NServiceBus.Storage.MongoDB.Tests/Sagas/SagaTestsConfiguration.cs
@@ -17,6 +17,21 @@ public class SagaTestsConfiguration
 
         public SagaMetadataCollection SagaMetadataCollection
         {
+#if NET10_0_OR_GREATER
+            get
+            {
+                if (field == null)
+                {
+                    var sagaTypes = Assembly.GetExecutingAssembly().GetTypes().Where(t => typeof(Saga).IsAssignableFrom(t) || typeof(IFinder).IsAssignableFrom(t)).ToArray();
+                    field = new SagaMetadataCollection();
+                    field.Initialize(sagaTypes);
+                }
+
+                return field;
+            }
+
+            set;
+#else
             get
             {
                 if (sagaMetadataCollection == null)
@@ -27,14 +42,16 @@ public SagaMetadataCollection SagaMetadataCollection
                 }
                 return sagaMetadataCollection;
             }
-
             set
             {
                 sagaMetadataCollection = value;
             }
+#endif
         }
 
+#if !NET10_0_OR_GREATER
         SagaMetadataCollection sagaMetadataCollection;
+#endif
 
         public SagaTestsConfiguration(string versionElementName, Func<Type, string> collectionNamingConvention, TimeSpan? transactionTimeout = null)
         {
diff --git a/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
     <!-- We want the root namespace to match the transactional session one -->
     <RootNamespace>NServiceBus.TransactionalSession.AcceptanceTests</RootNamespace>
   </PropertyGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj b/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB/NServiceBus.Storage.MongoDB.csproj b/src/NServiceBus.Storage.MongoDB/NServiceBus.Storage.MongoDB.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver" Version="2.28.0" />
-    <PackageReference Include="NServiceBus" Version="9.2.3" />
+    <PackageReference Include="NServiceBus" Version="9.2.8" />
     <PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.100",`
	`3`	`+ "version": "10.0.0",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,33 @@ static class ClientProvider`
`7`	`7`	`{`
`8`	`8`	`public static IMongoClient Client`
`9`	`9`	`{`
	`10`	`+#if NET10_0_OR_GREATER`
`10`	`11`	`get`
`11`	`12`	`{`
`12`		`- if (client == null)`
	`13`	`+ if (field == null)`
`13`	`14`	`{`
`14`	`15`	`var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");`
`15`	`16`
`16`		`- client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);`
	`17`	`+ field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);`
`17`	`18`	`}`
`18`	`19`
	`20`	`+ return field;`
	`21`	`+ }`
	`22`	`+#else`
	`23`	`+ get`
	`24`	`+ {`
	`25`	`+ if (client == null)`
	`26`	`+ {`
	`27`	`+ var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");`
	`28`	`+ client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);`
	`29`	`+ }`
`19`	`30`	`return client;`
`20`	`31`	`}`
	`32`	`+#endif`
`21`	`33`	`}`
`22`	`34`
	`35`	`+#if !NET10_0_OR_GREATER`
`23`	`36`	`static IMongoClient client;`
	`37`	`+#endif`
`24`	`38`	`}`
`25`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,21 @@ public class SagaTestsConfiguration`
`17`	`17`
`18`	`18`	`public SagaMetadataCollection SagaMetadataCollection`
`19`	`19`	`{`
	`20`	`+#if NET10_0_OR_GREATER`
	`21`	`+ get`
	`22`	`+ {`
	`23`	`+ if (field == null)`
	`24`	`+ {`
	`25`	`+ var sagaTypes = Assembly.GetExecutingAssembly().GetTypes().Where(t => typeof(Saga).IsAssignableFrom(t) \|\| typeof(IFinder).IsAssignableFrom(t)).ToArray();`
	`26`	`+ field = new SagaMetadataCollection();`
	`27`	`+ field.Initialize(sagaTypes);`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ return field;`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ set;`
	`34`	`+#else`
`20`	`35`	`get`
`21`	`36`	`{`
`22`	`37`	`if (sagaMetadataCollection == null)`
`@@ -27,14 +42,16 @@ public SagaMetadataCollection SagaMetadataCollection`
`27`	`42`	`}`
`28`	`43`	`return sagaMetadataCollection;`
`29`	`44`	`}`
`30`		`-`
`31`	`45`	`set`
`32`	`46`	`{`
`33`	`47`	`sagaMetadataCollection = value;`
`34`	`48`	`}`
	`49`	`+#endif`
`35`	`50`	`}`
`36`	`51`
	`52`	`+#if !NET10_0_OR_GREATER`
`37`	`53`	`SagaMetadataCollection sagaMetadataCollection;`
	`54`	`+#endif`
`38`	`55`
`39`	`56`	`public SagaTestsConfiguration(string versionElementName, Func<Type, string> collectionNamingConvention, TimeSpan? transactionTimeout = null)`
`40`	`57`	`{`