Skip to content

Commit f8c1dc2

Browse files
Prepare for NServiceBus 10 (#1763)
* Update workflow files * Fix workflow * Add the Aurora workflow to the solution * Bump version to 9.0 * Minimal changes to compile with .NET 10.0 * Bump Microsoft.NET.Test.Sdk to 17.14.1 * Bump NUnit to 4.3.2 * Bump NUnit.Analyzers to 4.9.1 * Bump Particular.Packaging to 4.4.0 * Bump PublicApiGenerator to 11.4.6 * Fix tests errors * Reference .NET 10.0 instead of .NET 8.0 * Bump target framework to .NET 10.0 * Bump NServiceBus packages * Delete test file that was added to NServiceBus * Prevent SBOM generation * Bump Amazon.CDK.Lib to 2.201.0 * Bump MySql.Data to 9.3.0 * Bump ILRepack to 2.0.44 * Swap sln file for slnx file * Bump Microsoft.Build.Utilities.Core to 17.14.8 * Replace Approvals files * Delete the reference to System.Data.SqlClient and related tests * Remove not needed workaround * Organize test projects * Formatting * Update targets file * Use properties to simplify updating ScriptBuilder TFMs * Update ScriptBuilder LangVersion * Remove old tool for 7.x bug * Fix casing of README * Remove Fody * Update NUnit.Analyzers * Remove unneeded package references * Fix property name --------- Co-authored-by: Brandon Ording <[email protected]>
1 parent 4b62dc6 commit f8c1dc2

File tree

69 files changed

+155
-3093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+155
-3093
lines changed

.github/workflows/aurora.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/[email protected]
3333
with:
34-
dotnet-version: |
35-
9.0.x
36-
8.0.x
34+
global-json-file: global.json
3735
- name: Set up Node.js
3836
uses: actions/[email protected]
3937
with:

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ jobs:
3737
- name: Setup .NET SDK
3838
uses: actions/[email protected]
3939
with:
40-
dotnet-version: |
41-
9.0.x
42-
8.0.x
40+
global-json-file: global.json
4341
- name: Build
4442
run: dotnet build src --configuration Release -graph
4543
- name: Upload packages
@@ -68,7 +66,7 @@ jobs:
6866
connection-string-name: PostgreSqlConnectionString
6967
tag: SqlPersistence
7068
registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
71-
registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
69+
registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
7270
- name: Setup MySQL
7371
id: setup-mysql
7472
if: matrix.engine == 'MySql'

.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 -graph
2626
- name: Sign NuGet packages
File renamed without changes.

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/AcceptanceTestHelper/AcceptanceTestHelper.csproj

Lines changed: 1 addition & 1 deletion
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>

src/AuroraSetup/AuroraSetup.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Amazon.CDK.Lib" Version="2.200.1" />
11+
<PackageReference Include="Amazon.CDK.Lib" Version="2.201.0" />
1212
<PackageReference Include="Amazon.Jsii.Analyzers" Version="1.112.0" />
1313
<PackageReference Include="Constructs" Version="10.4.2" />
1414
</ItemGroup>
1515

16-
<ItemGroup Label="Direct references to transitive dependencies to avoid versions with CVE">
17-
<PackageReference Include="System.Text.Json" Version="9.0.5" />
18-
</ItemGroup>
19-
2016
</Project>

src/CommandLine/NServiceBus.Persistence.Sql.CommandLine.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
<OutputType>Exe</OutputType>
66
<ToolCommandName>sql-persistence</ToolCommandName>
77
<PackAsTool>True</PackAsTool>
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
19-
<PackageReference Include="Particular.Packaging" Version="4.2.2" PrivateAssets="All" />
19+
<PackageReference Include="Particular.Packaging" Version="4.4.0" PrivateAssets="All" />
2020
</ItemGroup>
2121

2222
</Project>

src/Custom.Build.props

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

33
<PropertyGroup>
4-
<MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
4+
<MinVerMinimumMajorMinor>9.0</MinVerMinimumMajorMinor>
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

8+
<!-- MSBuild tasks require a .NET Framework version to work in Visual Studo, so we have to multi-target. -->
9+
<!-- When changing these values, the SqlPersistenceScriptBuilderTaskPath property in the NServiceBus.Persistence.Sql.targets file needs to be updated to match. -->
10+
<PropertyGroup>
11+
<ScriptBuilderTargetFrameworkForVS>net472</ScriptBuilderTargetFrameworkForVS>
12+
<ScriptBuilderTargetFramework>net10.0</ScriptBuilderTargetFramework>
13+
<ScriptBuilderTargetFrameworks>$(ScriptBuilderTargetFrameworkForVS);$(ScriptBuilderTargetFramework)</ScriptBuilderTargetFrameworks>
14+
</PropertyGroup>
15+
816
</Project>

src/MsSqlMicrosoftDataClientAcceptanceTests/MsSqlMicrosoftDataClientAcceptanceTests.csproj

Lines changed: 3 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
<RootNamespace>MsSqlAcceptanceTests</RootNamespace>
66
</PropertyGroup>
77

@@ -11,10 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.2.3" />
16-
<PackageReference Include="NUnit" Version="4.2.2" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
15+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="10.0.0-alpha.1" />
1816
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1917
</ItemGroup>
2018

0 commit comments

Comments
 (0)