Merge pull request #60 from BIDeveloperExtensions/bidshelper-vsix

2.3.1 release merge
BIDeveloperExtensions · Apr 25, 2019 · 119d2be · 119d2be
2 parents 04fee13 + e793985
commit 119d2be
Show file tree

Hide file tree

Showing 146 changed files with 2,278 additions and 72,260 deletions.
diff --git a/BidsHelperPackage.cs b/BidsHelperPackage.cs
diff --git a/Core/Options/BIDSHelperOptionsVersionCheckPage.cs b/Core/Options/BIDSHelperOptionsVersionCheckPage.cs
@@ -129,6 +129,35 @@ private void BIDSHelperOptionsVersionCheckPage_Load(object sender, EventArgs e)
                 this.lblLocalVersion.Text += string.Format(CultureInfo.InvariantCulture, " (Debug Build {0:yyyy-MM-dd HH:mm:ss})", buildDateTime);
 #endif
 
+                this.lblSqlVersion.Text += string.Format("\r\nSSDT Extensions Installed: SSAS ({0}), SSIS ({1}), SSRS ({2})",
+                     (BIDSHelperPackage.SSASExtensionVersion == null ? "N/A" : BIDSHelperPackage.SSASExtensionVersion.ToString()),
+                     (BIDSHelperPackage.SSISExtensionVersion == null ? "N/A" : BIDSHelperPackage.SSISExtensionVersion.ToString()),
+                     (BIDSHelperPackage.SSRSExtensionVersion == null ? "N/A" : BIDSHelperPackage.SSRSExtensionVersion.ToString()));
+
+                //release 2.3.0 expected: 2.8.11 SSAS extension or higher, version 2.5.6 SSRS extension or higher, and 2.1 SSIS extension or higher
+                Version SSASExpectedVersion = new Version("2.8.11");
+                Version SSRSExpectedVersion = new Version("2.5.6");
+                Version SSISExpectedVersion = new Version("2.1");
+
+                string sUpgradeSSDTMessage = string.Empty;
+                if (BIDSHelperPackage.SSASExtensionVersion != null && BIDSHelperPackage.SSASExtensionVersion < SSASExpectedVersion)
+                {
+                    if (sUpgradeSSDTMessage != string.Empty) sUpgradeSSDTMessage += ", ";
+                    sUpgradeSSDTMessage += "SSAS to " + SSASExpectedVersion;
+                }
+                if (BIDSHelperPackage.SSRSExtensionVersion != null && BIDSHelperPackage.SSRSExtensionVersion < SSRSExpectedVersion)
+                {
+                    if (sUpgradeSSDTMessage != string.Empty) sUpgradeSSDTMessage += ", ";
+                    sUpgradeSSDTMessage += "SSRS to " + SSRSExpectedVersion;
+                }
+                if (BIDSHelperPackage.SSISExtensionVersion != null && BIDSHelperPackage.SSISExtensionVersion < SSISExpectedVersion)
+                {
+                    if (sUpgradeSSDTMessage != string.Empty) sUpgradeSSDTMessage += ", ";
+                    sUpgradeSSDTMessage += "SSIS to " + SSISExpectedVersion;
+                }
+                if (sUpgradeSSDTMessage != string.Empty)
+                    this.lblSqlVersion.Text += "\r\n" + "Please upgrade " + sUpgradeSSDTMessage;
+
                 // First check we have a valid instance, the add-in may be disabled.
                 if (VersionCheckPlugin.Instance == null)
                 {

diff --git a/Core/Options/BIDSHelperPreferencesDialogPage.cs b/Core/Options/BIDSHelperPreferencesDialogPage.cs
@@ -22,10 +22,18 @@ protected override IWin32Window Window
         {
             get
             {
-                page = new BIDSHelperPreferencesPage();
-                page.OptionsPage = this;
-                page.Initialize();
-                return page;
+                try
+                {
+                    page = new BIDSHelperPreferencesPage();
+                    page.OptionsPage = this;
+                    page.Initialize();
+                    return page;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+                    return null;
+                }
             }
         }
 

diff --git a/Core/Options/BIDSHelperPreferencesPage.cs b/Core/Options/BIDSHelperPreferencesPage.cs
@@ -19,38 +19,60 @@ public BIDSHelperPreferencesDialogPage OptionsPage
 
         public void Initialize()
         {
-            this.Width = 395; //392
-            this.Height = 290;
+            try
+            {
+                this.Width = 395; //392
+                this.Height = 290;
 
-            // Smart Diff
-            lblTFS.Text = "Visual Studio Built-in";
-            lblVSS.Text = string.Empty;
+                // Smart Diff
+                lblTFS.Text = "Visual Studio Built-in";
+                lblVSS.Text = string.Empty;
 
-            if (string.IsNullOrEmpty(SmartDiffPlugin.CustomDiffViewer))
-            {
-                radSmartDiffDefault.Checked = true;
-                txtSmartDiffCustom.Text = "\"C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\Common7\\IDE\\diffmerge.exe\" ? ? /ignoreeol /ignorespace";
-            }
-            else
-            {
-                radSmartDiffCustom.Checked = true;
-                txtSmartDiffCustom.Text = SmartDiffPlugin.CustomDiffViewer;
-            }
+                if (string.IsNullOrEmpty(SmartDiffPlugin.CustomDiffViewer))
+                {
+                    radSmartDiffDefault.Checked = true;
+                    txtSmartDiffCustom.Text = "\"C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\Common7\\IDE\\diffmerge.exe\" ? ? /ignoreeol /ignorespace";
+                }
+                else
+                {
+                    radSmartDiffCustom.Checked = true;
+                    txtSmartDiffCustom.Text = SmartDiffPlugin.CustomDiffViewer;
+                }
 
-            FixSmartDiffCustomEnabled();
+                FixSmartDiffCustomEnabled();
 
-            // Expression & Configuration highlighter
-            btnExpressionColor.BackColor = ExpressionHighlighterPlugin.ExpressionColor;
-            btnConfigurationColor.BackColor = ExpressionHighlighterPlugin.ConfigurationColor;
+                if (BIDSHelperPackage.SSISExtensionVersion != null)
+                {
+                    // Expression & Configuration highlighter
+                    btnExpressionColor.BackColor = ExpressionHighlighterPlugin.ExpressionColor;
+                    btnConfigurationColor.BackColor = ExpressionHighlighterPlugin.ConfigurationColor;
+
+                    // Expression editor, font and colours
+                    buttonExpressionFontSample.Font = ExpressionListPlugin.ExpressionFont;
+                    buttonExpressionFontSample.ForeColor = ExpressionListPlugin.ExpressionColor;
+                    buttonResultFontSample.Font = ExpressionListPlugin.ResultFont;
+                    buttonResultFontSample.ForeColor = ExpressionListPlugin.ResultColor;
+                }
+                else
+                {
+                    btnExpressionColor.Enabled = false;
+                    btnConfigurationColor.Enabled = false;
+                    buttonExpressionFontSample.Enabled = false;
+                    buttonResultFontSample.Enabled = false;
+                    linkResetExpressionColors.Enabled = false;
+                }
 
-            // Measure group free space
-            txtFreeSpaceFactor.Text = MeasureGroupHealthCheckPlugin.FreeSpaceFactor.ToString();
+                // Measure group free space
+                if (BIDSHelperPackage.SSASExtensionVersion != null)
+                    txtFreeSpaceFactor.Text = MeasureGroupHealthCheckPlugin.FreeSpaceFactor.ToString();
+                else
+                    txtFreeSpaceFactor.Enabled = false;
 
-            // Expression editor, font and colours
-            buttonExpressionFontSample.Font = ExpressionListPlugin.ExpressionFont;
-            buttonExpressionFontSample.ForeColor = ExpressionListPlugin.ExpressionColor;
-            buttonResultFontSample.Font = ExpressionListPlugin.ResultFont;
-            buttonResultFontSample.ForeColor = ExpressionListPlugin.ResultColor;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+            }
         }
 
         public void Apply()
@@ -68,21 +90,25 @@ public void Apply()
                 }
 
                 // Expression & Configuration highlighter
