Skip to content

Commit

Permalink
fix for issue #63
Browse files Browse the repository at this point in the history
Microsoft.DataWarehouse.Interfaces.DLL appears in the BIShared extension folder as version 15.0.0 but it also appears in the SSAS and SSRS extension folders as Microsoft.DataWarehouse.Interfaces.DLL with version 15.2.0.
  • Loading branch information
furmangg committed May 1, 2019
1 parent 5f1c5ea commit 686e311
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 9 deletions.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL
Binary file not shown.
19 changes: 12 additions & 7 deletions SQL2019_VS2017_BidsHelper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,17 @@
<Aliases>asAlias</Aliases>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.DataWarehouse.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
<Aliases>sharedDataWarehouseInterfaces</Aliases>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.DataWarehouse.Interfaces.AS, Version=15.2.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>DLLs\SQL2019\Reference\FromASFolder\Microsoft.DataWarehouse.Interfaces.AS.DLL</HintPath>
<SpecificVersion>False</SpecificVersion>
<Aliases>asDataWarehouseInterfaces</Aliases>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.DataWarehouse.RS, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>True</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.RS.dll</HintPath>
Expand Down Expand Up @@ -833,7 +844,7 @@
<Reference Include="Microsoft.SqlServer.DlgGrid, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>True</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.SqlServer.DlgGrid.dll</HintPath>
<Private>False</Private>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.SqlServer.Dts.Design, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>True</SpecificVersion>
Expand Down Expand Up @@ -897,12 +908,6 @@
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.DLL</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.DataWarehouse.Interfaces, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
<Private>False</Private>
<Aliases>sharedDataWarehouseInterfaces</Aliases>
</Reference>
<Reference Include="Microsoft.DataWarehouse.VsIntegration">
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.DLL</HintPath>
<Private>False</Private>
Expand Down
17 changes: 15 additions & 2 deletions SSIS/VariablesWindowPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,19 @@ private void HookupVariablesWindow(Window GotFocus)
continue;
}

IDesignerToolWindowService service = (IDesignerToolWindowService)designer.GetService(typeof(IDesignerToolWindowService));

package.Log.Debug(designer.GetType().FullName + " from " + designer.GetType().Assembly.Location);
package.Log.Debug(typeof(IDesignerToolWindowService).FullName + " from " + typeof(IDesignerToolWindowService).Assembly.Location);
var obj = designer.GetService(typeof(IDesignerToolWindowService));
if (obj != null)
package.Log.Debug(obj.GetType().FullName + " from " + obj.GetType().Assembly.Location);
else
package.Log.Debug("obj is null");




IDesignerToolWindowService service = designer.GetService(typeof(IDesignerToolWindowService)) as IDesignerToolWindowService;
if (service == null) continue;
IDesignerToolWindow toolWindow = service.GetToolWindow(new Guid(SSIS_VARIABLES_TOOL_WINDOW_KIND), 0);
if (toolWindow == null) continue;
Expand Down Expand Up @@ -190,7 +202,8 @@ private void HookupVariablesWindow(Window GotFocus)
}
catch (Exception ex)
{
MessageBox.Show(ex.Message + "\r\n\r\n" + ex.StackTrace, DefaultMessageBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
package.Log.Exception("Problem in HookupVariablesWindow", ex);
//MessageBox.Show(ex.Message + "\r\n\r\n" + ex.StackTrace, DefaultMessageBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

Expand Down

0 comments on commit 686e311

Please sign in to comment.