NET10 Prep work

.github/workflows/build-containers.yml

@@ -39,7 +39,6 @@ jobs:
         uses: actions/setup-dotnet@v5.0.1
         with:
           global-json-file: global.json
-          dotnet-version: 8.0.x
       - name: Run MinVer
         uses: Particular/run-minver-action@v1.0.0
       - name: Validate build version
@@ -76,7 +75,7 @@ jobs:
             org.opencontainers.image.created=${{ steps.date.outputs.date }}
             org.opencontainers.image.title=${{ matrix.title }}
             org.opencontainers.image.description=${{ matrix.description }}
-            org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-composite-extra
+            org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-composite-extra
           annotations: |
             index:org.opencontainers.image.source=https://github.com/Particular/ServiceControl/tree/${{ github.sha }}
             index:org.opencontainers.image.authors="Particular Software"
@@ -88,6 +87,6 @@ jobs:
             index:org.opencontainers.image.created=${{ steps.date.outputs.date }}
             index:org.opencontainers.image.title=${{ matrix.title }}
             index:org.opencontainers.image.description=${{ matrix.description }}
-            index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-composite-extra
+            index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-composite-extra
           file: src/${{ matrix.project }}/Dockerfile
           tags: ghcr.io/particular/${{ matrix.name }}:${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}

.github/workflows/build-db-container.yml

@@ -23,7 +23,6 @@ jobs:
         uses: actions/setup-dotnet@v5.0.1
         with:
           global-json-file: global.json
-          dotnet-version: 8.0.x
       - name: Run MinVer
         uses: Particular/run-minver-action@v1.0.0
       - name: Validate build version

.github/workflows/build-windows.yml

@@ -19,7 +19,6 @@ jobs:
         uses: actions/setup-dotnet@v5.0.1
         with:
           global-json-file: global.json
-          dotnet-version: 8.0.x
       - name: Download RavenDB Server
         run: ./tools/download-ravendb-server.ps1
       - name: Build

.github/workflows/ci.yml

@@ -41,7 +41,6 @@ jobs:
         uses: actions/setup-dotnet@v5.0.1
         with:
           global-json-file: global.json
-          dotnet-version: 8.0.x
       - name: Download RavenDB Server
         run: ./tools/download-ravendb-server.ps1
       - name: Build

.github/workflows/container-integration-test.yml

@@ -57,7 +57,6 @@ jobs:
         uses: actions/setup-dotnet@v5.0.1
         with:
           global-json-file: global.json
-          dotnet-version: 8.0.x
       - name: Run MinVer
         uses: Particular/run-minver-action@v1.0.0
       - name: Log in to GitHub container registry

global.json

@@ -1,6 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.0",
+    "allowPrerelease": false,
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {

src/Directory.Packages.props

@@ -5,9 +5,9 @@
   </PropertyGroup>
   <ItemGroup Label="Versions for direct package references">
     <PackageVersion Include="Autofac" Version="8.2.0" />
-    <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.1" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.0.4" />
-    <PackageVersion Include="Azure.Identity" Version="1.13.2" />
+    <PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.5.5" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.5.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
     <PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
     <PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
     <PackageVersion Include="ByteSize" Version="2.1.2" />
@@ -17,39 +17,39 @@
     <PackageVersion Include="Fody" Version="6.9.1" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
     <PackageVersion Include="HdrHistogram" Version="2.5.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.21" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.21" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.1" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.4.0" />
-    <PackageVersion Include="NServiceBus" Version="9.2.7" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="9.2.7" />
-    <PackageVersion Include="NServiceBus.AmazonSQS" Version="8.0.0" />
-    <PackageVersion Include="NServiceBus.CustomChecks" Version="5.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="3.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="3.0.1" />
-    <PackageVersion Include="NServiceBus.Heartbeat" Version="5.0.1" />
-    <PackageVersion Include="NServiceBus.Metrics" Version="5.0.1" />
-    <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="5.0.0" />
-    <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="2.0.1" />
-    <PackageVersion Include="NServiceBus.RabbitMQ" Version="10.1.6" />
-    <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.2" />
-    <PackageVersion Include="NServiceBus.Testing" Version="9.0.1" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="5.1.1" />
-    <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.3" />
-    <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.2" />
-    <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.9" />
-    <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.9" />
+    <PackageVersion Include="NServiceBus" Version="10.0.0-alpha.21" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.21" />
+    <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="4.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Heartbeat" Version="6.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Metrics" Version="6.0.0-alpha.4" />
+    <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="6.0.0-alpha.2" />
+    <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="3.0.0-alpha.4" />
+    <PackageVersion Include="NServiceBus.RabbitMQ" Version="11.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.SagaAudit" Version="6.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Testing" Version="10.0.0-alpha.5" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="6.0.0-alpha.4" />
+    <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="14.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.0-alpha.3" />
+    <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="9.0.0-alpha.3" />
     <PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
     <PackageVersion Include="NUnit" Version="4.4.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
@@ -69,30 +69,29 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
     <PackageVersion Include="Seq.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.1.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
-    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Management" Version="8.0.0" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.0" />
+    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.0" />
+    <PackageVersion Include="System.Management" Version="10.0.0" />
     <PackageVersion Include="System.Management.Automation" Version="7.4.7" />
-    <PackageVersion Include="System.Reactive.Linq" Version="6.0.1" />
-    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="8.0.1" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
+    <PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
+    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.0" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.0" />
     <PackageVersion Include="Validar.Fody" Version="1.9.0" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup Label="Versions to pin transitive references">
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="8.0.1" />
-    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="10.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
-    <PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.2" />
+    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.48" />
+    <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.63" />
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.5.0" />
   </ItemGroup>

src/HealthCheckApp/HealthCheckApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

src/LegacyArtifacts/LegacyArtifacts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Particular.LicensingComponent.Contracts/EndpointIndicator.cs

@@ -1,4 +1,5 @@
 namespace Particular.LicensingComponent.Contracts;
+
 using System.Text.Json.Serialization;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]

