diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index 0253f23c9c58ffd12452155fb2f5f9c7e1445593..168108294b0ac9cb2a9b0e56da4345c111cd939b 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -60,6 +60,9 @@
     <IsDev15RC Condition="Exists('$(MSBuildBinPath)\..\..\..\..\Common7\IDE\Microsoft.VisualStudio.ExtensionEngine.dll')">true</IsDev15RC>
     <DeployExtension Condition="'$(IsDev15RC)' != 'true' or '$(VisualStudioVersion)' != '15.0'">false</DeployExtension>
     <VisualStudioBuildToolsVersion>15.0.25907-RC2</VisualStudioBuildToolsVersion>
+
+    <!-- For the moment our Dev14 VSI suites must continue to use the Dev14 SDK. -->
+    <VisualStudioBuildToolsVersion Condition="'$(IsDev14VsiBuild)' == 'true'">14.3.25420</VisualStudioBuildToolsVersion>
   </PropertyGroup>
 
   <!-- Unix specific settings -->
diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
index a7764bb7e2bf547a1496057ceb655775381fdd79..3aefe9dc920a9fa71273d4cf7ba56cd7341244dd 100644
--- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
+++ b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
@@ -14,7 +14,12 @@
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
     <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
-    <ImportVSSDKTargets>true</ImportVSSDKTargets>
+
+    <!-- This VSIX must be compiled with the Dev15 SDK due to the specific 
+         set of references it uses.  Yet when doing so it can't link in all
+         of the Dev14 VSIX that we are creating.  Hence when building specifically
+         for Dev14 do not build this as a VSIX.  -->
+    <ImportVSSDKTargets Condition="'$(IsDev14VsiBuild)' != 'true'">true</ImportVSSDKTargets>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <CopyNuGetImplementations>true</CopyNuGetImplementations>
     <DeployExtension Condition="'$(VisualStudioVersion)' == '14.0'">false</DeployExtension>
@@ -107,4 +112,4 @@
     <Compile Include="AssemblyRedirects.cs" />
   </ItemGroup>
   <Import Project="..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>