diff --git a/src/FSharpSource.msbuildreferences.targets b/src/FSharpSource.msbuildreferences.targets
new file mode 100644
index 0000000000000000000000000000000000000000..289e37a8653eba23a46d60c999c1605eec412f98
--- /dev/null
+++ b/src/FSharpSource.msbuildreferences.targets
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- F# compiler has a depedency on MsBuild.  Different VS and F# Deployments carry various MsBuild versions  -->
+  <!-- This section sets the MsBuild references the compiler requires depending on the value of the environment variable  -->
+  <!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015 -->
+  <!-- By Default uses VS2013 values -->
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '14.0'">
+      <PropertyGroup>
+        <MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
+        <MsBuild_EngineReference>Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
+        <MsBuild_Reference>Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
+        <MsBuild_UtilitiesReference>Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
+        <MsBuild_TaskReference>Microsoft.Build.Tasks.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
+        <MsBuild_ConversionReference>Microsoft.Build.Conversion.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
+        <MsBuild_EngineReference>Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
+        <MsBuild_Reference>Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
+        <MsBuild_UtilitiesReference>Microsoft.Build.Utilities.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
+        <MsBuild_TaskReference>Microsoft.Build.Tasks.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
+        <MsBuild_ConversionReference>Microsoft.Build.Conversion.V12, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index dcd73965d396d56491f2097f3f797ba6e521315c..432d9bd995948661fb56cd97d1b0f1d0a09c6b0c 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -64,32 +64,7 @@
     </Otherwise>
   </Choose>
 
-  <!-- F# compiler has a depedency on MsBuild.  Different VS and F# Deployments carry various MsBuild versions  -->
-  <!-- This section sets the MsBuild references the compiler requires depending on the value of the environment variable  -->
-  <!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015 -->
-  <!-- By Default uses VS2013 values -->
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '14.0'">
-      <PropertyGroup>
-        <MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
-        <MsBuild_EngineReference>Microsoft.Build.Engine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
-        <MsBuild_Reference>Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
-        <MsBuild_UtilitiesReference>Microsoft.Build.Utilities.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
-        <MsBuild_TaskReference>Microsoft.Build.Tasks.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
-        <MsBuild_ConversionReference>Microsoft.Build.Conversion.core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <MsBuild_FrameworkReference>Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_FrameworkReference>
-        <MsBuild_EngineReference>Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_EngineReference>
-        <MsBuild_Reference>Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_Reference>
-        <MsBuild_UtilitiesReference>Microsoft.Build.Utilities.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_UtilitiesReference>
-        <MsBuild_TaskReference>Microsoft.Build.Tasks.V12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_TaskReference>
-        <MsBuild_ConversionReference>Microsoft.Build.Conversion.V12, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</MsBuild_ConversionReference>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <Import Project="FSharpSource.msbuildreferences.targets" />
 
   <!-- For the proto build, portable and Silverlight framework implementations, we don't use strong names. -->
   <!-- For Silverlight, there is no way to disable strong name verification, so using the Microsoft name is not possible -->
diff --git a/tests/RunTests.cmd b/tests/RunTests.cmd
index 0b7271be837e67911dfe8b5fb73c11836ae33f2f..0c77a9fd4e63707df0fd3a3ce36cf46ee4626825 100644
--- a/tests/RunTests.cmd
+++ b/tests/RunTests.cmd
@@ -2,8 +2,10 @@
 setlocal
 
 set FLAVOR=%1
-if /I "%FLAVOR%" == "debug" (goto :FLAVOR_OK)
-if /I "%FLAVOR%" == "release" (goto :FLAVOR_OK)
+if /I "%FLAVOR%" == "debug"     (goto :FLAVOR_OK)
+if /I "%FLAVOR%" == "release"   (goto :FLAVOR_OK)
+if /I "%FLAVOR%" == "vsdebug"   (goto :FLAVOR_OK)
+if /I "%FLAVOR%" == "vsrelease" (goto :FLAVOR_OK)
 goto :USAGE
 
 :flavor_ok
@@ -79,7 +81,7 @@ if /I "%2" == "ideunit" (goto :IDEUNIT)
 
 echo Usage:
 echo.
-echo RunTests.cmd ^<debug^|release^> ^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunit259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
+echo RunTests.cmd ^<debug^|release^|vsdebug^|vsrelease^> ^<fsharp^|fsharpqa^|coreunit^|coreunitportable47^|coreunitportable7^|coreunitportable78^|coreunit259^|ideunit^|compilerunit^> [TagToRun^|"Tags,To,Run"] [TagNotToRun^|"Tags,Not,To,Run"]
 echo.
 exit /b 1
 
