Skip to content

Commit db4e7b4

Browse files
tamarariverabording
tamararivera
and
bording
authored
Prepare for NServiceBus 10 (#740)
* Update workflow files * Fix workflow * Bump version to 6.0 * Bum the target framework to .NET 10.0 * Remove Fody and Obsolete.Fody * Bump Microsoft.NET.Test.Sdk to 17.14.1 * Bump NUnit.Analyzers to 4.8.1 * Organize packages * Bump NUnit3TestAdapter to 5.0.0 * Bump Particular.Packaging to 4.4.0 * Bump PublicApiGenerator to 11.4.6 * Bump NServiceBus packages * Swap sln file for slnx file * Remove workaround * Split Packaging into separate item group --------- Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent fbfdffe commit db4e7b4

File tree

11 files changed

+42
-96
lines changed

11 files changed

+42
-96
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ jobs:
3131
- name: Setup .NET SDK
3232
uses: actions/setup-dotnet@v4.3.1
3333
with:
34-
dotnet-version: |
35-
9.0.x
36-
8.0.x
34+
global-json-file: global.json
3735
- name: Build
3836
run: dotnet build src --configuration Release
3937
- 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/Custom.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MinVerMinimumMajorMinor>5.0</MinVerMinimumMajorMinor>
4+
<MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

‎src/NServiceBus.Gateway.AcceptanceTests/NServiceBus.Gateway.AcceptanceTests.csproj‎

Lines changed: 11 additions & 14 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,16 +10,19 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="All" />
14-
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" PrivateAssets="All" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="All" />
16-
<PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" PrivateAssets="All" />
14+
<PackageReference Include="NUnit" Version="4.3.2" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.8.1" PrivateAssets="All" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" PrivateAssets="All" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.3" />
21-
<PackageReference Include="NServiceBus.Callbacks" Version="5.0.1" />
22-
<PackageReference Include="NUnit" Version="4.3.2" />
20+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.1" />
21+
<PackageReference Include="NServiceBus.Callbacks" Version="6.0.0-alpha.1" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Particular.Packaging" Version="4.4.0" PrivateAssets="All" />
2326
</ItemGroup>
2427

2528
<PropertyGroup>
@@ -33,10 +36,4 @@
3336
<RemoveSourceFileFromPackage Include="NonDurableTestSuiteConstaints.cs" />
3437
</ItemGroup>
3538

36-
<Target Name="WorkaroundForTesthostBeingAddedAsContent" BeforeTargets="_GetPackageFiles">
37-
<ItemGroup>
38-
<Content Update="**\testhost.*" Pack="false" />
39-
</ItemGroup>
40-
</Target>
41-
4239
</Project>

‎src/NServiceBus.Gateway.PersistenceTests/NServiceBus.Gateway.PersistenceTests.csproj‎

Lines changed: 6 additions & 11 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>
@@ -12,13 +12,14 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="All" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="All" />
17-
<PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" PrivateAssets="All" />
16+
<PackageReference Include="NUnit" Version="4.3.2" />
17+
<PackageReference Include="NUnit.Analyzers" Version="4.8.1" PrivateAssets="All" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" PrivateAssets="All" />
1819
</ItemGroup>
1920

2021
<ItemGroup>
21-
<PackageReference Include="NUnit" Version="4.3.2" />
22+
<PackageReference Include="Particular.Packaging" Version="4.4.0" PrivateAssets="All" />
2223
</ItemGroup>
2324

2425
<PropertyGroup>
@@ -32,10 +33,4 @@
3233
<RemoveSourceFileFromPackage Include="NonDurableDeduplicationStorageConfiguration.cs" />
3334
</ItemGroup>
3435

35-
<Target Name="WorkaroundForTesthostBeingAddedAsContent" BeforeTargets="_GetPackageFiles">
36-
<ItemGroup>
37-
<Content Update="**\testhost.*" Pack="false" />
38-
</ItemGroup>
39-
</Target>
40-
4136
</Project>

‎src/NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.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
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -12,12 +12,12 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1616
<PackageReference Include="NUnit" Version="4.3.2" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
17+
<PackageReference Include="NUnit.Analyzers" Version="4.8.1" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1919
<PackageReference Include="Particular.Approvals" Version="2.0.1" />
20-
<PackageReference Include="PublicApiGenerator" Version="11.4.5" />
20+
<PackageReference Include="PublicApiGenerator" Version="11.4.6" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/NServiceBus.Gateway.sln‎

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

‎src/NServiceBus.Gateway.slnx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="../.github/workflows/ci.yml" />
4+
<File Path="../.github/workflows/release.yml" />
5+
<File Path="Custom.Build.props" />
6+
</Folder>
7+
<Project Path="NServiceBus.Gateway.AcceptanceTests/NServiceBus.Gateway.AcceptanceTests.csproj" />
8+
<Project Path="NServiceBus.Gateway.PersistenceTests/NServiceBus.Gateway.PersistenceTests.csproj" />
9+
<Project Path="NServiceBus.Gateway.Tests/NServiceBus.Gateway.Tests.csproj" />
10+
<Project Path="NServiceBus.Gateway/NServiceBus.Gateway.csproj" />
11+
</Solution>

‎src/NServiceBus.Gateway/FodyWeavers.xml‎

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

0 commit comments

Comments
 (0)