Skip to content

Commit 883035c

Browse files
tamarariveratamararivera
authored
Prepare for NServiceBus 10 (#657)
* Update workflow files * Fix CI * Bump version to 5.0 * Set language to preview * Remove obsoletes file * Bump to target framework .NET 10.0 * Bump Microsoft.Extensions.Hosting to the latest preview * Bump Microsoft.NET.Test.Sdk to 17.14.1 * Bump NUnit.Analyzers to 4.9.2 * Bump Particular.Packaging to 4.4.0 * Bump PublicApiGenerator to 11.4.6 * Bump NServiceBus packages * Swap sln file for slnx file * Bump NServiceBus packages * Update approval file * Use the async calls * Bump System.IO.Hashing to latest
1 parent d08c6f2 commit 883035c

File tree

22 files changed

+80
-197
lines changed

22 files changed

+80
-197
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ jobs:
4040
- name: Setup .NET SDK
4141
uses: actions/setup-dotnet@v4.3.1
4242
with:
43-
dotnet-version: |
44-
9.0.x
45-
8.0.x
43+
global-json-file: global.json
4644
- name: Build
4745
run: dotnet build src --configuration Release
4846
- name: Upload packages

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup .NET SDK
2121
uses: actions/setup-dotnet@v4.3.1
2222
with:
23-
dotnet-version: 9.0.x
23+
global-json-file: global.json
2424
- name: Build
2525
run: dotnet build src --configuration Release
2626
- name: Sign NuGet packages

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.0",
4+
"allowPrerelease": true,
45
"rollForward": "latestFeature"
56
}
67
}

‎src/AcceptanceTesting/AcceptanceTesting.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.6" />
14+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.1" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/AcceptanceTests.ASB/AcceptanceTests.ASB.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,15 +10,15 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="5.0.2" />
21-
<PackageReference Include="System.IO.Hashing" Version="9.0.6" />
20+
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.0.0-alpha.1" />
21+
<PackageReference Include="System.IO.Hashing" Version="10.0.0-preview.5.25277.114" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/AcceptanceTests.ASQ/AcceptanceTests.ASQ.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,14 +10,14 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.2" />
20+
<PackageReference Include="NServiceBus.Transport.AzureStorageQueues" Version="14.0.0-alpha.1" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/AcceptanceTests.Learning/AcceptanceTests.Learning.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,9 +10,9 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1717
</ItemGroup>
1818

‎src/AcceptanceTests.Msmq/AcceptanceTests.Msmq.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-windows;net9.0-windows</TargetFrameworks>
4+
<TargetFramework>net10.0.0-windows</TargetFramework>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -13,9 +13,9 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1717
<PackageReference Include="NUnit" Version="4.3.2" />
18-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
18+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
2020
</ItemGroup>
2121

‎src/AcceptanceTests.RabbitMQ/AcceptanceTests.RabbitMQ.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,14 +10,14 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1414
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="NServiceBus.RabbitMQ" Version="9.2.0" />
20+
<PackageReference Include="NServiceBus.RabbitMQ" Version="11.0.0-alpha.1" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/AcceptanceTests.RabbitMQ/ConfigureRabbitMQTransportTestExecution.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public Task Configure(string endpointName, EndpointConfiguration endpointConfigu
1818

1919
public Task Cleanup()
2020
{
21-
PurgeQueues(transport);
21+
_ = PurgeQueues(transport);
2222

2323
return Task.CompletedTask;
2424
}
2525

26-
static void PurgeQueues(TestableRabbitMQTransport transport)
26+
static async Task PurgeQueues(TestableRabbitMQTransport transport)
2727
{
2828
if (transport == null)
2929
{
@@ -32,14 +32,14 @@ static void PurgeQueues(TestableRabbitMQTransport transport)
3232

3333
var queues = transport.QueuesToCleanup.Distinct().ToArray();
3434

35-
using var connection = ConnectionHelper.ConnectionFactory.CreateConnection("Test Queue Purger");
36-
using var channel = connection.CreateModel();
35+
await using var connection = await ConnectionHelper.ConnectionFactory.CreateConnectionAsync("Test Queue Purger");
36+
await using var channel = await connection.CreateChannelAsync();
3737
foreach (var queue in queues)
3838
{
3939
try
4040
{
41-
channel.QueuePurge(queue);
42-
channel.QueueDelete(queue, false, false);
41+
_ = channel.QueuePurgeAsync(queue);
42+
_ = channel.QueueDeleteAsync(queue, false, false);
4343
}
4444
catch (Exception ex)
4545
{
@@ -52,7 +52,7 @@ static void PurgeQueues(TestableRabbitMQTransport transport)
5252

5353
public Task Cleanup(BridgeTransport bridgeTransport)
5454
{
55-
PurgeQueues(bridgeTransport.FromTestableBridge<TestableRabbitMQTransport>());
55+
_ = PurgeQueues(bridgeTransport.FromTestableBridge<TestableRabbitMQTransport>());
5656
return Task.CompletedTask;
5757
}
5858
}

0 commit comments

Comments
 (0)