Skip to content

Commit 5272596

Browse files
furmanggfurmangg
authored
Merge pull request #62 from BIDeveloperExtensions/bidshelper-vsix
VS2019 release of 2.3.1
2 parents 119d2be + 5ce8712 commit 5272596

4 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎BidsHelperPackage.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ Microsoft Analysis Services Projects (by Microsoft) v2.8.11 04a86fc2-dbd5-4222-8
152152
SSRSExtensionInstallPath = i.InstallPath;
153153
Log.Debug("SSRS extension v" + h.Version + " is installed at " + i.InstallPath);
154154
}
155-
else if (h.Name == "Microsoft Integration Services Projects" || string.Compare(h.Identifier, "D1B09713-C12E-43CC-9EF4-6562298285AB", true) == 0)
155+
else if (h.Name == "Microsoft Integration Services Projects" || string.Compare(h.Identifier, "D1B09713-C12E-43CC-9EF4-6562298285AB", true) == 0 //2.2 (VS2017)
156+
|| h.Name == "SQL Server Integration Services Projects" || string.Compare(h.Identifier, "851E7A09-7B2B-4F06-A15D-BABFCB26B970", true) == 0 //3.0 (VS2019)
157+
)
156158
{
157159
SSISExtensionVersion = h.Version;
158160
SSISExtensionInstallPath = i.InstallPath;

‎Core/VersionInfo.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public static string VisualStudioFriendlyVersion
7373
case 14:
7474
return "2015";
7575
case 15:
76-
return "2017"; // Unofficial
76+
return "2017";
77+
case 16:
78+
return "2019";
7779
default:
7880
return string.Format("(VS Unknown {0})", VisualStudioVersion.ToString());
7981
}

‎Manifest/SQL2019/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.0" Language="en-US" Publisher="bideveloperextensions.github.io" />
4+
<Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.1" Language="en-US" Publisher="bideveloperextensions.github.io" />
55
<DisplayName>BI Developer Extensions for Visual Studio 2019</DisplayName>
66
<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>
77
<MoreInfo>https://bideveloperextensions.github.io</MoreInfo>

