Prepare repo for .NET 8

.github/workflows/ci.yml

@@ -13,15 +13,15 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   NSERVICEBUS_AMAZONSQS_S3BUCKET: ${{ secrets.NSERVICEBUS_AMAZONSQS_S3BUCKET }}
 jobs:
-  build: 
+  build:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - os: windows-2019
+          - os: windows-2022
             name: Windows
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             name: Linux
       fail-fast: false
     steps:
@@ -33,13 +33,11 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
         with:
-          fetch-depth: 0      
+          fetch-depth: 0
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: |
-            7.0.x
-            6.0.x
+          dotnet-version: 8.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages
@@ -51,4 +49,3 @@ jobs:
           retention-days: 7
       - name: Run tests
         uses: Particular/[email protected]
-

.github/workflows/release.yml

@@ -8,16 +8,16 @@ env:
   DOTNET_NOLOGO: true
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/[email protected]
         with:
-          fetch-depth: 0     
+          fetch-depth: 0
       - name: Setup .NET SDK
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages
@@ -36,4 +36,4 @@ jobs:
       - name: Deploy
         uses: Particular/[email protected]
         with:
-          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
+          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}

src/Custom.Build.props

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

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/.editorconfig

@@ -2,6 +2,7 @@
 
 # Justification: Test project
 dotnet_diagnostic.CA2007.severity = none
+dotnet_diagnostic.PS0018.severity = none
 
 # Justification: Tests don't support cancellation and don't need to forward IMessageHandlerContext.CancellationToken
 dotnet_diagnostic.NSB0002.severity = suggestion

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/AwsLambdaSQSEndpointTestBase.cs

@@ -15,7 +15,6 @@
     using Amazon.SQS;
     using Amazon.SQS.Model;
     using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using NUnit.Framework;
 
     [TestFixture]
@@ -40,7 +39,7 @@ class AwsLambdaSQSEndpointTestBase
         [SetUp]
         public async Task Setup()
         {
-            queueNames = new List<string>();
+            queueNames = [];
 
             Prefix = Path.GetFileNameWithoutExtension(Path.GetRandomFileName()).ToLowerInvariant();
 
@@ -103,22 +102,35 @@ await s3Client.DeleteObjectsAsync(new DeleteObjectsRequest
             }
         }
 
-        protected AwsLambdaSQSEndpointConfiguration DefaultLambdaEndpointConfiguration<TTestContext>(TTestContext testContext)
+        protected AwsLambdaSQSEndpointConfiguration DefaultLambdaEndpointConfiguration<TTestContext>(TTestContext testContext, bool useXmlSerializer = false)
         {
-            var configuration = DefaultLambdaEndpointConfiguration();
+            var configuration = DefaultLambdaEndpointConfiguration(useXmlSerializer);
             configuration.AdvancedConfiguration.RegisterComponents(c => c.AddSingleton(typeof(TTestContext), testContext));
             return configuration;
         }
 
-        protected AwsLambdaSQSEndpointConfiguration DefaultLambdaEndpointConfiguration()
+        protected AwsLambdaSQSEndpointConfiguration DefaultLambdaEndpointConfiguration(bool useXmlSerializer = false)
         {
             var configuration = new AwsLambdaSQSEndpointConfiguration(QueueName, CreateSQSClient(), CreateSNSClient());
             configuration.Transport.QueueNamePrefix = Prefix;
             configuration.Transport.TopicNamePrefix = Prefix;
             configuration.Transport.S3 = new S3Settings(BucketName, Prefix, CreateS3Client());
 
             var advanced = configuration.AdvancedConfiguration;
-            advanced.SendFailedMessagesTo(ErrorQueueAddress);
+
+            if (useXmlSerializer)
+            {
+                advanced.UseSerialization<XmlSerializer>();
+            }
+            else
+            {
+                advanced.UseSerialization<SystemJsonSerializer>();
+            }
+
+            var recoverability = advanced.Recoverability();
+
+            recoverability.Immediate(i => i.NumberOfRetries(0));
+            recoverability.Delayed(d => d.NumberOfRetries(0));
 
             return configuration;
         }
@@ -138,6 +150,7 @@ protected void RegisterQueueNameToCleanup(string queueName)
                 S3 = new S3Settings(BucketName, Prefix, CreateS3Client())
             };
 
+            endpointConfiguration.UseSerialization<SystemJsonSerializer>();
             endpointConfiguration.UseTransport(transport);
 
             var endpointInstance = await Endpoint.Start(endpointConfiguration)
@@ -156,8 +169,8 @@ protected void RegisterQueueNameToCleanup(string queueName)
             {
                 MaxNumberOfMessages = count,
                 WaitTimeSeconds = 20,
-                AttributeNames = new List<string> { "SentTimestamp" },
-                MessageAttributeNames = new List<string> { "*" }
+                AttributeNames = ["SentTimestamp"],
+                MessageAttributeNames = ["*"]
             };
 
             var receivedMessages = await sqsClient.ReceiveMessageAsync(receiveRequest);
@@ -183,8 +196,8 @@ await sqsClient.SendMessageAsync(sendMessageRequest)
             {
                 MaxNumberOfMessages = 10,
                 WaitTimeSeconds = 20,
-                AttributeNames = new List<string> { "SentTimestamp" },
-                MessageAttributeNames = new List<string> { "*" }
+                AttributeNames = ["SentTimestamp"],
+                MessageAttributeNames = ["*"]
             };
 
             var receivedMessages = await sqsClient.ReceiveMessageAsync(receiveRequest);
@@ -214,8 +227,8 @@ protected async Task<SQSEvent> RetrieveMessagesInErrorQueue(int maxMessageCount
             {
                 MaxNumberOfMessages = maxMessageCount,
                 WaitTimeSeconds = 20,
-                AttributeNames = new List<string> { "SentTimestamp" },
-                MessageAttributeNames = new List<string> { "*" }
+                AttributeNames = ["SentTimestamp"],
+                MessageAttributeNames = ["*"]
             };
 
             var receivedMessages = await sqsClient.ReceiveMessageAsync(receiveRequest);

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/NServiceBus.AwsLambda.SQS.AcceptanceTests.csproj

@@ -1,20 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <RootNamespace>NServiceBus.AcceptanceTests</RootNamespace>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.AwsLambda.SQS\NServiceBus.AwsLambda.SQS.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
+    <PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
+    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.AmazonSQS" Version="7.0.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.AwsLambda.SQS\NServiceBus.AwsLambda.SQS.csproj" />
-  </ItemGroup>
-
 </Project>

src/NServiceBus.AwsLambda.SQS.AcceptanceTests/NativeIntegration/When_receiving_a_native_message_with_encoding.cs

@@ -24,7 +24,7 @@ public async Task Should_be_processed_when_messagetypefullname_present()
 
             var context = new TestContext();
 
-            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context));
+            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context, useXmlSerializer: true));
 
             await endpoint.Process(receivedMessages, null);
 
@@ -48,7 +48,7 @@ public async Task Should_fail_when_messagetypefullname_not_present()
 
             var context = new TestContext();
 
-            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context));
+            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context, useXmlSerializer: true));
 
             await endpoint.Process(receivedMessages, null);
 
@@ -74,7 +74,7 @@ public async Task Should_preserve_poison_message_attributes_in_error_queue()
 
             var context = new TestContext();
 
-            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context));
+            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context, useXmlSerializer: true));
 
             await endpoint.Process(receivedMessages, null);
             var poisonMessages = await RetrieveMessagesInErrorQueue();
@@ -103,12 +103,7 @@ public async Task Should_preserve_message_attributes_in_error_queue()
 
             }, FailingMessageToSend);
 
-            var endpoint = new AwsLambdaSQSEndpoint(ctx =>
-            {
-                var configuration = DefaultLambdaEndpointConfiguration();
-                configuration.AdvancedConfiguration.Recoverability().Immediate(s => s.NumberOfRetries(0));
-                return configuration;
-            });
+            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(useXmlSerializer: true));
 
             await endpoint.Process(receivedMessages, null);
             var poisonMessages = await RetrieveMessagesInErrorQueue();
@@ -139,7 +134,7 @@ public async Task Should_support_loading_body_from_s3()
 
             var context = new TestContext();
 
-            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context));
+            var endpoint = new AwsLambdaSQSEndpoint(_ => DefaultLambdaEndpointConfiguration(context, useXmlSerializer: true));
 
             await endpoint.Process(receivedMessages, null);