Merge pull request #93 from BIDeveloperExtensions/bidshelper-vsix

2.3.5 release
BIDeveloperExtensions · Mar 23, 2020 · c2d0452 · c2d0452
2 parents c1ab11d + 4ce1309
commit c2d0452
Show file tree

Hide file tree

Showing 72 changed files with 988 additions and 7,312 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ build/
 [Bb]in/
 [Oo]bj/
 [Pp]ackage/
+[Pp]ackages/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

diff --git a/BidsHelperPackage.cs b/BidsHelperPackage.cs
@@ -136,10 +136,13 @@ private void OriginalInitialize()
             try
             {
                 System.IServiceProvider serviceProvider = this as System.IServiceProvider;
-                Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager em =
-                   (Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager)serviceProvider.GetService(
+                //Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager em =
+                //   (Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager)serviceProvider.GetService(
+                //        typeof(Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager));
+                var em1 =
+                   serviceProvider.GetService(
                         typeof(Microsoft.VisualStudio.ExtensionManager.SVsExtensionManager));
-
+                Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager em = em1 as Microsoft.VisualStudio.ExtensionManager.IVsExtensionManager;
                 string result = "";
                 foreach (Microsoft.VisualStudio.ExtensionManager.IInstalledExtension i in em.GetInstalledExtensions())
                 {
@@ -173,11 +176,13 @@ private void OriginalInitialize()
                         }
                         result += h.Name + " (by " + h.Author + ") v" + h.Version + " " + h.Identifier + " " + h.MoreInfoUrl + " " + i.InstallPath + System.Environment.NewLine;
                     }
-                    catch { }
+                    catch (Exception ex){ Log.Debug($"Error iterating other extensions: {ex.Message}"); }
                 }
                 Log.Debug(result);
             }
-            catch { }
+            catch (Exception ex) {
+                Log.Debug($"Error getting extension manager: {ex.Message}");
+            }
 
 
             string sAddInTypeName = string.Empty;