‎SQL2019_VS2019_BidsHelper.csproj‎

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
6060
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
6161
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
62-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
62+
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
6363
</PropertyGroup>
6464
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
6565
<DebugSymbols>true</DebugSymbols>
@@ -102,6 +102,7 @@
102102
<Compile Include="Core\DirtyMonitoredDictionary.cs" />
103103
<Compile Include="Core\EditorWindowTag.cs" />
104104
<Compile Include="Core\Enums.cs" />
105+
<Compile Include="Core\FeatureCategory.cs" />
105106
<Compile Include="Core\IWindowActivatedPlugin.cs" />
106107
<Compile Include="Core\Logger\LogLevels.cs" />
107108
<Compile Include="Core\Logger\NullLogger.cs" />
@@ -509,11 +510,10 @@
509510
<Compile Include="SSRS\UnusedDatasetsPlugin.cs" />
510511
</ItemGroup>
511512
<ItemGroup>
512-
<None Include="app.config" />
513+
<None Include="app.config">
514+
<SubType>Designer</SubType>
515+
</None>
513516
<None Include="BIDSHelper.snk" />
514-
<Content Include="BidsHelper2017.pkgdef.bak">
515-
<IncludeInVSIX>true</IncludeInVSIX>
516-
</Content>
517517
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.AdomdClient.dll" />
518518
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.AppLocal.AdomdClient.dll" />
519519
<Content Include="DLLs\SQL2017\Reference\Microsoft.AnalysisServices.Server.Tabular.dll" />
@@ -570,6 +570,10 @@
570570
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
571571
<IncludeInVSIX>true</IncludeInVSIX>
572572
</Content>
573+
<None Include="packages.config">
574+
<SubType>Designer</SubType>
575+
</None>
576+
<None Include="Properties\vsix-compress.props" />
573577
<None Include="Manifest\SQL2019\source.extension.vsixmanifest">
574578
<SubType>Designer</SubType>
575579
</None>
@@ -715,19 +719,29 @@
715719
<SpecificVersion>False</SpecificVersion>
716720
<HintPath>DLLs\SQL2019\ExpressionEditor.dll</HintPath>
717721
</Reference>
718-
<Reference Include="Microsoft.AnalysisServices, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
719-
<Private>False</Private>
722+
<Reference Include="Microsoft.AnalysisServices, Version=15.17.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
720723
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.dll</HintPath>
721-
</Reference>
722-
<Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
723724
<SpecificVersion>True</SpecificVersion>
725+
<Private>False</Private>
726+
</Reference>
727+
<Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=15.17.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
724728
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
729+
<SpecificVersion>True</SpecificVersion>
725730
<Aliases>localAdomdClient</Aliases>
726731
<Private>False</Private>
727732
</Reference>
733+
<Reference Include="Microsoft.AnalysisServices.Core, Version=15.17.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
734+
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Core.dll</HintPath>
735+
<Private>False</Private>
736+
</Reference>
737+
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
738+
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Tabular.dll</HintPath>
739+
<SpecificVersion>False</SpecificVersion>
740+
<Private>False</Private>
741+
</Reference>
728742
<Reference Include="Microsoft.DataWarehouse.AS, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
729-
<SpecificVersion>True</SpecificVersion>
730743
<HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.AS.dll</HintPath>
744+
<SpecificVersion>False</SpecificVersion>
731745
<Aliases>asAlias</Aliases>
732746
<Private>False</Private>
733747
</Reference>
@@ -737,14 +751,6 @@
737751
<Aliases>rsAlias</Aliases>
738752
<Private>False</Private>
739753
</Reference>
740-
<Reference Include="Microsoft.AnalysisServices.Core, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
741-
<Private>False</Private>
742-
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Core.dll</HintPath>
743-
</Reference>
744-
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=15.15.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
745-
<Private>False</Private>
746-
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Tabular.dll</HintPath>
747-
</Reference>
748754
<Reference Include="Microsoft.AnalysisServices.BackEnd">
749755
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.BackEnd.dll</HintPath>
750756
<Private>False</Private>
@@ -806,23 +812,23 @@
806812
</Reference>
807813
<Reference Include="Microsoft.ReportViewer.Common.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
808814
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.Common.AppLocal.dll</HintPath>
809-
<Private>False</Private>
815+
<Private>True</Private>
810816
</Reference>
811817
<Reference Include="Microsoft.ReportViewer.DataVisualization.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
812818
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.DataVisualization.AppLocal.dll</HintPath>
813-
<Private>False</Private>
819+
<Private>True</Private>
814820
</Reference>
815821
<Reference Include="Microsoft.ReportViewer.Design.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
816822
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.Design.AppLocal.dll</HintPath>
817823
<Private>False</Private>
818824
</Reference>
819825
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
820826
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.ProcessingObjectModel.AppLocal.dll</HintPath>
821-
<Private>False</Private>
827+
<Private>True</Private>
822828
</Reference>
823829
<Reference Include="Microsoft.ReportViewer.Winforms.AppLocal, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
824830
<HintPath>DLLs\SQL2019\Reference\Microsoft.ReportViewer.Winforms.AppLocal.dll</HintPath>
825-
<Private>False</Private>
831+
<Private>True</Private>
826832
</Reference>
827833
<Reference Include="Microsoft.SqlServer.DlgGrid, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
828834
<SpecificVersion>True</SpecificVersion>
@@ -906,16 +912,27 @@
906912
<EmbedInteropTypes>False</EmbedInteropTypes>
907913
<Private>False</Private>
908914
</Reference>
909-
<Reference Include="Microsoft.VisualStudio.ExtensionEngine">
915+
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
916+
<HintPath>packages\Microsoft.VisualStudio.CoreUtility.14.2.25123\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
917+
<Private>False</Private>
918+
</Reference>
919+
<Reference Include="Microsoft.VisualStudio.ExtensionEngine, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
920+
<SpecificVersion>False</SpecificVersion>
910921
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Microsoft.VisualStudio.ExtensionEngine.dll</HintPath>
911922
<Private>False</Private>
912923
</Reference>
913924
<Reference Include="Microsoft.VisualStudio.ExtensionManager, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
925+
<SpecificVersion>False</SpecificVersion>
914926
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ExtensionManager.dll</HintPath>
915927
<Private>False</Private>
916928
</Reference>
929+
<Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
930+
<HintPath>packages\Microsoft.VisualStudio.Imaging.14.2.25123\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
931+
<Private>False</Private>
932+
</Reference>
917933
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
918934
<HintPath>packages\Microsoft.VisualStudio.Text.Data.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
935+
<Private>False</Private>
919936
</Reference>
920937
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
921938
<HintPath>packages\Microsoft.VisualStudio.Text.Logic.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
@@ -934,6 +951,18 @@
934951
<HintPath>DLLs\SQL2019\Reference\Microsoft.SqlServer.GridControl.dll</HintPath>
935952
<Private>False</Private>
936953
</Reference>
954+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
955+
<HintPath>packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
956+
<Private>False</Private>
957+
</Reference>
958+
<Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
959+
<HintPath>packages\Microsoft.VisualStudio.Utilities.14.2.25123\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
960+
<Private>False</Private>
961+
</Reference>
962+
<Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
963+
<HintPath>packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
964+
<Private>False</Private>
965+
</Reference>
937966
<Reference Include="msddsp, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
938967
<SpecificVersion>False</SpecificVersion>
939968
<EmbedInteropTypes>False</EmbedInteropTypes>
@@ -1123,37 +1152,6 @@
11231152
<ItemGroup>
11241153
<Folder Include="SqlServerTypes\" />
11251154
</ItemGroup>
1126-
<ItemGroup>
1127-
<PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime">
1128-
<Version>14.3.25408</Version>
1129-
</PackageReference>
1130-
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop">
1131-
<Version>7.10.6071</Version>
1132-
</PackageReference>
1133-
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
1134-
<Version>15.7.7</Version>
1135-
</PackageReference>
1136-
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes">
1137-
<Version>15.0.10</Version>
1138-
</PackageReference>
1139-
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
1140-
<Version>15.0.26201</Version>
1141-
</PackageReference>
1142-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime">
1143-
<Version>14.3.25407</Version>
1144-
</PackageReference>
1145-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
1146-
<Version>15.7.18</Version>
1147-
</PackageReference>
1148-
<PackageReference Include="Microsoft.VSSDK.BuildTools">
1149-
<Version>15.7.109</Version>
1150-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1151-
<PrivateAssets>all</PrivateAssets>
1152-
</PackageReference>
1153-
<PackageReference Include="VsixCompress">
1154-
<Version>1.0.1</Version>
1155-
</PackageReference>
1156-
</ItemGroup>
11571155
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11581156
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
11591157
<!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -1180,10 +1178,8 @@
11801178
<Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
11811179
<Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
11821180
<Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
1183-
<Error Condition="!Exists('packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
11841181
</Target>
11851182
<Import Project="packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
1186-
<Import Project="packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
11871183
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11881184
Other similar extension points exist, see Microsoft.Common.targets.
11891185
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)