Skip to content

Commit 9fc53bb

Browse files
andreasohlundbordingdanielmarbach
authored
Prepare for RTM (#2414)
* Prepare for RTM * Tweaks * Don't use $(SolutionDir) in key path * Remove Newtonsoft serializer * React to JSON serializer being used instead of XML * Formatting * React to rebase changes * Use collection initializers * Adjustements after rebase * Bump sdk * Add debug logging to stop operations * Add logging to start as well * Add message processing logs * Add more logging * Stop purging * Simplify * Tweaks after rebase * Exclude flaky test * Cleanup * Remove guard * Add link to issue * Tweaks * Move error queue url fetching to the point where we need it to avoid lambda running into issues when the error queue doesn't exist * Update packages --------- Co-authored-by: Brandon Ording <[email protected]> Co-authored-by: danielmarbach <[email protected]>
1 parent 43b404b commit 9fc53bb

File tree

35 files changed

+162
-228
lines changed

35 files changed

+162
-228
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
uses: actions/[email protected]
4040
with:
4141
dotnet-version: 8.0.x
42-
dotnet-quality: 'preview'
4342
- name: Build
4443
run: dotnet build src --configuration Release
4544
- name: Upload packages

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ jobs:
1111
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout
14-
uses: actions/[email protected]
14+
uses: actions/[email protected]
1515
with:
1616
fetch-depth: 0
1717
- name: Setup .NET SDK
1818
uses: actions/[email protected]
1919
with:
2020
dotnet-version: 8.0.x
21-
dotnet-quality: 'preview'
2221
- name: Build
2322
run: dotnet build src --configuration Release
2423
- name: Sign NuGet packages

‎src/CommandLine/NServiceBus.Transports.SQS.CommandLine.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="AWSSDK.SQS" Version="3.7.300.52" />
18-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301" />
19-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.28" />
17+
<PackageReference Include="AWSSDK.S3" Version="3.7.305.29" />
18+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301.1" />
19+
<PackageReference Include="AWSSDK.SQS" Version="3.7.300.53" />
2020
<PackageReference Include="BitFaster.Caching" Version="2.4.1" />
2121
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
22-
<PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
22+
<PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/CommandLine/Program.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace NServiceBus.Transport.SQS.CommandLine
22
{
33
using System;
4-
using System.Collections.Generic;
54
using McMaster.Extensions.CommandLineUtils;
65

76
// usage:
@@ -272,9 +271,9 @@ static int Main(string[] args)
272271
{
273272
var endpointName = nameArgument.Value;
274273
var prefix = prefixOption.HasValue() ? prefixOption.Value() : DefaultConfigurationValues.QueueNamePrefix;
275-
var eventTypes = eventTypeOption.HasValue() ? eventTypeOption.Values : new List<string>();
274+
var eventTypes = eventTypeOption.HasValue() ? eventTypeOption.Values : [];
276275

277-
await CommandRunner.Run(accessKeyOption, secretOption, regionOption, (sqs, sns, s3) => Endpoint.SetPolicy(sqs, sns, prefix, endpointName, eventTypes, false, false, new List<string>()));
276+
await CommandRunner.Run(accessKeyOption, secretOption, regionOption, (sqs, sns, s3) => Endpoint.SetPolicy(sqs, sns, prefix, endpointName, eventTypes, false, false, []));
278277
});
279278
});
280279

@@ -315,8 +314,8 @@ static int Main(string[] args)
315314
var addAccountCondition = accountWildcardOption.HasValue();
316315
var addPrefixCondition = prefixWildcardOption.HasValue();
317316
var prefix = prefixOption.HasValue() ? prefixOption.Value() : DefaultConfigurationValues.QueueNamePrefix;
318-
var namespaceConditions = namespaceWildcardOption.HasValue() ? namespaceWildcardOption.Values : new List<string>();
319-
var eventTypes = removeEventTypeOption.HasValue() ? removeEventTypeOption.Values : new List<string>();
317+
var namespaceConditions = namespaceWildcardOption.HasValue() ? namespaceWildcardOption.Values : [];
318+
var eventTypes = removeEventTypeOption.HasValue() ? removeEventTypeOption.Values : [];
320319

321320
await CommandRunner.Run(accessKeyOption, secretOption, regionOption, (sqs, sns, s3) => Endpoint.SetPolicy(sqs, sns, prefix, endpointName, eventTypes, addAccountCondition, addPrefixCondition, namespaceConditions));
322321
});

‎src/CommandLineTests/CommandLineTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace NServiceBus.Transport.SQS.CommandLine.Tests
22
{
33
using System;
4-
using System.Collections.Generic;
54
using System.Diagnostics;
65
using System.Linq;
76
using System.Text;

‎src/CommandLineTests/NServiceBus.Transports.SQS.CommandLine.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AWSSDK.SQS" Version="3.7.300.52" />
13-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301" />
14-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.28" />
15-
<PackageReference Include="BitFaster.Caching" Version="2.4.1" />
1612
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
1713
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1814
<PackageReference Include="NUnit" Version="3.14.0" />

‎src/Custom.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<MinVerMinimumMajorMinor>7.0</MinVerMinimumMajorMinor>
5-
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
5+
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

88
</Project>

‎src/NServiceBus.AmazonSQS.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transports.SQS.
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C1C8A6A2-0462-42F0-9FC4-5401EA3DE9AF}"
1919
ProjectSection(SolutionItems) = preProject
20+
..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
2021
Custom.Build.props = Custom.Build.props
22+
..\.github\workflows\release.yml = ..\.github\workflows\release.yml
2123
EndProjectSection
2224
EndProject
2325
Global

‎src/NServiceBus.Transport.SQS.AcceptanceTests/Installers/ServerWithInstallersDisabled.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public virtual async Task<EndpointConfiguration> GetConfiguration(RunDescriptor
2121

2222
await builder.DefineTransport(TransportConfiguration, runDescriptor, endpointConfiguration).ConfigureAwait(false);
2323

24+
builder.UseSerialization<SystemJsonSerializer>();
25+
2426
await configurationBuilderCustomization(builder).ConfigureAwait(false);
2527

2628
// scan types at the end so that all types used by the configuration have been loaded into the AppDomain

‎src/NServiceBus.Transport.SQS.AcceptanceTests/NServiceBus.Transport.SQS.AcceptanceTests.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<SignAssembly>true</SignAssembly>
6-
<AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
6+
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
<RootNamespace>NServiceBus.AcceptanceTests</RootNamespace>
88
</PropertyGroup>
99

@@ -12,16 +12,15 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AWSSDK.SQS" Version="3.7.300.52" />
16-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301" />
17-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.28" />
15+
<PackageReference Include="AWSSDK.S3" Version="3.7.305.29" />
16+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301.1" />
17+
<PackageReference Include="AWSSDK.SQS" Version="3.7.300.53" />
1818
<PackageReference Include="BitFaster.Caching" Version="2.4.1" />
1919
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
20-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0-alpha.9" GeneratePathProperty="true" />
2120
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
21+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" GeneratePathProperty="true" />
2222
<PackageReference Include="NUnit" Version="3.14.0" />
2323
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
24-
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="4.0.0-alpha.1" />
2524
</ItemGroup>
2625

2726
<ItemGroup>

0 commit comments

Comments
 (0)