enhancements to work with latest preview SSDT

enhancements to AssemblyResolve process

Author: Greg Galloway

BidsHelperPackage.cs

@@ -262,9 +262,6 @@ Microsoft Analysis Services Projects (by Microsoft) v2.8.11 04a86fc2-dbd5-4222-8
                         }
 
 
-
-
-
                         Log.Verbose(string.Format("Loading Plugin: {0}", sAddInTypeName));
 
                         BIDSHelperPluginBase feature;
@@ -664,7 +661,7 @@ System.Reflection.Assembly currentDomain_AssemblyResolve(object sender, ResolveE
             {
                 if (_recursiveAssemblyResolveNameToSkip == args.Name)
                     return null; //skip recursion
-                System.Diagnostics.Debug.WriteLine("AssemblyResolve: " + args.Name);
+                Log.Debug("AssemblyResolve: " + args.Name);
                 DateTime dtStart = DateTime.Now;
                 if (
                     args.Name.StartsWith("Microsoft.AnalysisServices")
@@ -688,11 +685,23 @@ System.Reflection.Assembly currentDomain_AssemblyResolve(object sender, ResolveE
                         if (System.IO.File.Exists(sPath))
                         {
                             var assembly = Assembly.LoadFile(sPath);
-                            System.Diagnostics.Debug.WriteLine("AssemblyResolveSuccess: " + args.Name + " to version " + assembly.GetName().Version.ToString() + " at " + sPath + " in " + DateTime.Now.Subtract(dtStart).TotalMilliseconds + "ms");
+                            Log.Debug("AssemblyResolveSuccess: " + args.Name + " to version " + assembly.GetName().Version.ToString() + " at " + sPath + " in " + DateTime.Now.Subtract(dtStart).TotalMilliseconds + "ms");
                             return assembly;
                         }
                     }
-                    System.Diagnostics.Debug.WriteLine("AssemblyResolveFail: " + args.Name + " in " + DateTime.Now.Subtract(dtStart).TotalMilliseconds + "ms");
+                    if (SSISExtensionInstallPath != null)
+                    {
+                        foreach (string sPath in System.IO.Directory.GetFiles(SSISExtensionInstallPath, assemblyname.Name + ".dll", System.IO.SearchOption.AllDirectories))
+                        {
+                            var assembly = Assembly.Load(System.IO.File.ReadAllBytes(sPath));
+                            if (assembly.GetName().Version.Major == assemblyname.Version.Major) //some SSIS subfolders have multiple versions of the assembly... make sure we match the major version number... it appears there may be an assembly redirect in operation, but this is probably safer
+                            {
+                                Log.Debug("AssemblyResolveSuccessSSIS: " + args.Name + " to version " + assembly.GetName().Version.ToString() + " at " + sPath + " in " + DateTime.Now.Subtract(dtStart).TotalMilliseconds + "ms");
+                                return assembly;
+                            }
+                        }
+                    }
+                    Log.Debug("AssemblyResolveFail: " + args.Name + " in " + DateTime.Now.Subtract(dtStart).TotalMilliseconds + "ms");
                     return null;
 
                     //Version originalVersion = (Version)assemblyname.Version.Clone();
@@ -812,12 +821,19 @@ public void OutputString(string text)
             int hr;
 
             // Get the output window
-            outputWindow = base.GetService(typeof(SVsOutputWindow)) as IVsOutputWindow;
+            if (Microsoft.VisualStudio.Shell.ThreadHelper.CheckAccess())
+                outputWindow = base.GetService(typeof(SVsOutputWindow)) as IVsOutputWindow;
+            else
+            {
+                System.Threading.Tasks.Task<object> task = base.GetServiceAsync(typeof(SVsOutputWindow));
+                task.Wait();
+                outputWindow = task.Result as IVsOutputWindow;
+            }
 
             // The General pane is not created by default. We must force its creation
             //if (guidPane == Microsoft.VisualStudio.VSConstants.OutputWindowPaneGuid.GeneralPane_guid)
             //{
-                hr = outputWindow.CreatePane(guidPane, "BIDS Helper", VISIBLE, DO_NOT_CLEAR_WITH_SOLUTION);
+            hr = outputWindow.CreatePane(guidPane, "BIDS Helper", VISIBLE, DO_NOT_CLEAR_WITH_SOLUTION);
                 Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(hr);
             //}
 

Core/Options/BIDSHelperOptionsVersionCheckPage.cs

@@ -134,6 +134,30 @@ private void BIDSHelperOptionsVersionCheckPage_Load(object sender, EventArgs e)
                      (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)
                 {