Support for SSMS 20

ErikEJ · Apr 9, 2024 · 9a35da4 · 9a35da4
1 parent f28dbf2
commit 9a35da4
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ You can also automatically get the [latest build of the Master branch directly i
 
 If you need the Visual Studio 2010 extension, please contact me, and I can provide a link! 
 
-## SQL Server Management Studio (SSMS) 17/18 Extension
+## SQL Server Management Studio (SSMS) 20 and 17 Extension
 
 You find the extension under the View menu in SSMS.
 
@@ -50,29 +50,29 @@ Download the latest version of the SSMS 17 extension (for both 3.5, 4.0, SQLite
 
 **Daily build**
 
-You can download the daily build of the SSMS 18 extension from [VSIX Gallery](http://vsixgallery.com/extensions/d6c77c32-fe4b-4f6d-ad5d-f7b755212760/extension.vsix)
+You can download the daily build of the SSMS 20 extension from [VSIX Gallery](https://www.vsixgallery.com/extension/d6c77c32-fe4b-4f6d-ad5d-f7b755212760)
 
-### **Installing the SSMS 17 extension**
-
-Use the following command line:
-
-`"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\vsixinstaller.exe" "full path to extension.vsix"`
-
-### **Installing the SSMS 18 extension**
+### **Installing the SSMS 20 extension**
 
-As the VSIX 2017 installer does not support installation into a VS Shell edition, and generally because SSMS extensions are unsupported, you will have to manually install the extension (at least until I or someone else decides to create an installer)
+Sine SSMS extensions are unsupported, you will have to manually install this extension version (at least until I or someone else decides to create an installer)
 
 From an administrator command prompt:
 
-Create a folder called "SqlCeToolbox" under `C:\Program Files (x86)\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\`
+Create a folder called "SqlCeToolbox" under `C:\Program Files (x86)\Microsoft SQL Server Management Studio 20\Common7\IDE\Extensions\`
 
 Copy the extension.vsix that you downloaded from VSIX Gallery to the new folder.
 
 Unzip the extension.vsix to the new folder. For example: `"C:\program files\7-zip\7z.exe" e extension.vsix -y`
 
 You should now have 48 files in the SqlCeToolbox folder, and the extension is "installed".
 
-## EF Core Power Tools for Visual Studio 2017 and later
+### **Installing the SSMS 17 extension**
+
+Use the following command line:
+
+`"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\vsixinstaller.exe" "full path to extension.vsix"`
+
+## EF Core Power Tools for Visual Studio 2022
 
 The EF Core Power Tools have moved to [this repository](https://github.com/ErikEJ/EFCorePowerTools)
 

diff --git a/src/GUI/SSMSToolbox/SSMSToolbox.csproj b/src/GUI/SSMSToolbox/SSMSToolbox.csproj
@@ -8,7 +8,7 @@
     </NuGetPackageImportStamp>
     <UseCodebase>true</UseCodebase>
     <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files %28x86%29\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\ssms.exe</StartProgram>
+    <StartProgram>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 20\Common7\IDE\ssms.exe</StartProgram>
     <ReferencePath>$(ReferencePath)</ReferencePath>
   </PropertyGroup>
   <PropertyGroup>
@@ -30,7 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
-    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SqlCeToolbox</CopyVsixExtensionLocation>
+    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 20\Common7\IDE\Extensions\SqlCeToolbox</CopyVsixExtensionLocation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -416,23 +416,23 @@
       <HintPath>..\lib\Microsoft.ReportViewer.WinForms.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.SqlServer.ConnectionInfo, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.SqlServer.ConnectionInfo, Version=17.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\v150\Microsoft.SqlServer.ConnectionInfo.dll</HintPath>
+      <HintPath>..\lib\v170\Microsoft.SqlServer.ConnectionInfo.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.SqlServer.Management.Sdk.Sfc, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.SqlServer.Management.Sdk.Sfc, Version=17.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\v150\Microsoft.SqlServer.Management.Sdk.Sfc.dll</HintPath>
+      <HintPath>..\lib\v170\Microsoft.SqlServer.Management.Sdk.Sfc.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.SqlServer.Smo, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.SqlServer.Smo, Version=17.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\v150\Microsoft.SqlServer.Smo.dll</HintPath>
+      <HintPath>..\lib\v170\Microsoft.SqlServer.Smo.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.SqlServer.SqlTools.VSIntegration, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\lib\v150\Microsoft.SqlServer.SqlTools.VSIntegration.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.SqlTools.VSIntegration, Version=20.200.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\lib\v170\Microsoft.SqlServer.SqlTools.VSIntegration.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Data.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -466,16 +466,16 @@
     <Reference Include="SqlCeToolBoxSyncFxLib">
       <HintPath>..\lib\SqlCeToolBoxSyncFxLib.dll</HintPath>
     </Reference>
-    <Reference Include="SQLEditors, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="SQLEditors, Version=20.200.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\v150\SQLEditors.dll</HintPath>
+      <HintPath>..\lib\v170\SQLEditors.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SQLiteScripting">
       <HintPath>..\lib\SQLiteScripting.dll</HintPath>
     </Reference>
-    <Reference Include="SqlWorkbench.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\lib\v150\SqlWorkbench.Interfaces.dll</HintPath>
+    <Reference Include="SqlWorkbench.Interfaces, Version=20.200.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\lib\v170\SqlWorkbench.Interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml.cs b/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml.cs
@@ -497,7 +497,7 @@ public void SaveScript(bool promptForName)
             }
         }
 
-        private async void ExecuteSqlScriptInEditor()
+        private void ExecuteSqlScriptInEditor()
         {
             try
             {
@@ -516,9 +516,10 @@ private async void ExecuteSqlScriptInEditor()
                     var sw = new Stopwatch();
                     sw.Start();
 
-                    var dataset = await Task.Run(()
-                        // ReSharper disable once AccessToDisposedClosure
-                        => repository.ExecuteSql(sql, out schemaChanged, _ignoreDdlErrors));
+                    var dataset = repository.ExecuteSql(sql, out schemaChanged, _ignoreDdlErrors);
+                        //await Task.Run(()
+                        //// ReSharper disable once AccessToDisposedClosure
+                        //=> repository.ExecuteSql(sql, out schemaChanged, _ignoreDdlErrors));
                     sw.Stop();
                     FormatTime(sw);
                     if (dataset == null) return;

diff --git a/src/GUI/lib/v150/Microsoft.SqlServer.ConnectionInfo.dll b/src/GUI/lib/v150/Microsoft.SqlServer.ConnectionInfo.dll
diff --git a/src/GUI/lib/v150/Microsoft.SqlServer.Management.Sdk.Sfc.dll b/src/GUI/lib/v150/Microsoft.SqlServer.Management.Sdk.Sfc.dll
diff --git a/src/GUI/lib/v150/Microsoft.SqlServer.Smo.dll b/src/GUI/lib/v150/Microsoft.SqlServer.Smo.dll
diff --git a/src/GUI/lib/v150/Microsoft.SqlServer.SqlTools.VSIntegration.dll b/src/GUI/lib/v150/Microsoft.SqlServer.SqlTools.VSIntegration.dll
diff --git a/src/GUI/lib/v150/SqlWorkbench.Interfaces.dll b/src/GUI/lib/v150/SqlWorkbench.Interfaces.dll
diff --git a/src/GUI/lib/v170/Microsoft.SqlServer.ConnectionInfo.dll b/src/GUI/lib/v170/Microsoft.SqlServer.ConnectionInfo.dll
diff --git a/src/GUI/lib/v170/Microsoft.SqlServer.Management.Sdk.Sfc.dll b/src/GUI/lib/v170/Microsoft.SqlServer.Management.Sdk.Sfc.dll
diff --git a/src/GUI/lib/v170/Microsoft.SqlServer.Smo.dll b/src/GUI/lib/v170/Microsoft.SqlServer.Smo.dll
diff --git a/src/GUI/lib/v170/Microsoft.SqlServer.SqlTools.VSIntegration.dll b/src/GUI/lib/v170/Microsoft.SqlServer.SqlTools.VSIntegration.dll
diff --git a/src/GUI/lib/v150/SQLEditors.dll → src/GUI/lib/v170/SQLEditors.dll b/src/GUI/lib/v150/SQLEditors.dll → src/GUI/lib/v170/SQLEditors.dll
diff --git a/src/GUI/lib/v170/SqlWorkbench.Interfaces.dll b/src/GUI/lib/v170/SqlWorkbench.Interfaces.dll