From 27f1d96534736a579281fbf83b037e2dd3058d78 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 14 Dec 2024 17:24:02 +0100 Subject: [PATCH] Support all documented aliases fix build fixes #2722 --- .github/workflows/vsix.yml | 4 ++-- .../Shared/Helpers/SqlConnectionStringBuilderHelper.cs | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml index 07be27207..010ecde78 100644 --- a/.github/workflows/vsix.yml +++ b/.github/workflows/vsix.yml @@ -58,7 +58,7 @@ jobs: mkdir vsix 7z x src/GUI/lib/efreveng80.exe.zip -oefreveng80 -y dir /a:-d /s /b "efreveng80" | find /c ":\" > filecount.txt - findstr "164" filecount.txt + findstr "165" filecount.txt - name: Extract and verify efreveng90.exe.zip file count if: github.event_name != 'pull_request' @@ -67,7 +67,7 @@ jobs: mkdir vsix 7z x src/GUI/lib/efreveng90.exe.zip -oefreveng90 -y dir /a:-d /s /b "efreveng90" | find /c ":\" > filecount.txt - findstr "147" filecount.txt + findstr "148" filecount.txt - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 diff --git a/src/GUI/Shared/Helpers/SqlConnectionStringBuilderHelper.cs b/src/GUI/Shared/Helpers/SqlConnectionStringBuilderHelper.cs index 941981b73..915f9c0c4 100644 --- a/src/GUI/Shared/Helpers/SqlConnectionStringBuilderHelper.cs +++ b/src/GUI/Shared/Helpers/SqlConnectionStringBuilderHelper.cs @@ -12,8 +12,16 @@ public SqlConnectionStringBuilder GetBuilder(string connectionString) private string ReplaceMdsKeywords(string connectionString) { + // https://github.com/dotnet/SqlClient/blob/main/release-notes/2.0/2.0.0.md#new-connection-string-property-synonyms + connectionString = connectionString.Replace("Application Intent=", "ApplicationIntent="); + connectionString = connectionString.Replace("Connect Retry Count=", "ConnectRetryCount="); + connectionString = connectionString.Replace("Connect Retry Interval=", "ConnectRetryInterval="); + connectionString = connectionString.Replace("Pool Blocking Period=", "PoolBlockingPeriod="); connectionString = connectionString.Replace("Multiple Active Result Sets=", "MultipleActiveResultSets="); + connectionString = connectionString.Replace("Multi Subnet Failover=", "MultiSubnetFailover="); + connectionString = connectionString.Replace("Transparent Network IP Resolution=", "TransparentNetworkIPResolution="); connectionString = connectionString.Replace("Trust Server Certificate=", "TrustServerCertificate="); + return connectionString; } }