diff --git a/tools/EFToolsVsReferences.settings.targets b/tools/EFToolsVsReferences.settings.targets
index d6131060be..e1d53cb059 100644
--- a/tools/EFToolsVsReferences.settings.targets
+++ b/tools/EFToolsVsReferences.settings.targets
@@ -12,4 +12,7 @@
     <Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.14.0" />
     <Reference Include="Microsoft.VisualStudio.TextTemplating.14.0" />
   </ItemGroup>
+  <ItemGroup Condition="$(VisualStudioVersion)=='15.0'">
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets
index 04b2065042..4de337a4d6 100644
--- a/tools/EntityFramework.settings.targets
+++ b/tools/EntityFramework.settings.targets
@@ -24,8 +24,8 @@ Project global pre-settings.
     <VersionReleasePrefix>0</VersionReleasePrefix>
     <VersionRelease>$(VersionReleasePrefix)-beta1</VersionRelease>
     <VersionReleaseName>Beta 1</VersionReleaseName>
-    <ToolingDotNetFrameworkVersion Condition="'$(VisualStudioVersion)' == '15.0'">v4.5.1</ToolingDotNetFrameworkVersion>
-    <ToolingDotNetFrameworkVersion Condition="'$(VisualStudioVersion)' != '15.0'">v4.5</ToolingDotNetFrameworkVersion>
+    <ToolingDotNetFrameworkVersion Condition="'$(VisualStudioVersion)' == '11.0' OR '$(VisualStudioVersion)' == '12.0' OR '$(VisualStudioVersion)' == '14.0'">v4.5</ToolingDotNetFrameworkVersion>
+    <ToolingDotNetFrameworkVersion Condition="'$(ToolingDotNetFrameworkVersion)' == ''">v4.6</ToolingDotNetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tools/VsIdeHostAdapter/TargetAddIn/VsIdeTestHostAddin.csproj b/tools/VsIdeHostAdapter/TargetAddIn/VsIdeTestHostAddin.csproj
index ecc4c56a7d..197f9fe991 100644
--- a/tools/VsIdeHostAdapter/TargetAddIn/VsIdeTestHostAddin.csproj
+++ b/tools/VsIdeHostAdapter/TargetAddIn/VsIdeTestHostAddin.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.VisualStudio.TestTools.HostAdapters.VsIde</RootNamespace>
     <AssemblyName>Microsoft.VisualStudio.QualityTools.HostAdapters.VsIdeAddIn</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>$(ToolingDotNetFrameworkVersion)</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>