Skip to content

Commit

Permalink
Merge branch 'bidshelper-vsix'
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Galloway committed Apr 11, 2019
2 parents 949c915 + dd10497 commit 1d4bc4b
Show file tree
Hide file tree
Showing 68 changed files with 706 additions and 397 deletions.
549 changes: 306 additions & 243 deletions BidsHelperPackage.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Core/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1";
public const string Version = "2.3.0";

private static readonly object lockResource = new object();
private static Version visualStudioVersion;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.AnalysisServices.BackEnd.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Controls.DLL
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.AnalysisServices.Design.DLL
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.AnalysisServices.VSHost.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.DataWarehouse.VsIntegration.DLL
Binary file not shown.
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.DataWarehouse.dll
Binary file not shown.
Binary file modified DLLs/SQL2019/Reference/Microsoft.SqlServer.DlgGrid.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions Manifest/SQL2017/VSPackageVS2017.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="110" xml:space="preserve">
<value>BI Developer Extensions 2017 Extension</value>
<value>BI Developer Extensions for Visual Studio 2017</value>
</data>
<data name="112" xml:space="preserve">
<value>BI Developer Extensions 2017 Visual Studio Extension v2.2.1 - An add-in to extend SQL Server Data Tools</value>
<value>BI Developer Extensions v2.3.0 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">
Expand Down
2 changes: 1 addition & 1 deletion Manifest/SQL2017/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -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.2.1" Language="en-US" Publisher="bideveloperextensions.github.io" />
<Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.0" 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>
Expand Down
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[assembly: AssemblyProduct("BI Developer Extensions")]
[assembly: AssemblyDescription("BI Developer Extensions (formerly BIDS Helper) provides additional useful features to SQL Server Data Tools")]
[assembly: AssemblyCompany("https://bideveloperextensions.github.io")]
[assembly: AssemblyCopyright("Copyright © 2018 BI Developer Extensions")]
[assembly: AssemblyCopyright("Copyright © 2019 BI Developer Extensions")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
86 changes: 58 additions & 28 deletions SQL2019_VS2017_BidsHelper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -526,25 +526,31 @@
<Content Include="DLLs\SQL2017\Reference\Microsoft.SqlServer.GridControl.dll" />
<Content Include="DLLs\SQL2019\ExpressionEditor.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AdomdClient.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.AdomdClient.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.Core.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.Tabular.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.BackEnd.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Common.FrontEnd.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Controls.AS.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Controls.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Core.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Design.AS.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Design.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.MPFProjectBase.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Project.AS.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Project.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Server.Tabular.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Server.Tabular.Json.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Tabular.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.AnalysisServices.VSHost.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataTransformationServices.Controls.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataTransformationServices.Design.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataTransformationServices.VsIntegration.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.AS.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.Interfaces.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.RS.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.AS.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.RS.DLL" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.ReportViewer.Common.AppLocal.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.ReportViewer.DataVisualization.AppLocal.dll" />
<Content Include="DLLs\SQL2019\Reference\Microsoft.ReportViewer.Design.AppLocal.dll" />
Expand All @@ -564,7 +570,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="packagesVS2017.config" />
<None Include="Properties\vsix-compress.props" />
<None Include="Manifest\SQL2017\source.extension.vsixmanifest">
<SubType>Designer</SubType>
Expand Down Expand Up @@ -660,11 +665,6 @@
<Content Include="Resources\stop.ico" />
<Content Include="Resources\TaskSmall.ico" />
<Content Include="Resources\TreeViewTab.ico" />
<Content Include="extension2017.vsixmanifest">
<SubType>Designer</SubType>
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SSAS\AggManager\Graphics\AggDesign.ico" />
<Content Include="SSAS\AggManager\Graphics\Aggregation.ico" />
<Content Include="SSAS\AggManager\Graphics\Checked.ico" />
Expand Down Expand Up @@ -716,23 +716,35 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLLs\SQL2019\ExpressionEditor.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Reference Include="Microsoft.AnalysisServices, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Private>False</Private>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.dll</HintPath>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.AppLocal.AdomdClient, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>True</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.AdomdClient.dll</HintPath>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
<Aliases>localAdomdClient</Aliases>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.AnalysisServices.AppLocal.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Reference Include="Microsoft.DataWarehouse.AS, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>True</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.AS.dll</HintPath>
<Aliases>asAlias</Aliases>
<Private>False</Private>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.AppLocal.Tabular, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<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>
<Aliases>rsAlias</Aliases>
<Private>False</Private>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AppLocal.Tabular.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Core, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Private>False</Private>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Private>False</Private>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Tabular.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AnalysisServices.BackEnd">
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.BackEnd.dll</HintPath>
Expand All @@ -750,6 +762,11 @@
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Project.DLL</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Project.AS">
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Project.AS.DLL</HintPath>
<Private>False</Private>
<Aliases>asAlias</Aliases>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Server.Tabular, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
<SpecificVersion>True</SpecificVersion>
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Server.Tabular.dll</HintPath>
Expand Down Expand Up @@ -778,6 +795,16 @@
<Private>False</Private>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.DataWarehouse.VsIntegration.AS">
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.AS.DLL</HintPath>
<Private>False</Private>
<Aliases>asAlias</Aliases>
</Reference>
<Reference Include="Microsoft.DataWarehouse.VsIntegration.RS">
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.RS.DLL</HintPath>
<Private>False</Private>
<Aliases>rsAlias</Aliases>
</Reference>
<Reference Include="Microsoft.ReportViewer.Common.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.Common.AppLocal.dll</HintPath>
<Private>False</Private>
Expand All @@ -798,7 +825,7 @@
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.Winforms.AppLocal.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.SqlServer.DlgGrid, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<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>
Expand Down Expand Up @@ -849,16 +876,27 @@
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Design.DLL</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Controls.AS">
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Controls.AS.DLL</HintPath>
<Private>False</Private>
<Aliases>asAlias</Aliases>
</Reference>
<Reference Include="Microsoft.AnalysisServices.Design.AS">
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Design.AS.DLL</HintPath>
<Private>False</Private>
<Aliases>asAlias</Aliases>
</Reference>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.DataWarehouse">
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.DLL</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.DataWarehouse.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<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>
Expand Down Expand Up @@ -1158,14 +1196,6 @@
<ItemGroup>
<Folder Include="SqlServerTypes\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="SQL2017_VS2017_BidsHelper.csproj">
<Project>{0828f434-598d-4e5b-983a-9fad3bfde857}</Project>
<Name>SQL2017_VS2017_BidsHelper</Name>
<VSIXSubPath>SQL2017</VSIXSubPath>
<Aliases>SQL2017_BidsHelper</Aliases>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
13 changes: 0 additions & 13 deletions SQL2019_VS2017_BidsHelper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL2017_VS2017_BidsHelper", "SQL2017_VS2017_BidsHelper.csproj", "{0828F434-598D-4E5B-983A-9FAD3BFDE857}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQL2019_VS2017_BidsHelper", "SQL2019_VS2017_BidsHelper.csproj", "{0C3EE108-7516-4529-BF07-B13754A7144D}"
ProjectSection(ProjectDependencies) = postProject
{0828F434-598D-4E5B-983A-9FAD3BFDE857} = {0828F434-598D-4E5B-983A-9FAD3BFDE857}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -18,14 +13,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Debug|x86.ActiveCfg = Debug|x86
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Debug|x86.Build.0 = Debug|x86
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Release|Any CPU.Build.0 = Release|Any CPU
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Release|x86.ActiveCfg = Release|x86
{0828F434-598D-4E5B-983A-9FAD3BFDE857}.Release|x86.Build.0 = Release|x86
{0C3EE108-7516-4529-BF07-B13754A7144D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C3EE108-7516-4529-BF07-B13754A7144D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C3EE108-7516-4529-BF07-B13754A7144D}.Debug|x86.ActiveCfg = Debug|x86
Expand Down
Loading

0 comments on commit 1d4bc4b

Please sign in to comment.