diff --git a/Core/VersionInfo.cs b/Core/VersionInfo.cs
@@ -9,7 +9,7 @@ public class VersionInfo
     {
         // BIDS Helper Assembly & VSIX Version
         // N.B. Manually update the manifest file, if you change this - See source.extension.vsixmanifest
-        public const string Version = "2.3.4";
+        public const string Version = "2.3.5";
 
         private static readonly object lockResource = new object();
         private static Version visualStudioVersion;

diff --git a/DLLs/SQL2017/Reference/Microsoft.VisualStudio.ExtensionManager.dll b/DLLs/SQL2017/Reference/Microsoft.VisualStudio.ExtensionManager.dll
diff --git a/DLLs/SQL2019/Reference/FromASFolder/Microsoft.DataWarehouse.Interfaces.AS.DLL b/DLLs/SQL2019/Reference/FromASFolder/Microsoft.DataWarehouse.Interfaces.AS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.AdomdClient.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.AdomdClient.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.BackEnd.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.BackEnd.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Common.FrontEnd.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Common.FrontEnd.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Controls.AS.DLL b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Controls.AS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Controls.DLL b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Controls.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Core.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Core.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Design.AS.DLL b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Design.AS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.MPFProjectBase.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.MPFProjectBase.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Project.AS.DLL b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Project.AS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Project.DLL b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Project.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Tabular.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Tabular.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.VSHost.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.VSHost.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.dll b/DLLs/SQL2019/Reference/Microsoft.AnalysisServices.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.Controls.dll b/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.Controls.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.Design.DLL b/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.Design.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.VsIntegration.DLL b/DLLs/SQL2019/Reference/Microsoft.DataTransformationServices.VsIntegration.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.AS.dll b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.AS.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.RS.dll b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.RS.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.AS.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.AS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.RS.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.RS.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.dll b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.SQLServer.DTSPipelineWrap.dll b/DLLs/SQL2019/Reference/Microsoft.SQLServer.DTSPipelineWrap.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.DTSRuntimeWrap.dll b/DLLs/SQL2019/Reference/Microsoft.SqlServer.DTSRuntimeWrap.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.Dts.Design.DLL b/DLLs/SQL2019/Reference/Microsoft.SqlServer.Dts.Design.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.ExecPackageTaskWrap.dll b/DLLs/SQL2019/Reference/Microsoft.SqlServer.ExecPackageTaskWrap.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.Graph.DLL b/DLLs/SQL2019/Reference/Microsoft.SqlServer.Graph.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.IntegrationServices.Design.DLL b/DLLs/SQL2019/Reference/Microsoft.SqlServer.IntegrationServices.Design.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.IntegrationServices.Graph.DLL b/DLLs/SQL2019/Reference/Microsoft.SqlServer.IntegrationServices.Graph.DLL
diff --git a/DLLs/SQL2019/Reference/Microsoft.SqlServer.ManagedDTS.dll b/DLLs/SQL2019/Reference/Microsoft.SqlServer.ManagedDTS.dll
diff --git a/DLLs/SQL2019/Reference/Microsoft.VisualStudio.ExtensionManager.dll b/DLLs/SQL2019/Reference/Microsoft.VisualStudio.ExtensionManager.dll
diff --git a/DLLs/SQL2019/copy-ssdt-dlls.bat b/DLLs/SQL2019/copy-ssdt-dlls.bat
@@ -0,0 +1,65 @@
+set dest=C:\projects\BIDS Helper\GitHub\bideveloperextensions2\DLLs\SQL2019\Reference
+
+c:
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSAS"
+copy /Y /B "Microsoft.AnalysisServices.AdomdClient.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.BackEnd.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Common.FrontEnd.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Controls.AS.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Core.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Design.AS.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.MPFProjectBase.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Project.AS.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Tabular.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.VSHost.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.AS.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.Interfaces.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.VsIntegration.AS.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.DlgGrid.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.GridControl.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.Interfaces.DLL" "%dest%\FromASFolder\Microsoft.DataWarehouse.Interfaces.AS.DLL"
+
+
+REM cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSAS\LocalServer"
+REM copy /Y /B "Microsoft.AnalysisServices.Server.Tabular.dll" "%dest%"
+REM copy /Y /B "Microsoft.AnalysisServices.Server.Tabular.Json.dll" "%dest%"
+
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\BIShared"
+copy /Y /B "Microsoft.AnalysisServices.Design.dll" "%dest%"
+
+
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSIS\150\Binn"
+copy /Y /B "Microsoft.DataTransformationServices.Controls.dll" "%dest%"
+copy /Y /B "Microsoft.SQLServer.DTSPipelineWrap.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.DTSRuntimeWrap.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.ExecPackageTaskWrap.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.ManagedDTS.dll" "%dest%"
+
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSIS\150\BIShared"
+copy /Y /B "Microsoft.DataWarehouse.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Project.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.VsIntegration.dll" "%dest%"
+copy /Y /B "Microsoft.AnalysisServices.Controls.dll" "%dest%"
+
+
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSIS"
+copy /Y /B "Microsoft.DataTransformationServices.Design.dll" "%dest%"
+copy /Y /B "Microsoft.DataTransformationServices.VsIntegration.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.Dts.Design.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.Graph.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.IntegrationServices.Design.dll" "%dest%"
+copy /Y /B "Microsoft.SqlServer.IntegrationServices.Graph.dll" "%dest%"
+
+
+cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\SSRS"
+copy /Y /B "Microsoft.DataWarehouse.RS.dll" "%dest%"
+copy /Y /B "Microsoft.DataWarehouse.VsIntegration.RS.dll" "%dest%"
+
+REM not sure where it's from
+REM copy /Y /B "Microsoft.ReportViewer.Common.AppLocal.dll" "%dest%"
+REM copy /Y /B "Microsoft.ReportViewer.DataVisualization.AppLocal.dll" "%dest%"
+REM copy /Y /B "Microsoft.ReportViewer.Design.AppLocal.dll" "%dest%"
+REM copy /Y /B "Microsoft.ReportViewer.ProcessingObjectModel.AppLocal.dll" "%dest%"
+REM copy /Y /B "Microsoft.ReportViewer.Winforms.AppLocal.dll" "%dest%"
+
diff --git a/Manifest/SQL2017/VSPackageVS2017.resx b/Manifest/SQL2017/VSPackageVS2017.resx
@@ -121,7 +121,7 @@
     <value>BI Developer Extensions for Visual Studio 2017</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>BI Developer Extensions v2.3.4 for Visual Studio 2017 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions v2.3.5 for Visual Studio 2017 - An add-in to extend SQL Server Data Tools</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">

diff --git a/Manifest/SQL2017/source.extension.vsixmanifest b/Manifest/SQL2017/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.4" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.5" Language="en-US" Publisher="bideveloperextensions.github.io" />
         <DisplayName>BI Developer Extensions for Visual Studio 2017</DisplayName>
         <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects</Description>
         <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>

diff --git a/Manifest/SQL2019/VSPackageVS2019.resx b/Manifest/SQL2019/VSPackageVS2019.resx
@@ -121,7 +121,7 @@
     <value>BI Developer Extensions for Visual Studio 2019</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>BI Developer Extensions v2.3.4 for Visual Studio 2019 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions v2.3.5 for Visual Studio 2019 - An add-in to extend SQL Server Data Tools</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">

diff --git a/Manifest/SQL2019/source.extension.vsixmanifest b/Manifest/SQL2019/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.4" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.5" Language="en-US" Publisher="bideveloperextensions.github.io" />
         <DisplayName>BI Developer Extensions for Visual Studio 2019</DisplayName>
         <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects</Description>
         <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>

diff --git a/Resources/Common.Designer.cs b/Resources/Common.Designer.cs