Update to NServiceBus 9

.github/workflows/ci.yml

@@ -35,9 +35,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: |
-            8.0.x
-            6.0.x
+          dotnet-version: 8.0.x
       - name: Setup Azure Functions Core Tools - Windows
         if: runner.os == 'Windows'
         run: |
@@ -51,7 +49,7 @@ jobs:
         shell: bash
       - name: Fix Azure Functions Core Tools permissions - Linux
         if: runner.os == 'Linux'
-        run: sudo chmod +x /usr/lib/azure-functions-core-tools/in-proc6/func
+        run: sudo chmod +x /usr/lib/azure-functions-core-tools/in-proc8/func
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

src/Custom.Build.props

@@ -1,12 +1,11 @@
 <Project>
 
   <PropertyGroup>
-    <ParticularAnalyzersVersion>0.9.0</ParticularAnalyzersVersion>
     <AnalyzerTargetFramework>netstandard2.0</AnalyzerTargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
-    <MinVerMinimumMajorMinor>4.1</MinVerMinimumMajorMinor>
+    <MinVerMinimumMajorMinor>5.0</MinVerMinimumMajorMinor>
     <MinVerAutoIncrement>minor</MinVerAutoIncrement>
   </PropertyGroup>
 

src/IntegrationTests.HostV4/HttpSender.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
@@ -7,6 +8,8 @@
 using Microsoft.Extensions.Logging;
 using NServiceBus;
 
+using ExecutionContext = Microsoft.Azure.WebJobs.ExecutionContext;
+
 class HttpSender
 {
     readonly IFunctionEndpoint functionEndpoint;
@@ -17,15 +20,14 @@ public HttpSender(IFunctionEndpoint functionEndpoint)
     }
 
     [FunctionName("InProcessHttpSenderV4")]
-    public async Task<IActionResult> Run(
-            [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest request, ExecutionContext executionContext, ILogger logger)
+    public async Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest request, ExecutionContext executionContext, ILogger logger, CancellationToken cancellationToken = default)
     {
         logger.LogInformation("C# HTTP trigger function received a request at {0}", request.GetEncodedPathAndQuery());
 
         var sendOptions = new SendOptions();
         sendOptions.RouteToThisEndpoint();
 
-        await functionEndpoint.Send(new TriggerMessage(), sendOptions, executionContext, logger).ConfigureAwait(false);
+        await functionEndpoint.Send(new TriggerMessage(), sendOptions, executionContext, logger, cancellationToken).ConfigureAwait(false);
 
         return new OkObjectResult($"{nameof(TriggerMessage)} sent.");
     }

src/IntegrationTests.HostV4/IntegrationTests.HostV4.csproj

@@ -1,23 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.InProcess.Analyzer\NServiceBus.AzureFunctions.InProcess.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\NServiceBus.AzureFunctions.InProcess.ServiceBus\NServiceBus.AzureFunctions.InProcess.ServiceBus.csproj" />
-    <ProjectReference Include="..\NServiceBus.AzureFunctions.SourceGenerator\NServiceBus.AzureFunctions.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FunctionsPreservedDependencies Include="System.Memory.Data.dll" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,7 +33,4 @@
     <None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
   </ItemGroup>
 
-  <!-- Import the props file from the component because it's referenced as a ProjectReference here, not a PackageReference -->
-  <Import Project="..\NServiceBus.AzureFunctions.InProcess.ServiceBus\build\NServiceBus.AzureFunctions.InProcess.ServiceBus.props" />
-
 </Project>

src/IntegrationTests.HostV4/When_starting_the_function_host.cs

@@ -163,7 +163,7 @@ public async Task Should_not_blow_up()
 
                         hasResult = true;
                     }
-                    catch (OperationCanceledException)
+                    catch (OperationCanceledException) when (cancellationTokenSource.Token.IsCancellationRequested)
                     {
                     }
                     catch (Exception ex)
@@ -186,7 +186,7 @@ public async Task Should_not_blow_up()
                 {
                     await funcProcess.WaitForExitAsync(cancellationTokenSource.Token);
                 }
-                catch (OperationCanceledException)
+                catch (OperationCanceledException) when (cancellationTokenSource.Token.IsCancellationRequested)
                 {
                     funcProcess.Kill();
                 }

src/IntegrationTests.HostV4/local.settings.json

