From f13075263e06a9b2639365f849a5adbabe1a4ae7 Mon Sep 17 00:00:00 2001
From: Ed Elliott <goeddieuk@gmail.com>
Date: Wed, 3 May 2017 21:50:39 +0100
Subject: [PATCH] using the vs 14.0 version of the shell - has to be from vs
 2015 install dir, the one included with vs 2017 is actually version 15.0!

---
 .../src/SSDTDevPack.Common/SSDTDevPack.Common.csproj      | 8 ++++++--
 src/Common/src/SSDTDevPack.Common/app.config              | 8 ++++++++
 src/Common/src/SSDTDevPack.Common/packages.config         | 1 +
 .../SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj    | 8 ++++++--
 src/Merge/src/SSDTDevPack.VSPackage/app.config            | 8 ++++++++
 src/Merge/src/SSDTDevPack.VSPackage/packages.config       | 1 +
 .../SSDTDevPack.VSPackage/source.extension.vsixmanifest   | 4 ++--
 src/SSDTDevPack.CodeCoverage/App.config                   | 8 ++++++++
 .../Common/SSDTDevPack.Common.IntegrationTests/app.config | 8 ++++++++
 src/Test/Common/SSDTDevPack.Common.UnitTests/app.config   | 8 ++++++++
 src/Test/Common/SqlConnectionTest/App.config              | 8 ++++++++
 .../NameConstraints.IntegrationTests/app.config           | 8 ++++++++
 .../QueryCost/SSDTDevPack.QueryCosts.UnitTests/app.config | 8 ++++++++
 13 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj b/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
index db43a16..710d336 100644
--- a/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
+++ b/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
@@ -104,14 +104,18 @@
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25413-Preview5\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
       <Private>True</Private>
diff --git a/src/Common/src/SSDTDevPack.Common/app.config b/src/Common/src/SSDTDevPack.Common/app.config
index b5904cd..9223144 100644
--- a/src/Common/src/SSDTDevPack.Common/app.config
+++ b/src/Common/src/SSDTDevPack.Common/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/Common/src/SSDTDevPack.Common/packages.config b/src/Common/src/SSDTDevPack.Common/packages.config
index acedcae..9145507 100644
--- a/src/Common/src/SSDTDevPack.Common/packages.config
+++ b/src/Common/src/SSDTDevPack.Common/packages.config
@@ -7,6 +7,7 @@
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25413-Preview5" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj b/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
index 03a0a79..cd1f8d4 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
+++ b/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
@@ -133,15 +133,19 @@
       <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25413-Preview5\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
       <Private>True</Private>
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/app.config b/src/Merge/src/SSDTDevPack.VSPackage/app.config
index b5904cd..9223144 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/app.config
+++ b/src/Merge/src/SSDTDevPack.VSPackage/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/packages.config b/src/Merge/src/SSDTDevPack.VSPackage/packages.config
index 20e8287..25d655b 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/packages.config
+++ b/src/Merge/src/SSDTDevPack.VSPackage/packages.config
@@ -7,6 +7,7 @@
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.SDK.VsixSuppression" version="14.0.50420-pre" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25413-Preview5" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest b/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
index f2774f5..d4103fe 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
+++ b/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
@@ -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="354e4235-c369-4a8f-a855-0318891c0903" Version="0.2.0.2" Language="en-US" Publisher="EdElliott" />
+    <Identity Id="354e4235-c369-4a8f-a855-0318891c0903" Version="0.2.0.4" Language="en-US" Publisher="EdElliott" />
     <DisplayName>SSDTDevPack</DisplayName>
     <Description xml:space="preserve">The Agile SQL Club devpack, tools to help SSDT database projects + dacpacs. Includes MergUi
     </Description>
@@ -17,7 +17,7 @@
     <Dependency Id="Microsoft.VisualStudio.MPF.12.0" DisplayName="Visual Studio MPF 12.0" d:Source="Installed" Version="[12.0,14.0]" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup;|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" Path="|SSDTDevPack.Common|" d:ProjectName="SSDTDevPack.Common" />
   </Assets>
   <Prerequisites>
diff --git a/src/SSDTDevPack.CodeCoverage/App.config b/src/SSDTDevPack.CodeCoverage/App.config
index dca2583..44aa8c3 100644
--- a/src/SSDTDevPack.CodeCoverage/App.config
+++ b/src/SSDTDevPack.CodeCoverage/App.config
@@ -9,6 +9,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/app.config b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/app.config
index b5904cd..9223144 100644
--- a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/app.config
+++ b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/Test/Common/SSDTDevPack.Common.UnitTests/app.config b/src/Test/Common/SSDTDevPack.Common.UnitTests/app.config
index b5904cd..9223144 100644
--- a/src/Test/Common/SSDTDevPack.Common.UnitTests/app.config
+++ b/src/Test/Common/SSDTDevPack.Common.UnitTests/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/Test/Common/SqlConnectionTest/App.config b/src/Test/Common/SqlConnectionTest/App.config
index dca2583..44aa8c3 100644
--- a/src/Test/Common/SqlConnectionTest/App.config
+++ b/src/Test/Common/SqlConnectionTest/App.config
@@ -9,6 +9,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/Test/NameConstraints/NameConstraints.IntegrationTests/app.config b/src/Test/NameConstraints/NameConstraints.IntegrationTests/app.config
index b5904cd..9223144 100644
--- a/src/Test/NameConstraints/NameConstraints.IntegrationTests/app.config
+++ b/src/Test/NameConstraints/NameConstraints.IntegrationTests/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/app.config b/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/app.config
index b5904cd..9223144 100644
--- a/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/app.config
+++ b/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/app.config
@@ -6,6 +6,14 @@
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>