Skip to content

Commit 3c6994a

Browse files
committed
2.2.0 release
1 parent 0af9ca7 commit 3c6994a

7 files changed

Lines changed: 20 additions & 10 deletions

BidsHelperPackage.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ private bool SwitchVsixManifest()
287287
regKey.Close();
288288
}
289289

290-
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BIDS Helper can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
290+
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BI Developer Extensions can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
291291
return true;
292292
}
293293
else
@@ -340,7 +340,7 @@ private bool SwitchVsixManifest()
340340
regKey.Close();
341341
}
342342

343-
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BIDS Helper can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
343+
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BI Developer Extensions can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
344344
return true;
345345
}
346346
else
@@ -390,7 +390,7 @@ private bool SwitchVsixManifest()
390390
regKey.Close();
391391
}
392392

393-
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BIDS Helper can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
393+
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BI Developer Extensions can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
394394
return true;
395395
}
396396
else
@@ -440,7 +440,7 @@ private bool SwitchVsixManifest()
440440
regKey.Close();
441441
}
442442

443-
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BIDS Helper can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
443+
System.Windows.Forms.MessageBox.Show("You have SSDT for SQL Server " + VersionInfo.SqlServerFriendlyVersion + " installed. Please restart Visual Studio so BI Developer Extensions can reconfigure itself to work properly with that version of SSDT.", "BIDS Helper");
444444
return true;
445445
}
446446
else

Core/Options/BIDSHelperOptionsVersionCheckPage.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SQL2017_VS2017_BidsHelper.csproj.user

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@
99
<PropertyGroup>
1010
<ProjectView>ShowAllFiles</ProjectView>
1111
</PropertyGroup>
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
13+
<DeployTargetInstanceId />
14+
</PropertyGroup>
1215
</Project>

SQL2019_VS2017_BidsHelper.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,11 +750,13 @@
750750
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Project.DLL</HintPath>
751751
<Private>False</Private>
752752
</Reference>
753-
<Reference Include="Microsoft.AnalysisServices.Server.Tabular">
753+
<Reference Include="Microsoft.AnalysisServices.Server.Tabular, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
754+
<SpecificVersion>True</SpecificVersion>
754755
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Server.Tabular.dll</HintPath>
755756
<Private>False</Private>
756757
</Reference>
757-
<Reference Include="Microsoft.AnalysisServices.Server.Tabular.Json">
758+
<Reference Include="Microsoft.AnalysisServices.Server.Tabular.Json, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
759+
<SpecificVersion>True</SpecificVersion>
758760
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Server.Tabular.Json.dll</HintPath>
759761
<Private>False</Private>
760762
</Reference>
@@ -840,7 +842,7 @@
840842
<Private>False</Private>
841843
</Reference>
842844
<Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
843-
<SpecificVersion>False</SpecificVersion>
845+
<SpecificVersion>True</SpecificVersion>
844846
<HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
845847
<Private>False</Private>
846848
</Reference>

SSIS/DesignPracticesPlugin.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public override void Exec()
112112
Package package = win.PropertiesLinkComponent as Package;
113113
if (package == null) return;
114114

115+
PackageHelper.SetTargetServerVersion(package); //set the TargetServerVersion variable so that we can retrieve it later
116+
115117
Results results = new Results();
116118

117119
foreach (DesignPractice practice in _practices)

SSIS/PackageHelper.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ internal class PackageHelper
4040
/// The GUID is documented in the class Syntax section - https://technet.microsoft.com/en-gb/library/microsoft.sqlserver.dts.pipeline.wrapper.cmanagedcomponentwrapperclass(v=sql.105).aspx
4141
/// With newer versions, disassemble Microsoft.SqlServer.DTSPipelineWrap to find the GUID attribute on Microsoft.SqlServer.Dts.Pipeline.Wrapper.CManagedComponentWrapperClass
4242
/// </summary>
43-
#if SQL2017
43+
#if SQL2019
44+
public const string ManagedComponentWrapper = "{7CDF593F-DE06-4ABD-B356-7976EF7AC8E0}";
45+
#elif SQL2017
4446
public const string ManagedComponentWrapper = "{8DC69D45-2AD5-40C6-AAEC-25722F92D6FC}";
4547
#elif SQL2016
4648
public const string ManagedComponentWrapper = "{4F885D04-B578-47B7-94A0-DE9C7DA25EE2}";
@@ -97,6 +99,7 @@ internal static Application Application
9799
// Do nothing
98100
#else
99101
// SQL2016 or above, set the version
102+
if (targetServerVersion == 0) throw new Exception("TargetServerVersion not set. This function cannot proceed.");
100103
application.TargetServerVersion = (DTSTargetServerVersion)targetServerVersion;
101104
#endif
102105
}

SSIS/VariablesWindowPlugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public partial class VariablesWindowPlugin : BIDSHelperWindowActivatedPluginBase
2323
/// TODO: Make thks a base class, and inherit for variables and parameters window controls
2424
/// </summary>
2525
/// See vNextDebugCode comment below on how to get this GUID
26-
#if SQL2017
26+
#if SQL2017 //also good for SQL2019 in VS2017
2727
internal const string SSIS_VARIABLES_TOOL_WINDOW_KIND = "{DDC39177-57E8-413D-9382-9E92CE5DA83B}";
2828
#elif SQL2016
2929
internal const string SSIS_VARIABLES_TOOL_WINDOW_KIND = "{9F0B409F-14B8-4D44-AFD0-1099A3FB8BA3}";

0 commit comments

Comments
 (0)