Prepare for NServiceBus 10

.github/workflows/ci.yml

@@ -35,9 +35,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         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

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 9.0.x
+          global-json-file: global.json
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

global.json

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

src/Custom.Build.props

@@ -5,8 +5,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
+    <MinVerMinimumMajorMinor>7.0</MinVerMinimumMajorMinor>
     <MinVerAutoIncrement>minor</MinVerAutoIncrement>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
 </Project>

src/ManualTests.HostV4/ManualTests.HostV4.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
   </ItemGroup>
 
   <ItemGroup>

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.Can_override_trigger_function_name.approved.txt

@@ -7,19 +7,11 @@ using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class FunctionEndpointTrigger
+public class FunctionEndpointTrigger(IFunctionEndpoint endpoint)
 {
-        readonly IFunctionEndpoint endpoint;
-
-        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
-        {
-            this.endpoint = endpoint;
-        }
-
-        [Function("trigger")]
-        public async Task Run(
-            [ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
-        {
-            await endpoint.Process(message, messageActions, context, cancellationToken);
-        }
+    [Function("trigger")]
+    public async Task Run([ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
+    {
+        await endpoint.Process(message, messageActions, context, cancellationToken);
+    }
 }

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.Can_supply_connection_name.approved.txt

@@ -7,19 +7,11 @@ using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class FunctionEndpointTrigger
+public class FunctionEndpointTrigger(IFunctionEndpoint endpoint)
 {
-        readonly IFunctionEndpoint endpoint;
-
-        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
-        {
-            this.endpoint = endpoint;
-        }
-
-        [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
-        public async Task Run(
-            [ServiceBusTrigger("endpoint", Connection="FooBar")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
-        {
-            await endpoint.Process(message, messageActions, context, cancellationToken);
-        }
+    [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
+    public async Task Run([ServiceBusTrigger("endpoint", Connection="FooBar")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
+    {
+        await endpoint.Process(message, messageActions, context, cancellationToken);
+    }
 }

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.NameIsStringValue.approved.txt

@@ -7,19 +7,11 @@ using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class FunctionEndpointTrigger
+public class FunctionEndpointTrigger(IFunctionEndpoint endpoint)
 {
-        readonly IFunctionEndpoint endpoint;
-
-        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
-        {
-            this.endpoint = endpoint;
-        }
-
-        [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
-        public async Task Run(
-            [ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
-        {
-            await endpoint.Process(message, messageActions, context, cancellationToken);
-        }
+    [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
+    public async Task Run([ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
+    {
+        await endpoint.Process(message, messageActions, context, cancellationToken);
+    }
 }

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.UsingFullyQualifiedAttributeName.approved.txt

@@ -7,19 +7,11 @@ using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class FunctionEndpointTrigger
+public class FunctionEndpointTrigger(IFunctionEndpoint endpoint)
 {
-        readonly IFunctionEndpoint endpoint;
-
-        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
-        {
-            this.endpoint = endpoint;
-        }
-
-        [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
-        public async Task Run(
-            [ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
-        {
-            await endpoint.Process(message, messageActions, context, cancellationToken);
-        }
+    [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
+    public async Task Run([ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
+    {
+        await endpoint.Process(message, messageActions, context, cancellationToken);
+    }
 }

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.UsingNamespace.approved.txt

@@ -7,19 +7,11 @@ using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class FunctionEndpointTrigger
+public class FunctionEndpointTrigger(IFunctionEndpoint endpoint)
 {
-        readonly IFunctionEndpoint endpoint;
-
-        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
-        {
-            this.endpoint = endpoint;
-        }
-
-        [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
-        public async Task Run(
-            [ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
-        {
-            await endpoint.Process(message, messageActions, context, cancellationToken);
-        }
+    [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
+    public async Task Run([ServiceBusTrigger("endpoint")] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext context, CancellationToken cancellationToken)
+    {
+        await endpoint.Process(message, messageActions, context, cancellationToken);
+    }
 }

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/NServiceBus.AzureFunctions.Worker.Analyzer.Tests.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,14 +13,14 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageReference Include="Particular.Approvals" Version="2.0.1" />
   </ItemGroup>
 

src/NServiceBus.AzureFunctions.Worker.Analyzer/ConfigurationAnalyzer.cs

@@ -68,12 +68,12 @@ public override void Initialize(AnalysisContext context)
 
         static void Analyze(SyntaxNodeAnalysisContext context)
         {
-            if (!(context.Node is InvocationExpressionSyntax invocationExpression))
+            if (context.Node is not InvocationExpressionSyntax invocationExpression)
             {
                 return;
             }
 
-            if (!(invocationExpression.Expression is MemberAccessExpressionSyntax memberAccessExpression))
+            if (invocationExpression.Expression is not MemberAccessExpressionSyntax memberAccessExpression)
             {
                 return;
             }
@@ -87,7 +87,7 @@ static void Analyze(SyntaxNodeAnalysisContext context)
 
         static void AnalyzeTransport(SyntaxNodeAnalysisContext context)
         {
-            if (!(context.Node is MemberAccessExpressionSyntax memberAccess))
+            if (context.Node is not MemberAccessExpressionSyntax memberAccess)
             {
                 return;
             }
@@ -100,12 +100,12 @@ static void AnalyzeTransport(SyntaxNodeAnalysisContext context)
 
             var memberAccessSymbol = context.SemanticModel.GetSymbolInfo(memberAccess, context.CancellationToken);
 
-            if (!(memberAccessSymbol.Symbol is IPropertySymbol propertySymbol))
+            if (memberAccessSymbol.Symbol is not IPropertySymbol propertySymbol)
             {
                 return;
             }
 
-            if (propertySymbol.ContainingType.ToString() == "NServiceBus.AzureServiceBusTransport" || propertySymbol.ContainingType.ToString() == "NServiceBus.Transport.TransportDefinition")
+            if (propertySymbol.ContainingType.ToString() is "NServiceBus.AzureServiceBusTransport" or "NServiceBus.Transport.TransportDefinition")
             {
                 context.ReportDiagnostic(diagnosticDescriptor, memberAccess);
 
@@ -121,7 +121,7 @@ static void AnalyzeEndpointConfiguration(SyntaxNodeAnalysisContext context, Invo
 
             var memberAccessSymbol = context.SemanticModel.GetSymbolInfo(memberAccessExpression, context.CancellationToken);
 
-            if (!(memberAccessSymbol.Symbol is IMethodSymbol methodSymbol))
+            if (memberAccessSymbol.Symbol is not IMethodSymbol methodSymbol)
             {
                 return;
             }
@@ -141,12 +141,12 @@ static void AnalyzeSendAndReplyOptions(SyntaxNodeAnalysisContext context, Invoca
 
             var memberAccessSymbol = context.SemanticModel.GetSymbolInfo(memberAccessExpression, context.CancellationToken);
 
-            if (!(memberAccessSymbol.Symbol is IMethodSymbol methodSymbol))
+            if (memberAccessSymbol.Symbol is not IMethodSymbol methodSymbol)
             {
                 return;
             }
 
-            if (methodSymbol.ReceiverType.ToString() == "NServiceBus.SendOptions" || methodSymbol.ReceiverType.ToString() == "NServiceBus.ReplyOptions")
+            if (methodSymbol.ReceiverType.ToString() is "NServiceBus.SendOptions" or "NServiceBus.ReplyOptions")
             {
                 context.ReportDiagnostic(diagnosticDescriptor, invocationExpression);
             }
@@ -161,7 +161,7 @@ static void AnalyzeTransportExtensions(SyntaxNodeAnalysisContext context, Invoca
 
             var memberAccessSymbol = context.SemanticModel.GetSymbolInfo(memberAccessExpression, context.CancellationToken);
 
-            if (!(memberAccessSymbol.Symbol is IMethodSymbol methodSymbol))
+            if (memberAccessSymbol.Symbol is not IMethodSymbol methodSymbol)
             {
                 return;
             }

src/NServiceBus.AzureFunctions.Worker.Analyzer/NServiceBus.AzureFunctions.Worker.Analyzer.csproj

@@ -8,12 +8,13 @@
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <GenerateSBOM>false</GenerateSBOM>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- this package can only be upgraded when we drop support for older versions of Visual Studio -->
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" PrivateAssets="All" />
-    <PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="All" />
+    <PackageReference Include="Particular.Packaging" Version="4.4.0" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="UseMajorMinorPatchForAssemblyVersion" AfterTargets="MinVer">