From 68235c57b3c04df6efa681b2df33d44587a8da93 Mon Sep 17 00:00:00 2001 From: Particular Bot Date: Mon, 9 Dec 2024 08:44:25 -0800 Subject: [PATCH] Update for .NET 9 - release-4.0 (#1108) * Updates for .NET 9 * Rollback NUnit 4.2.2 to 3.14.0 --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Nix Bohon --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/release.yml | 8 ++++---- global.json | 2 +- ....Transport.AzureServiceBus.AcceptanceTests.csproj | 4 ++-- ...ransport.AzureServiceBus.CommandLine.Tests.csproj | 4 ++-- ...ServiceBus.Transport.AzureServiceBus.Tests.csproj | 4 ++-- ...s.Transport.AzureServiceBus.TransportTests.csproj | 4 ++-- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e2bc83d..6ede1d8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,24 +29,26 @@ jobs: SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }} run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 }) - name: Checkout - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.1.0 with: - dotnet-version: 8.0.x + dotnet-version: | + 9.0.x + 8.0.x - name: Build run: dotnet build src --configuration Release - name: Upload packages if: runner.os == 'Windows' - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.4.3 with: name: NuGet packages path: nugets/ retention-days: 7 - name: Azure login - uses: azure/login@v2.0.0 + uses: azure/login@v2.2.0 with: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }} - name: Setup Azure Service Bus diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1350d7a..f708c4fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,13 +14,13 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.1.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages @@ -31,7 +31,7 @@ jobs: client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }} - name: Publish artifacts - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.4.3 with: name: nugets path: nugets/* diff --git a/global.json b/global.json index 2134ed94..d5bf446d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "9.0.100", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/AcceptanceTests/NServiceBus.Transport.AzureServiceBus.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.Transport.AzureServiceBus.AcceptanceTests.csproj index d8bf4ec4..5a1618a6 100644 --- a/src/AcceptanceTests/NServiceBus.Transport.AzureServiceBus.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.Transport.AzureServiceBus.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0 true ..\NServiceBusTests.snk @@ -17,7 +17,7 @@ - + diff --git a/src/CommandLineTests/NServiceBus.Transport.AzureServiceBus.CommandLine.Tests.csproj b/src/CommandLineTests/NServiceBus.Transport.AzureServiceBus.CommandLine.Tests.csproj index 3eabb009..6a183b21 100644 --- a/src/CommandLineTests/NServiceBus.Transport.AzureServiceBus.CommandLine.Tests.csproj +++ b/src/CommandLineTests/NServiceBus.Transport.AzureServiceBus.CommandLine.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Tests/NServiceBus.Transport.AzureServiceBus.Tests.csproj b/src/Tests/NServiceBus.Transport.AzureServiceBus.Tests.csproj index b5dcf015..033c1494 100644 --- a/src/Tests/NServiceBus.Transport.AzureServiceBus.Tests.csproj +++ b/src/Tests/NServiceBus.Transport.AzureServiceBus.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;net9.0 true ..\NServiceBusTests.snk @@ -18,7 +18,7 @@ - + diff --git a/src/TransportTests/NServiceBus.Transport.AzureServiceBus.TransportTests.csproj b/src/TransportTests/NServiceBus.Transport.AzureServiceBus.TransportTests.csproj index 5aa2aee1..5eca68d7 100644 --- a/src/TransportTests/NServiceBus.Transport.AzureServiceBus.TransportTests.csproj +++ b/src/TransportTests/NServiceBus.Transport.AzureServiceBus.TransportTests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0 @@ -14,7 +14,7 @@ - +