Skip to content

Commit 80fcae8

Browse files
particularbotinternalautomation[bot]tamararivera
authored
Updates for .NET 8 - release-9.0 (#1095)
* Updates for .NET 8 * Bump System.Data.SqlClient to 4.8.6 * Bump Oracle.ManagedDataAccess.Core to 2.19.180 * Add the exclusion to the IDE0028 rule * Adds exception for the IDE0028 rule --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Tamara Rivera <[email protected]>
1 parent e90ba7a commit 80fcae8

File tree

11 files changed

+64
-50
lines changed

11 files changed

+64
-50
lines changed

‎.github/workflows/ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
workflow_dispatch:
99
env:
1010
DOTNET_NOLOGO: true
11+
defaults:
12+
run:
13+
shell: pwsh
1114
jobs:
1215
build:
1316
name: ${{ matrix.name }}
@@ -22,27 +25,28 @@ jobs:
2225
fail-fast: false
2326
steps:
2427
- name: Checkout
25-
uses: actions/checkout@v3.2.0
28+
uses: actions/checkout@v4.1.1
2629
with:
2730
fetch-depth: 0
2831
- name: Setup .NET SDK
29-
uses: actions/setup-dotnet@v3.0.3
32+
uses: actions/setup-dotnet@v4.0.0
3033
with:
3134
dotnet-version: |
35+
8.0.x
3236
7.0.x
3337
6.0.x
3438
- name: Build
3539
run: dotnet build src --configuration Release
3640
- name: Upload packages
3741
if: matrix.name == 'Windows'
38-
uses: actions/upload-artifact@v3.1.1
42+
uses: actions/upload-artifact@v4.3.1
3943
with:
4044
name: NuGet packages
4145
path: nugets/
4246
retention-days: 7
4347
- name: Azure login
4448
if: matrix.name == 'Windows'
45-
uses: azure/login@v1.4.5
49+
uses: azure/login@v2.0.0
4650
with:
4751
creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
4852
- name: Install SQL Server
@@ -56,4 +60,4 @@ jobs:
5660
connection-string-name: OracleConnectionString
5761
tag: NHibernatePersistence
5862
- name: Run tests
59-
uses: Particular/run-tests-action@v1.4.0
63+
uses: Particular/run-tests-action@v1.7.0

‎.github/workflows/release.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ on:
66
- '[0-9]+.[0-9]+.[0-9]+-*'
77
env:
88
DOTNET_NOLOGO: true
9+
defaults:
10+
run:
11+
shell: pwsh
912
jobs:
1013
release:
1114
runs-on: ubuntu-20.04
1215
steps:
1316
- name: Checkout
14-
uses: actions/checkout@v3.2.0
17+
uses: actions/checkout@v4.1.1
1518
with:
1619
fetch-depth: 0
1720
- name: Setup .NET SDK
18-
uses: actions/setup-dotnet@v3.0.3
21+
uses: actions/setup-dotnet@v4.0.0
1922
with:
20-
dotnet-version: 7.0.x
23+
dotnet-version: 8.0.x
2124
- name: Build
2225
run: dotnet build src --configuration Release
2326
- name: Sign NuGet packages
@@ -28,12 +31,13 @@ jobs:
2831
client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
2932
certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}
3033
- name: Publish artifacts
31-
uses: actions/upload-artifact@v3.1.1
34+
uses: actions/upload-artifact@v4.3.1
3235
with:
3336
name: nugets
3437
path: nugets/*
3538
retention-days: 1
3639
- name: Deploy
37-
uses: Particular/[email protected]
40+
# Does not follow standard practice of targeting explicit versions because configuration is tightly coupled to Octopus Deploy configuration
41+
uses: Particular/push-octopus-package-action@main
3842
with:
3943
octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}

‎src/NServiceBus.NHibernate.AcceptanceTests-Oracle/NServiceBus.NHibernate.AcceptanceTests-Oracle.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
<RootNamespace>NServiceBus.NHibernate.AcceptanceTests.Oracle</RootNamespace>
66
</PropertyGroup>
77

@@ -10,13 +10,13 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1414
<PackageReference Include="NHibernate" Version="5.3.13" />
1515
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.0.0" GeneratePathProperty="true" />
16-
<PackageReference Include="NUnit" Version="3.13.3" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
18-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
19-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
16+
<PackageReference Include="NUnit" Version="3.14.0" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
18+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
19+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/NServiceBus.NHibernate.AcceptanceTests-SqlTransportTests/NServiceBus.NHibernate.AcceptanceTests-SqlTransportTests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<ProjectReference Include="..\NServiceBus.NHibernate\NServiceBus.NHibernate.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1313
<PackageReference Include="NHibernate" Version="5.3.13" />
1414
<PackageReference Include="NServiceBus.SqlServer" Version="7.0.0" />
1515
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.0.0" GeneratePathProperty="true" />
16-
<PackageReference Include="NUnit" Version="3.13.3" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
18-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
19-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
16+
<PackageReference Include="NUnit" Version="3.14.0" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
18+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
19+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/NServiceBus.NHibernate.AcceptanceTests/.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ dotnet_diagnostic.PS0018.severity = suggestion # A task-returning method should
88

99
# Justification: Tests don't support cancellation and don't need to forward IMessageHandlerContext.CancellationToken
1010
dotnet_diagnostic.NSB0002.severity = suggestion
11+
12+
# IDE0028: Simplify collection initialization
13+
dotnet_diagnostic.IDE0028.severity = suggestion

‎src/NServiceBus.NHibernate.AcceptanceTests/NServiceBus.NHibernate.AcceptanceTests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<ProjectReference Include="..\NServiceBus.NHibernate\NServiceBus.NHibernate.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1313
<PackageReference Include="NHibernate" Version="5.3.13" />
1414
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.0.0" GeneratePathProperty="true" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
17-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
18-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
15+
<PackageReference Include="NUnit" Version="3.14.0" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
18+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/NServiceBus.NHibernate.PersistenceTests/NServiceBus.NHibernate.PersistenceTests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\Test.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -11,14 +11,14 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1515
<PackageReference Include="NHibernate" Version="5.3.13" />
1616
<PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="8.0.0" GeneratePathProperty="true" />
17-
<PackageReference Include="NUnit" Version="3.13.3" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
19-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
20-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
21-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
17+
<PackageReference Include="NUnit" Version="3.14.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
20+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
21+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/NServiceBus.NHibernate.Tests/.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ dotnet_diagnostic.NSB0014.severity = none
2525
dotnet_diagnostic.NSB0015.severity = none
2626
dotnet_diagnostic.NSB0016.severity = none
2727
dotnet_diagnostic.NSB0017.severity = none
28+
29+
# IDE0028: Simplify collection initialization
30+
dotnet_diagnostic.IDE0028.severity = suggestion

‎src/NServiceBus.NHibernate.Tests/NServiceBus.NHibernate.Tests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
@@ -11,16 +11,16 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1616
<PackageReference Include="NHibernate" Version="5.3.13" />
1717
<PackageReference Include="NServiceBus" Version="8.0.0" />
18-
<PackageReference Include="NUnit" Version="3.13.3" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
18+
<PackageReference Include="NUnit" Version="3.14.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2020
<PackageReference Include="Particular.Approvals" Version="0.3.0" />
2121
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
22-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
23-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
22+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
23+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
<LangVersion>10.0</LangVersion>
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
15-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
13+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
15+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
1717
<PackageReference Include="Nunit" Version="3.13.3" />
1818
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.6" />
1919
<PackageReference Include="NServiceBus.TransactionalSession" Version="2.0.2" />

‎src/NServiceBus.NHibernate.TransactionalSession.Tests/NServiceBus.NHibernate.TransactionalSession.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net481;net6.0;net7.0;net8.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
77
<LangVersion>10.0</LangVersion>
@@ -10,9 +10,9 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
13+
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
1616
<PackageReference Include="Nunit" Version="3.13.3" />
1717
<PackageReference Include="NServiceBus.TransactionalSession" Version="2.0.2" />
1818
</ItemGroup>

0 commit comments

Comments
 (0)