Skip to content

Commit b6ee512

Browse files
tamarariveraRyanThomasForgebording
authored
Prepare for NServiceBus 10 (#1204)
* Update workflow files * Fix workflow file * Bump version to 6.0 * Bump target framework to .NET 10.0 * Migrate solution to slnx format * Update NServiceBus and Particular packages. * Update Microsoft packages * Update third-party packages. * Remove "RemoveInVersion = 6" ObsoleteEx items * Move "TreatAsErrorFromVersion = 6" Obsoletes to obsoletes-v6.cs * Bump NUnite.Analyzers to 4.9.2 * Bump Azure.Messaging.ServiceBus to 7.20.1 * Address CS0109:: The member does not hide an accessible member. * Fix migrated ObsoleteEx method to throw NotImplementedException() * Remove Obsolete API usage * Remove Obsolete Tests * Update Obsolete Description language for clarity * Update Approvals file. Includes - removal of Obsoletes deleted for v6 - Update in language of obsoletes - Adjustments for features in .NET 10 * Use File-scoped namespace declaration * Use FrameworkDescription to get framework version * Remove CVE mitigation - no vulnerable packages found. * Improve NoWarn property * Clean up project files * Update System.IO.Hashing * Set LangVersion to preview to get 14.0 * Use initializers to remove need for backing fields --------- Co-authored-by: Ryan Thomas <[email protected]> Co-authored-by: Brandon Ording <[email protected]>
1 parent cd24609 commit b6ee512

28 files changed

+174
-567
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ jobs:
3535
- name: Setup .NET SDK
3636
uses: actions/[email protected]
3737
with:
38-
dotnet-version: |
39-
9.0.x
40-
8.0.x
38+
global-json-file: global.json
4139
- name: Build
4240
run: dotnet build src --configuration Release
4341
- 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/[email protected]
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/AcceptanceTests/NServiceBus.Transport.AzureServiceBus.AcceptanceTests.csproj‎

Lines changed: 6 additions & 10 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
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -10,22 +10,18 @@
1010
<ProjectReference Include="..\Transport\NServiceBus.Transport.AzureServiceBus.csproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Include="Azure.Identity" Version="1.13.2" />
15-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.4" GeneratePathProperty="true" />
16-
<PackageReference Include="System.IO.Hashing" Version="9.0.4" />
17-
</ItemGroup>
18-
1913
<ItemGroup>
2014
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2216
<PackageReference Include="NUnit" Version="4.3.2" />
23-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
17+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
2418
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
2519
</ItemGroup>
2620

2721
<ItemGroup>
28-
<Folder Include="Options\" />
22+
<PackageReference Include="Azure.Identity" Version="1.14.0" />
23+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.1" GeneratePathProperty="true" />
24+
<PackageReference Include="System.IO.Hashing" Version="10.0.0-preview.5.25277.114" />
2925
</ItemGroup>
3026

3127
</Project>

‎src/CommandLine/NServiceBus.Transport.AzureServiceBus.CommandLine.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-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ToolCommandName>asb-transport</ToolCommandName>
77
<PackAsTool>True</PackAsTool>
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Identity" Version="1.13.2" />
15-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.19.0" />
14+
<PackageReference Include="Azure.Identity" Version="1.14.0" />
15+
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
1616
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
17-
<PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
17+
<PackageReference Include="Particular.Packaging" Version="4.4.0" PrivateAssets="All" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/CommandLineTests/CommandLineTests.cs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System;
44
using System.Collections.Generic;
55
using System.Diagnostics;
6+
using System.Runtime.InteropServices;
67
using System.Threading.Tasks;
78
using Azure.Messaging.ServiceBus;
89
using Azure.Messaging.ServiceBus.Administration;
@@ -514,12 +515,19 @@ async Task VerifyQueueExists(bool queueShouldExist)
514515

515516
static async Task<(string output, string error, int exitCode)> Execute(string command)
516517
{
517-
var process = new Process();
518-
process.StartInfo.RedirectStandardOutput = true;
519-
process.StartInfo.RedirectStandardError = true;
520-
process.StartInfo.WorkingDirectory = TestContext.CurrentContext.TestDirectory;
521-
process.StartInfo.FileName = "dotnet";
522-
process.StartInfo.Arguments = $"--fx-version {Environment.Version} NServiceBus.Transport.AzureServiceBus.CommandLine.dll " + command;
518+
var frameworkVersion = RuntimeInformation.FrameworkDescription.AsSpan()[5..];
519+
520+
var process = new Process
521+
{
522+
StartInfo =
523+
{
524+
RedirectStandardOutput = true,
525+
RedirectStandardError = true,
526+
WorkingDirectory = TestContext.CurrentContext.TestDirectory,
527+
FileName = "dotnet",
528+
Arguments = $"--fx-version {frameworkVersion} NServiceBus.Transport.AzureServiceBus.CommandLine.dll " + command
529+
}
530+
};
523531

524532
process.Start();
525533
var outputTask = process.StandardOutput.ReadToEndAsync();

‎src/CommandLineTests/NServiceBus.Transport.AzureServiceBus.CommandLine.Tests.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/Custom.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MinVerMinimumMajorMinor>5.0</MinVerMinimumMajorMinor>
4+
<MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
6+
<LangVersion>preview</LangVersion>
67
</PropertyGroup>
78

89
</Project>

‎src/MigrationAcceptanceTests/NServiceBus.Transport.AzureServiceBus.Migration.AcceptanceTests.csproj‎

Lines changed: 13 additions & 21 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
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
<RootNamespace>NServiceBus.Transport.AzureServiceBus.Topic.AcceptanceTests</RootNamespace>
@@ -11,33 +11,25 @@
1111
<ProjectReference Include="..\Transport\NServiceBus.Transport.AzureServiceBus.csproj" />
1212
</ItemGroup>
1313

14-
<ItemGroup>
15-
<PackageReference Include="Azure.Identity" Version="1.13.2" />
16-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.4" GeneratePathProperty="true" />
17-
<PackageReference Include="System.IO.Hashing" Version="9.0.4" />
18-
</ItemGroup>
19-
2014
<ItemGroup>
2115
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2317
<PackageReference Include="NUnit" Version="4.3.2" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
18+
<PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
2519
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
2620
</ItemGroup>
2721

2822
<ItemGroup>
29-
<Compile Include="..\AcceptanceTests\TestIndependenceMutator.cs">
30-
<Link>TestIndependenceMutator.cs</Link>
31-
</Compile>
32-
<Compile Include="..\AcceptanceTests\TestIndependenceSkipBehavior.cs">
33-
<Link>TestIndependenceSkipBehavior.cs</Link>
34-
</Compile>
35-
<Compile Include="..\AcceptanceTests\TestSuiteConstraints.cs">
36-
<Link>TestSuiteConstraints.cs</Link>
37-
</Compile>
38-
<Compile Include="..\AcceptanceTests\AcceptanceTestExtensions.cs">
39-
<Link>AcceptanceTestExtensions.cs</Link>
40-
</Compile>
23+
<PackageReference Include="Azure.Identity" Version="1.14.0" />
24+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.1" GeneratePathProperty="true" />
25+
<PackageReference Include="System.IO.Hashing" Version="10.0.0-preview.5.25277.114" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<Compile Include="..\AcceptanceTests\TestIndependenceMutator.cs" />
30+
<Compile Include="..\AcceptanceTests\TestIndependenceSkipBehavior.cs" />
31+
<Compile Include="..\AcceptanceTests\TestSuiteConstraints.cs" />
32+
<Compile Include="..\AcceptanceTests\AcceptanceTestExtensions.cs" />
4133
</ItemGroup>
4234

4335
</Project>

‎src/NServiceBus.Transport.AzureServiceBus.sln‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)