src/Particular.LicensingComponent.Contracts/EnvironmentDataType.cs

@@ -1,4 +1,5 @@
 namespace Particular.LicensingComponent.Contracts;
+
 using System.Text.Json.Serialization;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -10,4 +11,4 @@ public enum EnvironmentDataType
     AuditInstances,
     ServiceControlVersion,
     ServicePulseVersion
-}
+}

src/Particular.LicensingComponent.Contracts/Particular.LicensingComponent.Contracts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Particular.LicensingComponent.Persistence.InMemory/Particular.LicensingComponent.Persistence.InMemory.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

src/Particular.LicensingComponent.Persistence/Particular.LicensingComponent.Persistence.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Particular.LicensingComponent.UnitTests/Particular.LicensingComponent.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Particular.LicensingComponent/Particular.LicensingComponent.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Particular.PlatformSample.ServiceControl/Particular.PlatformSample.ServiceControl.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Description>Particular ServiceControl binaries for use by Particular.PlatformSample. Not intended for use outside of Particular.PlatformSample.</Description>
     <PackageProjectUrl>https://docs.particular.net/servicecontrol/</PackageProjectUrl>

src/ServiceControl.AcceptanceTesting/DispatchRawMessages.cs

@@ -14,7 +14,6 @@ public abstract class DispatchRawMessages<TContext> : Feature
     {
         protected DispatchRawMessages()
         {
-            EnableByDefault();
         }
 
         protected override void Setup(FeatureConfigurationContext context)

src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs

@@ -31,7 +31,6 @@ public static void ScanTypesForTest(this EndpointConfiguration config,
                     .SelectMany(a => a.GetTypes())
                     .Union(GetNestedTypeRecursive(customizationConfiguration.BuilderType.DeclaringType, customizationConfiguration.BuilderType))
                     .Union(customizationConfiguration.TypesToInclude)
-                    .Except(customizationConfiguration.TypesToExclude)
                     .ToList());
             return;
 

src/ServiceControl.AcceptanceTesting/ServiceControl.AcceptanceTesting.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_failed_message_is_retried.cs

@@ -200,28 +200,21 @@ public FailingEndpoint() =>
                     c.GetSettings().Get<TransportDefinition>().TransportTransactionMode =
                         TransportTransactionMode.ReceiveOnly;
                     c.EnableFeature<Outbox>();
+
+                    c.RegisterStartupTask(new SendMessageAtStart());
+
                     c.ReportSuccessfulRetriesToServiceControl();
 
                     c.NoRetries();
                 });
 
-            class StartFeature : Feature
+            class SendMessageAtStart : FeatureStartupTask
             {
-                public StartFeature() => EnableByDefault();
-
-                protected override void Setup(FeatureConfigurationContext context)
-                {
-                    context.RegisterStartupTask(new SendMessageAtStart());
-                }
+                protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default)
+                    => session.SendLocal(new MyMessage(), cancellationToken);
 
-                class SendMessageAtStart : FeatureStartupTask
-                {
-                    protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default)
-                        => session.SendLocal(new MyMessage(), cancellationToken);
-
-                    protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default)
-                        => Task.CompletedTask;
-                }
+                protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default)
+                    => Task.CompletedTask;
             }
 
             public class MyMessageHandler(Context scenarioContext, IReadOnlySettings settings)
@@ -254,30 +247,16 @@ public FailingEndpointWithoutAudit() =>
                         TransportTransactionMode.ReceiveOnly;
                     c.EnableFeature<Outbox>();
 
+                    c.RegisterStartupTask(new SendMessageAtStart());
+
                     c.NoRetries();
                 });
 
-            class StartFeature : Feature
+            class SendMessageAtStart : FeatureStartupTask
             {
-                public StartFeature() => EnableByDefault();
+                protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default) => session.SendLocal(new MyMessage(), cancellationToken);
 
-                protected override void Setup(FeatureConfigurationContext context)
-                {
-                    context.RegisterStartupTask(new SendMessageAtStart());
-                }
-
-                class SendMessageAtStart : FeatureStartupTask
-                {
-                    protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default)
-                    {
-                        return session.SendLocal(new MyMessage(), cancellationToken);
-                    }
-
-                    protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default)
-                    {
-                        return Task.CompletedTask;
-                    }
-                }
+                protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default) => Task.CompletedTask;
             }
 
             public class MyMessageHandler(Context scenarioContext, IReadOnlySettings settings)

src/ServiceControl.AcceptanceTests.RavenDB/ServiceControl.AcceptanceTests.RavenDB.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs

@@ -19,6 +19,7 @@ public class ErrorSender : EndpointConfigurationBuilder
             public ErrorSender() =>
                 EndpointSetup<DefaultServerWithoutAudit>(c =>
                 {
+                    c.EnableFeature<SendFailedMessages>();
                     c.NoDelayedRetries();
                     c.ReportSuccessfulRetriesToServiceControl();
                 });