From 43b74748ec46f86cd7ad1e7c9a9cfa24ca5b1171 Mon Sep 17 00:00:00 2001 From: Particular Bot Date: Tue, 12 Mar 2024 17:39:12 -0500 Subject: [PATCH] DavidBoike Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 13 ++++++++----- .github/workflows/release.yml | 14 +++++++++----- ....Extensions.Logging.NLog.AcceptanceTests.csproj | 10 +++++----- .../NServiceBus.Extensions.Logging.Tests.csproj | 12 ++++++------ 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01a9674..7b0361f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,9 @@ on: workflow_dispatch: env: DOTNET_NOLOGO: true +defaults: + run: + shell: pwsh jobs: build: name: ${{ matrix.name }} @@ -22,24 +25,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 - 3.1.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 \ No newline at end of file + uses: Particular/run-tests-action@v1.7.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c1afa5..6e73cea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,18 +6,21 @@ on: - '[0-9]+.[0-9]+.[0-9]+-*' env: DOTNET_NOLOGO: true +defaults: + run: + shell: pwsh jobs: release: 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 +31,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.Extensions.Logging.NLog.AcceptanceTests/NServiceBus.Extensions.Logging.NLog.AcceptanceTests.csproj b/src/NServiceBus.Extensions.Logging.NLog.AcceptanceTests/NServiceBus.Extensions.Logging.NLog.AcceptanceTests.csproj index 7f524f8..aa7ce81 100644 --- a/src/NServiceBus.Extensions.Logging.NLog.AcceptanceTests/NServiceBus.Extensions.Logging.NLog.AcceptanceTests.csproj +++ b/src/NServiceBus.Extensions.Logging.NLog.AcceptanceTests/NServiceBus.Extensions.Logging.NLog.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net481;net6.0;net7.0;net8.0 true @@ -10,15 +10,15 @@ - + - - - + + + diff --git a/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj b/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj index 73336bc..8653ffc 100644 --- a/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj +++ b/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBus.snk true @@ -12,17 +12,17 @@ - + - + - - - + + +