@@ -2,6 +2,7 @@
   "IsEncrypted": false,
   "Values": {
     "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "FUNCTIONS_INPROC_NET8_ENABLED": "1",
     "FUNCTIONS_WORKER_RUNTIME": "dotnet",
 
     "AzureWebJobsServiceBus": "<set your ASB connection string here>",

src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# ConfigureAwait(false)
+dotnet_diagnostic.CA2007.severity = none

src/NServiceBus.AzureFunctions.Analyzer.Tests/AnalyzerTestFixture.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/AnalyzerTestFixture.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System;
     using System.Collections.Generic;
@@ -30,7 +30,7 @@ protected async Task Assert(string[] expectedDiagnosticIds, string markupCode, s
             var (code, markupSpans) = Parse(markupCode);
 
             var project = CreateProject(code);
-            await WriteCode(project);
+            await WriteCode(project, cancellationToken);
 
             var compilerDiagnostics = (await Task.WhenAll(project.Documents
                 .Select(doc => doc.GetCompilerDiagnostics(cancellationToken))))
@@ -59,7 +59,7 @@ protected async Task Assert(string[] expectedDiagnosticIds, string markupCode, s
             NUnit.Framework.Assert.That(actualSpansAndIds, Is.EqualTo(expectedSpansAndIds).AsCollection);
         }
 
-        protected static async Task WriteCode(Project project)
+        protected static async Task WriteCode(Project project, CancellationToken cancellationToken = default)
         {
             if (!VerboseLogging)
             {
@@ -69,7 +69,7 @@ protected static async Task WriteCode(Project project)
             foreach (var document in project.Documents)
             {
                 Console.WriteLine(document.Name);
-                var code = await document.GetCode();
+                var code = await document.GetCode(cancellationToken);
                 foreach (var (line, index) in code.Replace("\r\n", "\n").Split('\n')
                 .Select((line, index) => (line, index)))
                 {
@@ -104,17 +104,16 @@ protected Project CreateProject(string[] code)
 
         static AnalyzerTestFixture()
         {
-            ProjectReferences = ImmutableList.Create(
+            ProjectReferences =
+            [
                 MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
                 MetadataReference.CreateFromFile(typeof(Enumerable).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(typeof(System.Linq.Expressions.Expression).GetTypeInfo().Assembly
-                    .Location),
-#if NET
+                MetadataReference.CreateFromFile(typeof(System.Linq.Expressions.Expression).GetTypeInfo().Assembly.Location),
                 MetadataReference.CreateFromFile(Assembly.Load("System.Runtime").Location),
-#endif
                 MetadataReference.CreateFromFile(typeof(IFunctionEndpoint).GetTypeInfo().Assembly.Location),
                 MetadataReference.CreateFromFile(typeof(EndpointConfiguration).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(typeof(AzureServiceBusTransport).GetTypeInfo().Assembly.Location));
+                MetadataReference.CreateFromFile(typeof(AzureServiceBusTransport).GetTypeInfo().Assembly.Location),
+            ];
         }
 
         static readonly ImmutableList<PortableExecutableReference> ProjectReferences;

src/NServiceBus.AzureFunctions.Analyzer.Tests/ConfigurationAnalyzerTests.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/ConfigurationAnalyzerTests.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System.Threading.Tasks;
     using NUnit.Framework;
@@ -17,9 +17,9 @@ public class ConfigurationAnalyzerTests : AnalyzerTestFixture<ConfigurationAnaly
         public Task DiagnosticIsReportedForEndpointConfiguration(string configuration, string diagnosticId)
         {
             var source =
-                $@"using NServiceBus; 
+                $@"using NServiceBus;
 using System;
-using System.Threading.Tasks; 
+using System.Threading.Tasks;
 class Foo
 {{
     void Bar(ServiceBusTriggeredEndpointConfiguration endpointConfig)
@@ -44,10 +44,10 @@ void Bar(ServiceBusTriggeredEndpointConfiguration endpointConfig)
         public Task DiagnosticIsNotReportedForOtherEndpointConfiguration(string configuration, string diagnosticId)
         {
             var source =
-                $@"using NServiceBus; 
+                $@"using NServiceBus;
 using System;
 using System.Threading;
-using System.Threading.Tasks; 
+using System.Threading.Tasks;
 
 class SomeOtherClass
 {{

src/NServiceBus.AzureFunctions.Analyzer.Tests/ConfigurationAnalyzerTestsCSharp8.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/ConfigurationAnalyzerTestsCSharp8.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.CSharp;
@@ -13,9 +13,9 @@ public class ConfigurationAnalyzerTestsCSharp8 : AnalyzerTestFixture<Configurati
         public Task DiagnosticIsReportedForEndpointConfiguration(string configuration, string diagnosticId)
         {
             var source =
-                $@"using NServiceBus; 
+                $@"using NServiceBus;
 using System;
-using System.Threading.Tasks; 
+using System.Threading.Tasks;
 class Foo
 {{
     void Bar(ServiceBusTriggeredEndpointConfiguration endpointConfig)

src/NServiceBus.AzureFunctions.Analyzer.Tests/Extensions/CompilationExtensions.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/Extensions/CompilationExtensions.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System;
     using System.Collections.Generic;
@@ -44,7 +44,7 @@ public static async Task<IEnumerable<Diagnostic>> GetAnalyzerDiagnostics(this Co
                 logAnalyzerExecutionTime: false);
 
             var diagnostics = await compilation
-                .WithAnalyzers(ImmutableArray.Create(analyzer), analysisOptions)
+                .WithAnalyzers([analyzer], analysisOptions)
                 .GetAnalyzerDiagnosticsAsync(cancellationToken);
 
             if (exceptions.Any())

src/NServiceBus.AzureFunctions.Analyzer.Tests/Extensions/DocumentExtensions.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/Extensions/DocumentExtensions.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System.Collections.Generic;
     using System.Linq;

src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.InProcess.Analyzer\NServiceBus.AzureFunctions.InProcess.Analyzer.csproj" />
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.InProcess.ServiceBus\NServiceBus.AzureFunctions.InProcess.ServiceBus.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
+    <PackageReference Include="Particular.Approvals" Version="2.0.1" />
+  </ItemGroup>
+
+</Project>

src/NServiceBus.AzureFunctions.Analyzer.Tests/OptionsAnalyzerTests.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/OptionsAnalyzerTests.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System.Threading.Tasks;
     using NUnit.Framework;
@@ -13,7 +13,7 @@ public class OptionsAnalyzerTests : AnalyzerTestFixture<ConfigurationAnalyzer>
         public Task DiagnosticIsReportedForOptions(string optionsType, string method, string diagnosticId)
         {
             var source =
-                $@"using NServiceBus; 
+                $@"using NServiceBus;
 class Foo
 {{
     void Bar({optionsType} options)

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/SourceGeneratorApprovals.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/SourceGeneratorApprovals.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.SourceGenerator.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System;
     using System.Collections.Generic;
@@ -108,7 +108,7 @@ public void Invalid_name_should_cause_an_error(string endpointName)
 ";
             var (_, diagnostics) = GetGeneratedOutput(source, suppressGeneratedDiagnosticsErrors: true);
 
-            Assert.That(diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error && d.Id == TriggerFunctionGenerator.InvalidEndpointNameError.Id), Is.True);
+            Assert.That(diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error && d.Id == AzureFunctionsDiagnostics.InvalidEndpointNameErrorId), Is.True);
         }
 
         [TestCase(null)]
@@ -123,7 +123,7 @@ public void Invalid_trigger_function_name_should_cause_an_error(string triggerFu
 ";
             var (_, diagnostics) = GetGeneratedOutput(source, suppressGeneratedDiagnosticsErrors: true);
 
-            Assert.That(diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error && d.Id == TriggerFunctionGenerator.InvalidTriggerFunctionNameError.Id), Is.True);
+            Assert.That(diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error && d.Id == AzureFunctionsDiagnostics.InvalidTriggerFunctionNameErrorId), Is.True);
         }
 
         [Test]

src/NServiceBus.AzureFunctions.Analyzer.Tests/TransportConfigurationAnalyzerTests.cs → src/NServiceBus.AzureFunctions.InProcess.Analyzer.Tests/TransportConfigurationAnalyzerTests.cs

@@ -1,4 +1,4 @@
-namespace NServiceBus.AzureFunctions.Analyzer.Tests
+namespace NServiceBus.AzureFunctions.InProcess.Analyzer.Tests
 {
     using System.Threading.Tasks;
     using NUnit.Framework;