Skip to content

Commit e2dbba6

Browse files
Prepare for NServiceBus 10 (#739)
* Update workflow files * Use global.json explictly in workflow * Bump major version * Change target version to net10.0 * Bump NServiceBus package * Bump Particluar.Packaging to 4.3.1 * Bump Microsoft.NET.Test.Sdk to 17.14.0 * Update additional third-party packages to latest release. * Remove PrivateAssets/IncludeAssets introduced by nuget upgrade. * Roll back NUnit.Analyzers to 4.7.0. * Migrate solution file to slnx format * Remove unnecessary plural from TargetFramework --------- Co-authored-by: Ryan Thomas <ryan.thomas@particular.net>
1 parent 0576619 commit e2dbba6

File tree

8 files changed

+24
-54
lines changed

8 files changed

+24
-54
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>9.0</MinVerMinimumMajorMinor>
4+
<MinVerMinimumMajorMinor>10.0</MinVerMinimumMajorMinor>
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

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,12 +10,12 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1414
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1717
<PackageReference Include="Particular.Approvals" Version="2.0.1" />
18-
<PackageReference Include="PublicApiGenerator" Version="11.4.5" />
18+
<PackageReference Include="PublicApiGenerator" Version="11.4.6" />
1919
</ItemGroup>
2020

2121
</Project>

src/NServiceBus.Testing.sln

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

src/NServiceBus.Testing.slnx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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.Testing.Tests/NServiceBus.Testing.Tests.csproj" />
8+
<Project Path="NServiceBus.Testing/NServiceBus.Testing.csproj" />
9+
</Solution>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
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>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
77
<Description>A testing framework for NServiceBus</Description>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Fody" Version="6.9.1" PrivateAssets="All" />
12-
<PackageReference Include="NServiceBus" Version="9.2.4" />
13-
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
14-
<PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
11+
<PackageReference Include="Fody" Version="6.9.2" PrivateAssets="All" />
12+
<PackageReference Include="NServiceBus" Version="10.0.0-alpha.1" />
13+
<PackageReference Include="Obsolete.Fody" Version="5.3.1" PrivateAssets="All" />
14+
<PackageReference Include="Particular.Packaging" Version="4.3.1" PrivateAssets="All" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)