From f2767551e3756eed5737ff52efba78cfcaed7570 Mon Sep 17 00:00:00 2001 From: David Boike Date: Thu, 1 Feb 2024 15:10:01 -0600 Subject: [PATCH] Version 6.3.4 uses vulnerable versions of SQL Client dependency (#1282) * Update dependencies for SqlClient CVEs * CI updates * Upgrade to minimum supported Microsoft.Data.SqlClient version to address DTC test failure --------- Co-authored-by: Ramon Smits --- .github/workflows/ci.yml | 11 +++++------ .github/workflows/release.yml | 10 +++++----- .../NServiceBus.SqlServer.AcceptanceTests.csproj | 4 ++-- .../NServiceBus.SqlServer.IntegrationTests.csproj | 4 ++-- .../NServiceBus.SqlServer.TransportTests.csproj | 4 ++-- .../NServiceBus.SqlServer.UnitTests.csproj | 4 ++-- .../NServiceBus.SqlServer.csproj | 2 +- ...viceBus.Transport.SqlServer.AcceptanceTests.csproj | 4 ++-- ...iceBus.Transport.SqlServer.IntegrationTests.csproj | 4 ++-- ...rviceBus.Transport.SqlServer.TransportTests.csproj | 4 ++-- .../NServiceBus.Transport.SqlServer.UnitTests.csproj | 4 ++-- .../NServiceBus.Transport.SqlServer.csproj | 2 +- 12 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc7b4c156..ec4c63300 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,21 +22,20 @@ 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: | 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.0 with: name: NuGet packages path: nugets/ @@ -47,12 +46,12 @@ jobs: connection-string-env-var: SqlServerTransportConnectionString catalog: nservicebus - name: Prepare SQL Server - shell: pwsh + shell: pwsh run: | echo "Create extra databases" sqlcmd -Q "CREATE DATABASE nservicebus1" sqlcmd -Q "CREATE DATABASE nservicebus2" - + echo "Create additional schemas" sqlcmd -Q "CREATE SCHEMA receiver AUTHORIZATION db_owner" -d "nservicebus" sqlcmd -Q "CREATE SCHEMA sender AUTHORIZATION db_owner" -d "nservicebus" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b19c1ee04..b6b6f01e8 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.2.0 + uses: actions/checkout@v4.1.1 with: - fetch-depth: 0 + 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: 7.0.x - name: Build run: dotnet build src --configuration Release - name: Sign NuGet packages @@ -28,7 +28,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@v3.1.1 + uses: actions/upload-artifact@v4.3.0 with: name: nugets path: nugets/* diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj b/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj index 71a5987e6..fea1cb86a 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj +++ b/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true $(DefineConstants);SYSTEMDATASQLCLIENT $(NoWarn);SYSLIB0021 @@ -12,7 +12,7 @@ - + diff --git a/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj b/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj index f9d9ef65c..1320975f3 100644 --- a/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj +++ b/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -13,7 +13,7 @@ - + diff --git a/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj b/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj index 7314aca93..3903eb0f6 100644 --- a/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj +++ b/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -13,7 +13,7 @@ - + diff --git a/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj b/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj index c3e67a6dc..5e98dd281 100644 --- a/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj +++ b/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -12,7 +12,7 @@ - + diff --git a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj index bc2516ee7..6600bdb6a 100644 --- a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj +++ b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj index a71e6315d..bada658ef 100644 --- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj +++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NServiceBus.Transport.SqlServer.AcceptanceTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true $(NoWarn);SYSLIB0021 @@ -11,7 +11,7 @@ - + diff --git a/src/NServiceBus.Transport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj b/src/NServiceBus.Transport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj index f58982973..ac0446adf 100644 --- a/src/NServiceBus.Transport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj +++ b/src/NServiceBus.Transport.SqlServer.IntegrationTests/NServiceBus.Transport.SqlServer.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -12,7 +12,7 @@ - + diff --git a/src/NServiceBus.Transport.SqlServer.TransportTests/NServiceBus.Transport.SqlServer.TransportTests.csproj b/src/NServiceBus.Transport.SqlServer.TransportTests/NServiceBus.Transport.SqlServer.TransportTests.csproj index 1dcb7c9c5..bafc6016c 100644 --- a/src/NServiceBus.Transport.SqlServer.TransportTests/NServiceBus.Transport.SqlServer.TransportTests.csproj +++ b/src/NServiceBus.Transport.SqlServer.TransportTests/NServiceBus.Transport.SqlServer.TransportTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -13,7 +13,7 @@ - + diff --git a/src/NServiceBus.Transport.SqlServer.UnitTests/NServiceBus.Transport.SqlServer.UnitTests.csproj b/src/NServiceBus.Transport.SqlServer.UnitTests/NServiceBus.Transport.SqlServer.UnitTests.csproj index 8a7a8172c..687dc5bdf 100644 --- a/src/NServiceBus.Transport.SqlServer.UnitTests/NServiceBus.Transport.SqlServer.UnitTests.csproj +++ b/src/NServiceBus.Transport.SqlServer.UnitTests/NServiceBus.Transport.SqlServer.UnitTests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net6.0;net7.0 + net461;net6.0;net7.0 true ..\NServiceBusTests.snk true @@ -12,7 +12,7 @@ - + diff --git a/src/NServiceBus.Transport.SqlServer/NServiceBus.Transport.SqlServer.csproj b/src/NServiceBus.Transport.SqlServer/NServiceBus.Transport.SqlServer.csproj index a8a172a5a..2cdaab6c9 100644 --- a/src/NServiceBus.Transport.SqlServer/NServiceBus.Transport.SqlServer.csproj +++ b/src/NServiceBus.Transport.SqlServer/NServiceBus.Transport.SqlServer.csproj @@ -16,7 +16,7 @@ - +