From 2b8175f6eebb41885ae87b49b535d7435db92f2d Mon Sep 17 00:00:00 2001 From: Particular Bot Date: Fri, 8 Mar 2024 16:31:53 -0600 Subject: [PATCH] Updates for .NET 8 - release-4.0 (#451) * Updates for .NET 8 * fixups --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: David Boike --- .github/workflows/ci.yml | 9 +++++---- .github/workflows/release.yml | 11 ++++++----- .../.editorconfig | 3 +++ .../NServiceBus.Heartbeat.AcceptanceTests.csproj | 10 +++++----- .../NServiceBus.Heartbeat.Tests.csproj | 10 +++++----- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec731fe..8332673 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,23 +22,24 @@ jobs: fail-fast: false steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v3.0.3 + uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: | + 8.0.x 7.0.x 6.0.x - name: Build run: dotnet build src --configuration Release - name: Upload packages if: matrix.name == 'Windows' - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4.3.1 with: name: NuGet packages path: nugets/ retention-days: 7 - name: Run tests - uses: Particular/run-tests-action@v1.4.0 + uses: Particular/run-tests-action@v1.7.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c1afa5..b0cf00b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,13 +11,13 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v3.0.3 + uses: actions/setup-dotnet@v4.0.0 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages @@ -28,12 +28,13 @@ jobs: client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }} - name: Publish artifacts - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4.3.1 with: name: nugets path: nugets/* retention-days: 1 - name: Deploy - uses: Particular/push-octopus-package-action@v1.0.0 + # Does not follow standard practice of targeting explicit versions because configuration is tightly coupled to Octopus Deploy configuration + uses: Particular/push-octopus-package-action@main with: octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }} diff --git a/src/NServiceBus.Heartbeat.AcceptanceTests/.editorconfig b/src/NServiceBus.Heartbeat.AcceptanceTests/.editorconfig index f444d1a..1de7580 100644 --- a/src/NServiceBus.Heartbeat.AcceptanceTests/.editorconfig +++ b/src/NServiceBus.Heartbeat.AcceptanceTests/.editorconfig @@ -11,3 +11,6 @@ dotnet_diagnostic.NSB0002.severity = suggestion # CancellationToken API not needed in tests dotnet_diagnostic.PS0013.severity = suggestion + +# IDE0028: Simplify collection initialization +dotnet_diagnostic.IDE0028.severity = suggestion diff --git a/src/NServiceBus.Heartbeat.AcceptanceTests/NServiceBus.Heartbeat.AcceptanceTests.csproj b/src/NServiceBus.Heartbeat.AcceptanceTests/NServiceBus.Heartbeat.AcceptanceTests.csproj index 066385b..dd7fcdd 100644 --- a/src/NServiceBus.Heartbeat.AcceptanceTests/NServiceBus.Heartbeat.AcceptanceTests.csproj +++ b/src/NServiceBus.Heartbeat.AcceptanceTests/NServiceBus.Heartbeat.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 @@ -14,10 +14,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/NServiceBus.Heartbeat.Tests/NServiceBus.Heartbeat.Tests.csproj b/src/NServiceBus.Heartbeat.Tests/NServiceBus.Heartbeat.Tests.csproj index c32131d..c4f5d0b 100644 --- a/src/NServiceBus.Heartbeat.Tests/NServiceBus.Heartbeat.Tests.csproj +++ b/src/NServiceBus.Heartbeat.Tests/NServiceBus.Heartbeat.Tests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0 + net472;net6.0;net7.0;net8.0 true $(SolutionDir)NServiceBus.snk @@ -11,14 +11,14 @@ - + - - - + + +