From 8203dbacf041e69a342c78d3bccca1b83fbf08ac Mon Sep 17 00:00:00 2001 From: kentdr Date: Tue, 29 Aug 2023 11:25:57 -0400 Subject: [PATCH 1/5] Bump major version --- src/Custom.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Custom.Build.props b/src/Custom.Build.props index 528e351..379e0d5 100644 --- a/src/Custom.Build.props +++ b/src/Custom.Build.props @@ -1,7 +1,7 @@ - 2.1 + 3.0 minor From 0405d3b29ded726345b5bfa863e3b2070c64c1d0 Mon Sep 17 00:00:00 2001 From: kentdr Date: Tue, 29 Aug 2023 11:29:40 -0400 Subject: [PATCH 2/5] Update TFMs to net8.0 --- ...erviceBus.Extensions.Logging.NLog.AcceptanceTests.csproj | 6 +++--- .../NServiceBus.Extensions.Logging.Tests.csproj | 6 +++--- .../NServiceBus.Extensions.Logging.csproj | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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 0ccde2c..b4a584c 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 @@ - net472;net6.0;net7.0 + net8.0 @@ -9,14 +9,14 @@ - + - + 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 532824c..f9f62e2 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 @@ - net472;net6.0;net7.0 + net8.0 @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj b/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj index c58c5a3..1a8c288 100644 --- a/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj +++ b/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj @@ -1,14 +1,14 @@ - net472;net6.0 + net8.0 true ..\NServiceBus.snk Allows Microsoft.Extensions.Logging to be used with NServiceBus - + From e7f60b6b2c8872e9ee4ed62ba993c4d04dfe617e Mon Sep 17 00:00:00 2001 From: kentdr Date: Tue, 29 Aug 2023 11:30:31 -0400 Subject: [PATCH 3/5] Update to NServiceBus 9 --- .../NServiceBus.Extensions.Logging.NLog.AcceptanceTests.csproj | 2 +- .../NServiceBus.Extensions.Logging.Tests.csproj | 2 +- .../NServiceBus.Extensions.Logging.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 b4a584c..0628e38 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 @@ -11,7 +11,7 @@ - + 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 f9f62e2..b43cab8 100644 --- a/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj +++ b/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj b/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj index 1a8c288..73aad96 100644 --- a/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj +++ b/src/NServiceBus.Extensions.Logging/NServiceBus.Extensions.Logging.csproj @@ -9,7 +9,7 @@ - + From 61d35f3a7553b35c2e5251315cb64eab51774789 Mon Sep 17 00:00:00 2001 From: kentdr Date: Tue, 29 Aug 2023 11:33:59 -0400 Subject: [PATCH 4/5] Bump dependencies --- ...erviceBus.Extensions.Logging.NLog.AcceptanceTests.csproj | 6 +++--- .../NServiceBus.Extensions.Logging.Tests.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 0628e38..9823df6 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,4 +1,4 @@ - + net8.0 @@ -10,12 +10,12 @@ - + - + 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 b43cab8..04ee6b7 100644 --- a/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj +++ b/src/NServiceBus.Extensions.Logging.Tests/NServiceBus.Extensions.Logging.Tests.csproj @@ -16,7 +16,7 @@ - + From 51ccb9dc23d3482473331122fd20a26a05176ddd Mon Sep 17 00:00:00 2001 From: kentdr Date: Tue, 29 Aug 2023 11:36:44 -0400 Subject: [PATCH 5/5] Update workflows --- .github/workflows/ci.yml | 9 ++++----- .github/workflows/release.yml | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3073c97..58f181f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: strategy: matrix: include: - - os: windows-2019 + - os: windows-2022 name: Windows - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: Linux fail-fast: false steps: @@ -28,9 +28,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: | - 7.0.x - 6.0.x + dotnet-version: 8.0.x + dotnet-quality: 'preview' - name: Build run: dotnet build src --configuration Release - name: Upload packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adcae8e..19816c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ env: DOTNET_NOLOGO: true jobs: release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3.6.0 @@ -17,7 +17,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x + dotnet-quality: 'preview' - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages