From 6cd6037d22fb66faba0c59430e2c707e967ee6ee Mon Sep 17 00:00:00 2001
From: "internalautomation[bot]"
<85681268+internalautomation[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:49:26 -0600
Subject: [PATCH 1/2] Updates for .NET 8
---
.github/workflows/ci.yml | 13 ++++++++-----
.github/workflows/release.yml | 10 +++++-----
...ServiceBus.Transport.Msmq.AcceptanceTests.csproj | 8 ++++----
.../NServiceBus.Transport.Msmq.Tests.csproj | 8 ++++----
...NServiceBus.Transport.Msmq.TransportTests.csproj | 8 ++++----
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 966bac6a..b426c3d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,17 +14,20 @@ jobs:
runs-on: windows-2019
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: 5.0.x
+ dotnet-version: |
+ 8.0.x
+ 7.0.x
+ 6.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Upload packages
- uses: actions/upload-artifact@v3.1.1
+ uses: actions/upload-artifact@v4.3.1
with:
name: NuGet packages
path: nugets/
@@ -35,4 +38,4 @@ jobs:
connection-string-env-var: SQLServerConnectionString
catalog: nservicebus
- 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 3a70893e..deafc87d 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.0.2
+ 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: 5.0.x
+ dotnet-version: 8.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Sign NuGet packages
@@ -28,12 +28,12 @@ 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
+ uses: Particular/push-octopus-package-action@v2.0.0
with:
octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
diff --git a/src/NServiceBus.Transport.Msmq.AcceptanceTests/NServiceBus.Transport.Msmq.AcceptanceTests.csproj b/src/NServiceBus.Transport.Msmq.AcceptanceTests/NServiceBus.Transport.Msmq.AcceptanceTests.csproj
index 03c92699..ce378058 100644
--- a/src/NServiceBus.Transport.Msmq.AcceptanceTests/NServiceBus.Transport.Msmq.AcceptanceTests.csproj
+++ b/src/NServiceBus.Transport.Msmq.AcceptanceTests/NServiceBus.Transport.Msmq.AcceptanceTests.csproj
@@ -14,11 +14,11 @@
-
-
+
+
-
-
+
+
diff --git a/src/NServiceBus.Transport.Msmq.Tests/NServiceBus.Transport.Msmq.Tests.csproj b/src/NServiceBus.Transport.Msmq.Tests/NServiceBus.Transport.Msmq.Tests.csproj
index c841765a..c30b2246 100644
--- a/src/NServiceBus.Transport.Msmq.Tests/NServiceBus.Transport.Msmq.Tests.csproj
+++ b/src/NServiceBus.Transport.Msmq.Tests/NServiceBus.Transport.Msmq.Tests.csproj
@@ -15,12 +15,12 @@
-
-
+
+
-
-
+
+
diff --git a/src/NServiceBus.Transport.Msmq.TransportTests/NServiceBus.Transport.Msmq.TransportTests.csproj b/src/NServiceBus.Transport.Msmq.TransportTests/NServiceBus.Transport.Msmq.TransportTests.csproj
index 0d2af0b3..4d2f4570 100644
--- a/src/NServiceBus.Transport.Msmq.TransportTests/NServiceBus.Transport.Msmq.TransportTests.csproj
+++ b/src/NServiceBus.Transport.Msmq.TransportTests/NServiceBus.Transport.Msmq.TransportTests.csproj
@@ -13,11 +13,11 @@
-
-
+
+
-
-
+
+
From 1be8266fadaee714ec06d32d9f00bb2fedbb8b6d Mon Sep 17 00:00:00 2001
From: David Boike
Date: Wed, 6 Mar 2024 15:22:46 -0600
Subject: [PATCH 2/2] Only need 1 dotnet-version for net461-only tests
---
.github/workflows/ci.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b426c3d7..c73be849 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4.0.0
with:
- dotnet-version: |
- 8.0.x
- 7.0.x
- 6.0.x
+ dotnet-version: 8.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Upload packages