-                ExpressionHighlighterPlugin.ExpressionColor = btnExpressionColor.BackColor;
-                ExpressionHighlighterPlugin.ConfigurationColor = btnConfigurationColor.BackColor;
+                if (BIDSHelperPackage.SSISExtensionVersion != null)
+                {
+                    ExpressionHighlighterPlugin.ExpressionColor = btnExpressionColor.BackColor;
+                    ExpressionHighlighterPlugin.ConfigurationColor = btnConfigurationColor.BackColor;
+
+                    // Expression editor, font and colours
+                    ExpressionListPlugin.ExpressionFont = buttonExpressionFontSample.Font;
+                    ExpressionListPlugin.ExpressionColor = buttonExpressionFontSample.ForeColor;
+                    ExpressionListPlugin.ResultFont = buttonResultFontSample.Font;
+                    ExpressionListPlugin.ResultColor = buttonResultFontSample.ForeColor;
+                }
 
                 // Measure group free space
                 int iFreeSpaceFactor;
-                if (int.TryParse(txtFreeSpaceFactor.Text, out iFreeSpaceFactor))
+                if (txtFreeSpaceFactor.Enabled && int.TryParse(txtFreeSpaceFactor.Text, out iFreeSpaceFactor))
                 {
                     MeasureGroupHealthCheckPlugin.FreeSpaceFactor = iFreeSpaceFactor;
                 }
 
