From 4a59f7ee88a2e779210f623f207c2a7434982f83 Mon Sep 17 00:00:00 2001 From: "internalautomation[bot]" <85681268+internalautomation[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:52:15 -0500 Subject: [PATCH 1/2] Updates for .NET 8 --- .github/workflows/ci.yml | 6 ++++-- .github/workflows/release.yml | 6 +++++- ...ersistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj | 2 +- ...ce.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj | 2 +- ...NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj | 2 +- ...sistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj | 2 +- ...rsistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj | 2 +- .../NServiceBus.Persistence.CosmosDB.Tests.csproj | 2 +- ...nce.CosmosDB.TransactionalSession.AcceptanceTests.csproj | 2 +- ...s.Persistence.CosmosDB.TransactionalSession.Tests.csproj | 2 +- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c63b153..8d8c640a 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 }} @@ -24,7 +27,6 @@ jobs: - name: Check for secrets env: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} - shell: pwsh run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - name: Checkout uses: actions/checkout@v4.1.1 @@ -47,7 +49,7 @@ jobs: path: nugets/ retention-days: 7 - name: Azure login - uses: azure/login@v2 + uses: azure/login@v2.0.0 with: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }} - name: Setup Cosmos DB diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97d27165..4679031f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,9 @@ on: - '[0-9]+.[0-9]+.[0-9]+-*' env: DOTNET_NOLOGO: true +defaults: + run: + shell: pwsh jobs: release: runs-on: ubuntu-20.04 @@ -34,6 +37,7 @@ jobs: path: nugets/* retention-days: 1 - name: Deploy - uses: Particular/push-octopus-package-action@v2.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.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj index c23bc00a..18577b75 100644 --- a/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj index 7f1a0251..df4bd1e5 100644 --- a/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj index db6b37bd..09f8812c 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj index 537df0e7..3e42224c 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj index c23bc00a..18577b75 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Persistence.CosmosDB.Tests/NServiceBus.Persistence.CosmosDB.Tests.csproj b/src/NServiceBus.Persistence.CosmosDB.Tests/NServiceBus.Persistence.CosmosDB.Tests.csproj index 7282c582..d4523d21 100644 --- a/src/NServiceBus.Persistence.CosmosDB.Tests/NServiceBus.Persistence.CosmosDB.Tests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.Tests/NServiceBus.Persistence.CosmosDB.Tests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk 10.0 diff --git a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj index f4e26137..e2451e27 100644 --- a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk 10.0 diff --git a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests.csproj b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests.csproj index 851588da..d32f0e69 100644 --- a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests/NServiceBus.Persistence.CosmosDB.TransactionalSession.Tests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net7.0;net8.0 + net481;net6.0;net7.0;net8.0 true ..\NServiceBusTests.snk 10.0 From 212ac94ebb614485aa9c22e1f360d6caedcf03e4 Mon Sep 17 00:00:00 2001 From: David Boike Date: Tue, 12 Mar 2024 09:25:59 -0500 Subject: [PATCH 2/2] Project file fixups --- ....Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj | 4 ++-- ...ence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj | 4 ++-- .../NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj | 4 ++-- ...ersistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj | 4 ++-- ...Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj | 4 ++-- ...tence.CosmosDB.TransactionalSession.AcceptanceTests.csproj | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj index 18577b75..c71ed301 100644 --- a/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.LogicalOutbox.AcceptanceTests.csproj @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj index df4bd1e5..cbf16471 100644 --- a/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests/NServiceBus.Persistence.CosmosDB.NonTransactionalSagas.AcceptanceTests.csproj @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj index 09f8812c..7ed062d8 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PersistenceTests/NServiceBus.Persistence.CosmosDB.PersistenceTests.csproj @@ -15,12 +15,12 @@ - + - + diff --git a/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj index 3e42224c..410e0111 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PessimisticLock.AcceptanceTests.csproj @@ -20,7 +20,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj index 18577b75..c71ed301 100644 --- a/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests/NServiceBus.Persistence.CosmosDB.PhysicalOutbox.AcceptanceTests.csproj @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj index e2451e27..857bf18d 100644 --- a/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj +++ b/src/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests/NServiceBus.Persistence.CosmosDB.TransactionalSession.AcceptanceTests.csproj @@ -23,7 +23,7 @@ - +