diff --git a/vsintegration/src/Salsa/Salsa.fsproj b/vsintegration/src/Salsa/Salsa.fsproj
index 0f351196ec2c52b2d22bf883441313a410e59da0..b083a8449c33db3062e1152bc0972b1611be5baa 100644
--- a/vsintegration/src/Salsa/Salsa.fsproj
+++ b/vsintegration/src/Salsa/Salsa.fsproj
@@ -7,6 +7,7 @@
     <SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\fsharp.vsreferences.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -36,7 +37,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Windows.Forms" />
 
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="$(MsBuild_FrameworkReference)" />
     <Reference Include="$(MsBuild_EngineReference)" />
     <Reference Include="$(MsBuild_Reference)" />
diff --git a/vsintegration/src/fsharp.tools.targets b/vsintegration/src/fsharp.tools.targets
index ca298eee8e38bf6b084d44fd710a0af925a460aa..6d85f1485a37be493dedcdf2785e08264f08a656 100644
--- a/vsintegration/src/fsharp.tools.targets
+++ b/vsintegration/src/fsharp.tools.targets
@@ -5,29 +5,6 @@
   <Import Project="..\..\..\fsharp.tools.targets"  Condition="Exists('..\..\..\fsharp.tools.targets') And '$(DevDivBuild)' == 'true' " />
   <Import Project="..\..\src\FSharpSource.Settings.targets"  Condition="Exists('..\..\src\FSharpSource.Settings.targets')  And '$(DevDivBuild)' != 'true' " />
 
-  <!-- F# VS Addins have a depedency on VS.  Different VS and F# Deployments are dependent on various MsBuild versions  -->
-  <!-- This section sets the VS references the addins require depending on the value of the environment variable  -->
-  <!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015 -->
-  <!-- By Default uses VS2013 values -->
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '14.0'">
-      <PropertyGroup>
-        <VS_Shell_12_Reference>Microsoft.VisualStudio.Shell.12.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_12_Reference>
-        <VS_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UI_InternalReference>
-        <VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Utilities>
-        <VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <VS_Shell_12_Reference>Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_12_Reference>
-        <VS_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UI_InternalReference>
-        <VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Utilities>
-        <VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(DevDivBuild)' == ''" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
 
diff --git a/vsintegration/src/fsharp.vsreferences.targets b/vsintegration/src/fsharp.vsreferences.targets
new file mode 100644
index 0000000000000000000000000000000000000000..2b80e862d5fc8f5766736f3c67907eff7274a69e
--- /dev/null
+++ b/vsintegration/src/fsharp.vsreferences.targets
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- F# VS Addins have a depedency on VS.  Different VS and F# Deployments are dependent on various MsBuild versions  -->
+  <!-- This section sets the VS references the addins require depending on the value of the environment variable  -->
+  <!-- VisualStudioVersion, 12.0 for VS2013, 1 for VS2015 -->
+  <!-- By Default uses VS2013 values -->
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '14.0'">
+      <PropertyGroup>
+        <VS_Shell_Reference>Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Reference>
+        <VS_Shell_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_UI_InternalReference>
+        <VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UtilitiesReference>
+        <VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <VS_Shell_Reference>Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_Reference>
+        <VS_Shell_UI_InternalReference>Microsoft.VisualStudio.Shell.UI.Internal, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_Shell_UI_InternalReference>
+        <VS_UtilitiesReference>Microsoft.VisualStudio.Utilities, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_UtilitiesReference>
+        <VS_PackageLanguageServiceReference>Microsoft.VisualStudio.Package.LanguageService.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL</VS_PackageLanguageServiceReference>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/vsintegration/src/unittests/Unittests.fsproj b/vsintegration/src/unittests/Unittests.fsproj
index baaeb3935efa9a431231d62a45670316c3d82c61..10ce54b491c8ec5c91f5ba02eec100b3c5dac818 100644
--- a/vsintegration/src/unittests/Unittests.fsproj
+++ b/vsintegration/src/unittests/Unittests.fsproj
@@ -7,9 +7,9 @@
     <SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\fsharp.vsreferences.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform>x86</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -17,6 +17,7 @@
     <GenerateInterfaceFile>Unittests.fsi</GenerateInterfaceFile>
     <TargetType>LIBRARY</TargetType>
     <NoWarn>58;75</NoWarn>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(FSharpSourcesRoot)\fsharp\InternalCollections.fsi">
@@ -90,7 +91,7 @@
     <Reference Include="VSLangProj" />
     <Reference Include="VSLangProj80" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="Microsoft.VisualStudio.Threading" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
index ffa385837112d77cae52a4a2e0b899991216f9cd..f367d8cc264ede908b56b4aec391a4dde887ac3d 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Editor/FSharp.Editor.fsproj
@@ -7,6 +7,7 @@
     <SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\fsharp.vsreferences.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