-                // Expression editor, font and colours
-                ExpressionListPlugin.ExpressionFont = buttonExpressionFontSample.Font;
-                ExpressionListPlugin.ExpressionColor = buttonExpressionFontSample.ForeColor;
-                ExpressionListPlugin.ResultFont = buttonResultFontSample.Font;
-                ExpressionListPlugin.ResultColor = buttonResultFontSample.ForeColor;
             }
             catch (Exception ex)
             {
@@ -92,7 +118,14 @@ public void Apply()
 
         private void radSmartDiffDefault_CheckedChanged(object sender, EventArgs e)
         {
-            FixSmartDiffCustomEnabled();
+            try
+            {
+                FixSmartDiffCustomEnabled();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+            }
         }
 
         private void FixSmartDiffCustomEnabled()
@@ -102,64 +135,112 @@ private void FixSmartDiffCustomEnabled()
 
         private void radSmartDiffCustom_CheckedChanged(object sender, EventArgs e)
         {
-            FixSmartDiffCustomEnabled();
+            try
+            {
+                FixSmartDiffCustomEnabled();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+            }
         }
 
         private void btnExpressionColor_Click(object sender, EventArgs e)
         {
-            colorDialog.Color = btnExpressionColor.BackColor;
-            if (colorDialog.ShowDialog() == DialogResult.OK)
+            try
             {
-                btnExpressionColor.BackColor = colorDialog.Color;
+                colorDialog.Color = btnExpressionColor.BackColor;
+                if (colorDialog.ShowDialog() == DialogResult.OK)
+                {
+                    btnExpressionColor.BackColor = colorDialog.Color;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
             }
         }
 
         private void btnConfigurationColor_Click(object sender, EventArgs e)
         {
-            colorDialog.Color = btnConfigurationColor.BackColor;
-            if (colorDialog.ShowDialog() == DialogResult.OK)
+            try
             {
-                btnConfigurationColor.BackColor = colorDialog.Color;
+                colorDialog.Color = btnConfigurationColor.BackColor;
+                if (colorDialog.ShowDialog() == DialogResult.OK)
+                {
+                    btnConfigurationColor.BackColor = colorDialog.Color;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
             }
         }
 
         private void linkResetExpressionColors_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            ExpressionHighlighterPlugin.ExpressionColor = ExpressionHighlighterPlugin.ExpressionColorDefault;
-            btnExpressionColor.BackColor = ExpressionHighlighterPlugin.ExpressionColorDefault;
+            try
+            {
+                ExpressionHighlighterPlugin.ExpressionColor = ExpressionHighlighterPlugin.ExpressionColorDefault;
+                btnExpressionColor.BackColor = ExpressionHighlighterPlugin.ExpressionColorDefault;
 
-            ExpressionHighlighterPlugin.ConfigurationColor = ExpressionHighlighterPlugin.ConfigurationColorDefault;
-            btnConfigurationColor.BackColor = ExpressionHighlighterPlugin.ConfigurationColorDefault;
+                ExpressionHighlighterPlugin.ConfigurationColor = ExpressionHighlighterPlugin.ConfigurationColorDefault;
+                btnConfigurationColor.BackColor = ExpressionHighlighterPlugin.ConfigurationColorDefault;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+            }
         }
 
         private void txtFreeSpaceFactor_Leave(object sender, EventArgs e)
         {
-            int i;
-            if (!int.TryParse(txtFreeSpaceFactor.Text, out i))
-                txtFreeSpaceFactor.Text = MeasureGroupHealthCheckPlugin.FreeSpaceFactor.ToString();
+            try
+            {
+                int i;
+                if (!int.TryParse(txtFreeSpaceFactor.Text, out i))
+                    txtFreeSpaceFactor.Text = MeasureGroupHealthCheckPlugin.FreeSpaceFactor.ToString();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+            }
         }
 
         private void buttonExpressionFont_Click(object sender, EventArgs e)
         {
-            fontDialog.Font = buttonExpressionFontSample.Font;
-            fontDialog.Color = buttonExpressionFontSample.ForeColor;
-            if (fontDialog.ShowDialog() == DialogResult.OK)
+            try
+            {
+                fontDialog.Font = buttonExpressionFontSample.Font;
+                fontDialog.Color = buttonExpressionFontSample.ForeColor;
+                if (fontDialog.ShowDialog() == DialogResult.OK)
+                {
+                    buttonExpressionFontSample.Font = fontDialog.Font;
+                    buttonExpressionFontSample.ForeColor = fontDialog.Color;
+                }
+            }
+            catch (Exception ex)
             {
-                buttonExpressionFontSample.Font = fontDialog.Font;
-                buttonExpressionFontSample.ForeColor = fontDialog.Color;
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
             }
         }
 
         private void buttonResultFont_Click(object sender, EventArgs e)
         {
-            fontDialog.Font = buttonResultFontSample.Font;
-            fontDialog.Color = buttonResultFontSample.ForeColor;
-            if (fontDialog.ShowDialog() == DialogResult.OK)
+            try
+            {
+                fontDialog.Font = buttonResultFontSample.Font;
+                fontDialog.Color = buttonResultFontSample.ForeColor;
+                if (fontDialog.ShowDialog() == DialogResult.OK)
+                {
+                    buttonResultFontSample.Font = fontDialog.Font;
+                    buttonResultFontSample.ForeColor = fontDialog.Color;
+                }
+            }
+            catch (Exception ex)
             {
-                buttonResultFontSample.Font = fontDialog.Font;
-                buttonResultFontSample.ForeColor = fontDialog.Color;
+                MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
             }
-
         }
     }
 

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.0";
+        public const string Version = "2.3.1";
 
         private static readonly object lockResource = new object();
         private static Version visualStudioVersion;

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.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.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.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.VsIntegration.AS.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.AS.DLL
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.0 for Visual Studio 2017 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions v2.3.1 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.0" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.1" 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>