index f5e7246bf87e6a68d0d18cefa02b1754e74f9226..bdefd798be8e0e750466937c79b064f0fcb7cce7 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
@@ -37,9 +37,10 @@
     <DelaySign>true</DelaySign>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\..\fsharp.vsreferences.targets" />
   <ItemGroup>
-    <Reference Include=$(MsBuild_FrameworkReference) />
-    <Reference Include=$(MsBuild_EngineReference) />
+    <Reference Include="$(MsBuild_FrameworkReference)" />
+    <Reference Include="$(MsBuild_EngineReference)" />
     <Reference Include="microsoft.msxml" />
     <Reference Include="System.Drawing" />
     <Reference Include="System" />
@@ -52,7 +53,7 @@
     <Reference Include="VSLangProj" />
     <Reference Include="VSLangProj80" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
index ba2a4cf60efe7a9da3278468851d343a6e1ba7b1..f41774823dfffd1269e7dd4b6f67a7c06a5c5f71 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -21,6 +21,7 @@
     <SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\fsharp.vsreferences.targets" />
   <ItemGroup>
     <EmbeddedResource Include="VSPackage.resx" />
     <EmbeddedResource Include="FSLangSvcStrings.resx" />
@@ -57,14 +58,14 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include=$(MsBuild_FrameworkReference) />
-    <Reference Include=$(MsBuild_EngineReference) />
+    <Reference Include="$(MsBuild_FrameworkReference)" />
+    <Reference Include="$(MsBuild_EngineReference)" />
     <Reference Include="EnvDTE.dll" />
     <Reference Include="EnvDTE80.dll" />
     <Reference Include="VSLangProj" />
     <Reference Include="VSLangProj80" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="Microsoft.VisualStudio.Threading" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj b/vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj
index 451074cd97b25ec43539d4541a0437114fd2c9fb..0a60c392e37a25481ae015caa6556762f870866a 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectSystem.Base.csproj
@@ -29,6 +29,8 @@
     <TargetFrameworkProfile></TargetFrameworkProfile>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(FSharpSourcesRoot)\FSharpSource.msbuildreferences.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\..\..\fsharp.vsreferences.targets" />
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
@@ -61,7 +63,7 @@
     <Reference Include="VSLangProj80" />
     <Reference Include="microsoft.visualstudio.vcprojectengine" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
index 44e44918d7ae0da195c1250f8296b3c6a2813ec9..b3c23bf11b36ea0447cfba531c5c39578d254333 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
@@ -25,6 +25,7 @@
     <SIGN_WITH_MSFT_KEY>true</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\..\fsharp.vsreferences.targets" />
   <ItemGroup>
     <RCResourceFile Include="..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\ProjectResources.rc">
       <Link>ProjectResources.rc</Link>
@@ -71,9 +72,9 @@
     <Reference Include="$(MsBuild_EngineReference)" />
     <Reference Include="$(MsBuild_Reference)" />
     <Reference Include="$(MsBuild_UtilitiesReference)" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="$(VS_Shell_UI_InternalReference)" />
-    <Reference Include="$(VS_Shell_UtilitiesReference)" />
+    <Reference Include="$(VS_UtilitiesReference)" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj b/vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj
index 60525190f9b6bf292431b3d9ec6e8589775d7d8b..26d5756b9515c194d06da3459214809d948cac21 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Project/VB/FSharpPropPage/FSharp.PropertiesPages.vbproj
@@ -47,6 +47,7 @@
     <DelaySign>true</DelaySign>
   </PropertyGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+  <Import Project="$(ProjectDirectory)..\..\..\..\..\fsharp.vsreferences.targets" />
   <ItemGroup>
     <Reference Include="envdte.dll" />
     <Reference Include="envdte80.dll" />
@@ -59,7 +60,7 @@
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0.dll" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0.dll" />
-    <Reference Include="$(VS_Shell_12_Reference)" />
+    <Reference Include="$(VS_Shell_Reference)" />
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
     <Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
     <Reference Include="Microsoft.VisualStudio.WCFReference.Interop.dll" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
index f921d0fef04d51c4922d9565599a3e3ff70e87c0..53d52e411870e6f1318cd5a9d65ac7633426027b 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
@@ -8,6 +8,7 @@
         <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     </PropertyGroup>
     <Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
+    <Import Project="$(ProjectDirectory)..\..\..\fsharp.vsreferences.targets" />
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -45,7 +46,7 @@
         <Reference Include="VSLangProj" />
         <Reference Include="VSLangProj80" />
         <Reference Include="Microsoft.VisualStudio.OLE.Interop.dll" />
-        <Reference Include="$(VS_Shell_12_Reference)" />
+        <Reference Include="$(VS_Shell_Reference)" />
         <Reference Include="Microsoft.VisualStudio.Threading" />
         <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0.dll" />
         <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0.dll" />