From 1230c02c2d22a494139fb48ceb56b2773d5db1c3 Mon Sep 17 00:00:00 2001
From: Alex Fedotov <me@alexfedotov.com>
Date: Thu, 5 Nov 2015 10:38:34 -0800
Subject: [PATCH] Producing contract reference assemblies for .NET Framework
 4.6

---
 ...crosoft.VisualBasic.Compatibility10.vbproj |   4 +-
 .../Microsoft.VisualBasic10.vbproj            |   4 +-
 .../MsCorlib/MsCorlib.Contracts10.csproj      |   4 +-
 .../Contracts/Multitarget.targets             |   9 +-
 .../PresentationCore/PresentationCore.csproj  |   4 +-
 .../PresentationFramework.csproj              |   4 +-
 .../System.ComponentModel.Composition.csproj  |   4 +-
 .../System.Configuration.Install10.csproj     |   4 +-
 .../System.Configuration10.csproj             |   4 +-
 .../System.Core.Contracts10.csproj            |   4 +-
 .../Contracts/System.Core/System.Core.csproj  |   5 +-
 .../System.Data.Services.csproj               |   4 +-
 .../System.Data/System.Data10.csproj          |   4 +-
 .../System.DirectoryServices.csproj           |   4 +-
 .../System.Drawing/System.Drawing10.csproj    |   4 +-
 .../System.Numerics/System.Numerics.csproj    |   4 +-
 .../System.Runtime.Caching.csproj             |   4 +-
 .../System.Security/System.Security10.csproj  |   4 +-
 .../System.ServiceModel.csproj                |   4 +-
 .../System.ServiceProcess.csproj              |   4 +-
 .../System.Web.ApplicationServices.csproj     |   4 +-
 .../Contracts/System.Web/System.Web10.csproj  |   4 +-
 .../System.Windows.Forms10.csproj             |   4 +-
 .../System.Xml.Linq/System.Xml.Linq10.csproj  |   4 +-
 .../Contracts/System.Xml/System.Xml10.csproj  |   4 +-
 .../System/System.Contracts10.csproj          |   4 +-
 .../WindowsBase/WindowsBase10.csproj          |   4 +-
 .../Microsoft.CodeContractAnalysis.targets    |   2 +-
 .../v14.0/Microsoft.CodeContracts.targets     |   6 +-
 .../ManagedContracts.wxs                      | 108 ++++++++++++++++++
 30 files changed, 172 insertions(+), 58 deletions(-)

diff --git a/Microsoft.Research/Contracts/Microsoft.VisualBasic.Compatibility/Microsoft.VisualBasic.Compatibility10.vbproj b/Microsoft.Research/Contracts/Microsoft.VisualBasic.Compatibility/Microsoft.VisualBasic.Compatibility10.vbproj
index dacb53ff..589c622f 100644
--- a/Microsoft.Research/Contracts/Microsoft.VisualBasic.Compatibility/Microsoft.VisualBasic.Compatibility10.vbproj
+++ b/Microsoft.Research/Contracts/Microsoft.VisualBasic.Compatibility/Microsoft.VisualBasic.Compatibility10.vbproj
@@ -164,8 +164,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <PropertyGroup>
     <ContractReferenceOutputPathRoot>..\$(OutputPath)</ContractReferenceOutputPathRoot>
diff --git a/Microsoft.Research/Contracts/Microsoft.VisualBasic.Contracts/Microsoft.VisualBasic10.vbproj b/Microsoft.Research/Contracts/Microsoft.VisualBasic.Contracts/Microsoft.VisualBasic10.vbproj
index 5300fdae..379d003a 100644
--- a/Microsoft.Research/Contracts/Microsoft.VisualBasic.Contracts/Microsoft.VisualBasic10.vbproj
+++ b/Microsoft.Research/Contracts/Microsoft.VisualBasic.Contracts/Microsoft.VisualBasic10.vbproj
@@ -168,8 +168,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <PropertyGroup>
     <ContractReferenceOutputPathRoot>..\$(OutputPath)</ContractReferenceOutputPathRoot>
diff --git a/Microsoft.Research/Contracts/MsCorlib/MsCorlib.Contracts10.csproj b/Microsoft.Research/Contracts/MsCorlib/MsCorlib.Contracts10.csproj
index 9055a5be..fb0fc411 100644
--- a/Microsoft.Research/Contracts/MsCorlib/MsCorlib.Contracts10.csproj
+++ b/Microsoft.Research/Contracts/MsCorlib/MsCorlib.Contracts10.csproj
@@ -1238,8 +1238,8 @@ Include="System.Security.Principal.WindowsIdentity.cs" /> -->
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/Multitarget.targets b/Microsoft.Research/Contracts/Multitarget.targets
index d42810a7..27ee22a3 100644
--- a/Microsoft.Research/Contracts/Multitarget.targets
+++ b/Microsoft.Research/Contracts/Multitarget.targets
@@ -23,7 +23,8 @@
      SILVERLIGHT;SILVERLIGHT_5_0
      NETFRAMEWORK;NETFRAMEWORK_3_5
      NETFRAMEWORK;NETFRAMEWORK_4_0
-     NETFRAMEWORK;NETFRAMEWORK_4_5
+     NETFRAMEWORK;NETFRAMEWORK_4_0;NETFRAMEWORK_4_5
+     NETFRAMEWORK;NETFRAMEWORK_4_0;NETFRAMEWORK_4_5;NETFRAMEWORK_4_6
 
   ======================================================================-->
   <Import Project="AsmMeta.MsBuild.Tasks"/>
@@ -82,6 +83,12 @@
       <TargetDefinesVB>NETFRAMEWORK=-1%2CNETFRAMEWORK_4_0=-1%2CNETFRAMEWORK_4_5=-1</TargetDefinesVB>
       <TargetDir>.NETFramework\v4.5\</TargetDir>
     </ReferenceAssemblyDirectories>
+    <ReferenceAssemblyDirectories Include="Microsoft\Framework\.NETFramework\v4.6\Target">
+      <TargetFramework>NetFramework</TargetFramework>
+      <TargetDefinesCS>NETFRAMEWORK%3BNETFRAMEWORK_4_0%3BNETFRAMEWORK_4_5%3BNETFRAMEWORK_4_6</TargetDefinesCS>
+      <TargetDefinesVB>NETFRAMEWORK=-1%2CNETFRAMEWORK_4_0=-1%2CNETFRAMEWORK_4_5=-1%2CNETFRAMEWORK_4_6=-1</TargetDefinesVB>
+      <TargetDir>.NETFramework\v4.6\</TargetDir>
+    </ReferenceAssemblyDirectories>
   </ItemGroup>
 
 
diff --git a/Microsoft.Research/Contracts/PresentationCore/PresentationCore.csproj b/Microsoft.Research/Contracts/PresentationCore/PresentationCore.csproj
index 826e07ee..acddc2eb 100644
--- a/Microsoft.Research/Contracts/PresentationCore/PresentationCore.csproj
+++ b/Microsoft.Research/Contracts/PresentationCore/PresentationCore.csproj
@@ -106,8 +106,8 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.Windows.Markup.IUriContext.cs" />
diff --git a/Microsoft.Research/Contracts/PresentationFramework/PresentationFramework.csproj b/Microsoft.Research/Contracts/PresentationFramework/PresentationFramework.csproj
index ef67d244..2bff1593 100644
--- a/Microsoft.Research/Contracts/PresentationFramework/PresentationFramework.csproj
+++ b/Microsoft.Research/Contracts/PresentationFramework/PresentationFramework.csproj
@@ -104,8 +104,8 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.Windows.Application.cs" />
diff --git a/Microsoft.Research/Contracts/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj b/Microsoft.Research/Contracts/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj
index 56de059e..4cea2448 100644
--- a/Microsoft.Research/Contracts/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj
+++ b/Microsoft.Research/Contracts/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj
@@ -105,8 +105,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.ComponentModel.Composition.Primitives.ComposablePart.cs" />
diff --git a/Microsoft.Research/Contracts/System.Configuration.Install/System.Configuration.Install10.csproj b/Microsoft.Research/Contracts/System.Configuration.Install/System.Configuration.Install10.csproj
index 9b3ff617..22d73afb 100644
--- a/Microsoft.Research/Contracts/System.Configuration.Install/System.Configuration.Install10.csproj
+++ b/Microsoft.Research/Contracts/System.Configuration.Install/System.Configuration.Install10.csproj
@@ -181,8 +181,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PreContractsBuildDummy\PreContractsBuildDummy.csproj">
diff --git a/Microsoft.Research/Contracts/System.Configuration/System.Configuration10.csproj b/Microsoft.Research/Contracts/System.Configuration/System.Configuration10.csproj
index f202ef94..947a9bde 100644
--- a/Microsoft.Research/Contracts/System.Configuration/System.Configuration10.csproj
+++ b/Microsoft.Research/Contracts/System.Configuration/System.Configuration10.csproj
@@ -215,8 +215,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Core.Contracts/System.Core.Contracts10.csproj b/Microsoft.Research/Contracts/System.Core.Contracts/System.Core.Contracts10.csproj
index dd4ea6ca..dcd063a5 100644
--- a/Microsoft.Research/Contracts/System.Core.Contracts/System.Core.Contracts10.csproj
+++ b/Microsoft.Research/Contracts/System.Core.Contracts/System.Core.Contracts10.csproj
@@ -257,8 +257,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Core/System.Core.csproj b/Microsoft.Research/Contracts/System.Core/System.Core.csproj
index 98ebb237..75dba732 100644
--- a/Microsoft.Research/Contracts/System.Core/System.Core.csproj
+++ b/Microsoft.Research/Contracts/System.Core/System.Core.csproj
@@ -18,9 +18,8 @@
   <CodeContractsCheckReferenceAssembly>true</CodeContractsCheckReferenceAssembly>
 </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v4.5\Target;Microsoft\Framework\v3.5\Target"/>
-
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v4.5\Target;Microsoft\Framework\v3.5\Target"/>
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
 <ItemGroup>
 	<Compile Include = "Sources\System.Diagnostics.Eventing.EventDescriptor.cs" />
diff --git a/Microsoft.Research/Contracts/System.Data.Services/System.Data.Services.csproj b/Microsoft.Research/Contracts/System.Data.Services/System.Data.Services.csproj
index 59872b95..411043e5 100644
--- a/Microsoft.Research/Contracts/System.Data.Services/System.Data.Services.csproj
+++ b/Microsoft.Research/Contracts/System.Data.Services/System.Data.Services.csproj
@@ -111,8 +111,8 @@
     </DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.Data.Services.Providers.DataServiceProviderMethods.cs" />
diff --git a/Microsoft.Research/Contracts/System.Data/System.Data10.csproj b/Microsoft.Research/Contracts/System.Data/System.Data10.csproj
index ad5a0c14..30131e2f 100644
--- a/Microsoft.Research/Contracts/System.Data/System.Data10.csproj
+++ b/Microsoft.Research/Contracts/System.Data/System.Data10.csproj
@@ -250,8 +250,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.DirectoryServices/System.DirectoryServices.csproj b/Microsoft.Research/Contracts/System.DirectoryServices/System.DirectoryServices.csproj
index 8818a6c1..e3ddeddb 100644
--- a/Microsoft.Research/Contracts/System.DirectoryServices/System.DirectoryServices.csproj
+++ b/Microsoft.Research/Contracts/System.DirectoryServices/System.DirectoryServices.csproj
@@ -104,8 +104,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target;Microsoft\Framework\v3.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\.NETFramework\v4.5\Profile\Client\Target;Microsoft\Framework\v3.5\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.DirectoryServices.ActiveDirectoryAccessRule.cs" />
diff --git a/Microsoft.Research/Contracts/System.Drawing/System.Drawing10.csproj b/Microsoft.Research/Contracts/System.Drawing/System.Drawing10.csproj
index 5b58b8ca..1b464640 100644
--- a/Microsoft.Research/Contracts/System.Drawing/System.Drawing10.csproj
+++ b/Microsoft.Research/Contracts/System.Drawing/System.Drawing10.csproj
@@ -212,8 +212,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Numerics/System.Numerics.csproj b/Microsoft.Research/Contracts/System.Numerics/System.Numerics.csproj
index 2f40ad48..5f9ba886 100644
--- a/Microsoft.Research/Contracts/System.Numerics/System.Numerics.csproj
+++ b/Microsoft.Research/Contracts/System.Numerics/System.Numerics.csproj
@@ -182,8 +182,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Foxtrot\Contracts\Microsoft.Contracts10.csproj">
diff --git a/Microsoft.Research/Contracts/System.Runtime.Caching/System.Runtime.Caching.csproj b/Microsoft.Research/Contracts/System.Runtime.Caching/System.Runtime.Caching.csproj
index 7cf017f5..22823e35 100644
--- a/Microsoft.Research/Contracts/System.Runtime.Caching/System.Runtime.Caching.csproj
+++ b/Microsoft.Research/Contracts/System.Runtime.Caching/System.Runtime.Caching.csproj
@@ -104,8 +104,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.Runtime.Caching.CacheEntryChangeMonitor.cs" />
diff --git a/Microsoft.Research/Contracts/System.Security/System.Security10.csproj b/Microsoft.Research/Contracts/System.Security/System.Security10.csproj
index 556dda8e..90f87630 100644
--- a/Microsoft.Research/Contracts/System.Security/System.Security10.csproj
+++ b/Microsoft.Research/Contracts/System.Security/System.Security10.csproj
@@ -190,8 +190,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.ServiceModel/System.ServiceModel.csproj b/Microsoft.Research/Contracts/System.ServiceModel/System.ServiceModel.csproj
index 25fd569c..c372722c 100644
--- a/Microsoft.Research/Contracts/System.ServiceModel/System.ServiceModel.csproj
+++ b/Microsoft.Research/Contracts/System.ServiceModel/System.ServiceModel.csproj
@@ -105,8 +105,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.ServiceModel.Configuration.HttpBindingBaseElement.cs" />
diff --git a/Microsoft.Research/Contracts/System.ServiceProcess/System.ServiceProcess.csproj b/Microsoft.Research/Contracts/System.ServiceProcess/System.ServiceProcess.csproj
index 097b1432..f2958d8d 100644
--- a/Microsoft.Research/Contracts/System.ServiceProcess/System.ServiceProcess.csproj
+++ b/Microsoft.Research/Contracts/System.ServiceProcess/System.ServiceProcess.csproj
@@ -103,8 +103,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\v3.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\v3.5\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.ServiceProcess.ServiceBase.cs">
diff --git a/Microsoft.Research/Contracts/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj b/Microsoft.Research/Contracts/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
index 20e2dab3..d3ff425f 100644
--- a/Microsoft.Research/Contracts/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
+++ b/Microsoft.Research/Contracts/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
@@ -103,8 +103,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Sources\System.Web.Security.IMembershipAdapter.cs" />
diff --git a/Microsoft.Research/Contracts/System.Web/System.Web10.csproj b/Microsoft.Research/Contracts/System.Web/System.Web10.csproj
index 5527292e..efe394bc 100644
--- a/Microsoft.Research/Contracts/System.Web/System.Web10.csproj
+++ b/Microsoft.Research/Contracts/System.Web/System.Web10.csproj
@@ -380,8 +380,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Windows.Forms/System.Windows.Forms10.csproj b/Microsoft.Research/Contracts/System.Windows.Forms/System.Windows.Forms10.csproj
index e81b594d..6885f348 100644
--- a/Microsoft.Research/Contracts/System.Windows.Forms/System.Windows.Forms10.csproj
+++ b/Microsoft.Research/Contracts/System.Windows.Forms/System.Windows.Forms10.csproj
@@ -263,8 +263,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Xml.Linq/System.Xml.Linq10.csproj b/Microsoft.Research/Contracts/System.Xml.Linq/System.Xml.Linq10.csproj
index e99ea13f..4584d66d 100644
--- a/Microsoft.Research/Contracts/System.Xml.Linq/System.Xml.Linq10.csproj
+++ b/Microsoft.Research/Contracts/System.Xml.Linq/System.Xml.Linq10.csproj
@@ -219,8 +219,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System.Xml/System.Xml10.csproj b/Microsoft.Research/Contracts/System.Xml/System.Xml10.csproj
index daf231cf..1157a68b 100644
--- a/Microsoft.Research/Contracts/System.Xml/System.Xml10.csproj
+++ b/Microsoft.Research/Contracts/System.Xml/System.Xml10.csproj
@@ -256,8 +256,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/System/System.Contracts10.csproj b/Microsoft.Research/Contracts/System/System.Contracts10.csproj
index 596dd440..cd0fa43b 100644
--- a/Microsoft.Research/Contracts/System/System.Contracts10.csproj
+++ b/Microsoft.Research/Contracts/System/System.Contracts10.csproj
@@ -676,8 +676,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target;Microsoft\Framework\Silverlight\v3.0\Target;Microsoft\Framework\Silverlight\v4.0\Target;Microsoft\Framework\Silverlight\v4.0\Profile\WindowsPhone\Target;Microsoft\Framework\Silverlight\v5.0\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/Contracts/WindowsBase/WindowsBase10.csproj b/Microsoft.Research/Contracts/WindowsBase/WindowsBase10.csproj
index a5974bca..6b833945 100644
--- a/Microsoft.Research/Contracts/WindowsBase/WindowsBase10.csproj
+++ b/Microsoft.Research/Contracts/WindowsBase/WindowsBase10.csproj
@@ -221,8 +221,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target" />
-    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;..\$(OutputPath)" />
+    <BuildTargetList Include="Microsoft\Framework\v3.5\Target;Microsoft\Framework\.NETFramework\v4.0\Target;Microsoft\Framework\.NETFramework\v4.5\Target;Microsoft\Framework\.NETFramework\v4.6\Target" />
+    <MultiTargetReferencePaths Include="..\..\Imported\ReferenceAssemblies\;$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\;..\$(OutputPath)" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
index 385b0722..a87efedd 100644
--- a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
+++ b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
@@ -220,7 +220,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <_CodeContractsCCCheckArguments>-nobox -nologo -nopex -remote  -suggest=!! -premode combined -suggest codefixes -framework:$(TargetFrameworkVersion) -warninglevel $(CodeContractsAnalysisWarning) $(CodeContractCodeAnalysisOptions) "-resolvedPaths:@(ReferencePath)" "-libPaths:@(CodeContractsAllLibPaths) " "$(DeclarativeAssemblyPath)"</_CodeContractsCCCheckArguments>
+      <_CodeContractsCCCheckArguments>-nobox -nologo -nopex -remote  -suggest=!! -premode combined -suggest codefixes -framework:$(TargetFrameworkVersion) -warninglevel $(CodeContractsAnalysisWarning) $(CodeContractCodeAnalysisOptions) "-resolvedPaths:@(ReferencePath)" "-libPaths:@(CodeContractsAllLibPaths)" "$(DeclarativeAssemblyPath)"</_CodeContractsCCCheckArguments>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
index 6e56b415..ce4ce6ab 100644
--- a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
+++ b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
@@ -67,10 +67,10 @@
         </When>        
         <When Condition="'$(TargetFrameworkVersion)' == 'v4.6'">
           <PropertyGroup>
-            <CodeContractsReferenceAssemblyLibPath>$(CodeContractsInstallDir)Contracts\.NETFramework\v4.5</CodeContractsReferenceAssemblyLibPath>
+            <CodeContractsReferenceAssemblyLibPath>$(CodeContractsInstallDir)Contracts\.NETFramework\v4.6</CodeContractsReferenceAssemblyLibPath>
           </PropertyGroup>
-        </When>        
-				<Otherwise>
+        </When>
+        <Otherwise>
           <PropertyGroup>
             <CodeContractsReferenceAssemblyLibPath>$(CodeContractsInstallDir)Contracts\v3.5</CodeContractsReferenceAssemblyLibPath>
           </PropertyGroup>
diff --git a/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs b/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
index a3a42b0f..455ba568 100644
--- a/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
+++ b/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
@@ -71,6 +71,7 @@
 <?define var.EnvironmentVariablesCompGuid     = "{990ACAFB-1AAE-4fa6-A178-9BF28206012F}" ?>
 <?define var.OutOfBandCompGuid40              = "{990ACAFC-1AAE-4fa6-A178-9BF28206012F}" ?>
 <?define var.OutOfBandCompGuid45              = "{990ACAFD-1AAE-4fa6-A178-9BF28206012F}" ?>
+<?define var.OutOfBandCompGuid46              = "{990ACB0D-1AAE-4fa6-A178-9BF28206012F}" ?>
 <?define var.OutOfBandCompGuidSL30            = "{990ACAFE-1AAE-4fa6-A178-9BF28206012F}" ?>
 <?define var.OutOfBandCompGuidSL40            = "{990ACAFF-1AAE-4fa6-A178-9BF28206012F}" ?>
 <?define var.OutOfBandCompGuidSL50            = "{990ACB03-1AAE-4fa6-A178-9BF28206012F}" ?>
@@ -670,6 +671,112 @@
                        Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.5\$(var.WindowsBaseContracts)' Vital='yes'/>
                   </Component>
                 </Directory>
+                <Directory Id='OUTOFBANDDIR46' Name='v4.6'>
+                  <Component Id='OutOfBandContracts46' Guid='$(var.OutOfBandCompGuid46)'>
+                    <File
+                       Id='$(var.MicrosoftVBCompatContracts)46'
+                       Name='$(var.MicrosoftVBCompatContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.MicrosoftVBCompatContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.MSFTVBContracts)46'
+                       Name='$(var.MSFTVBContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.MSFTVBContracts)'
+                       Vital='yes'/>
+                    <File
+                       Id='$(var.mscorlibContracts)46'
+                       Name='$(var.mscorlibContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.mscorlibContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.PresentationCoreContracts)46'
+                       Name='$(var.PresentationCoreContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.PresentationCoreContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.PresentationFrameworkContracts)46'
+                       Name='$(var.PresentationFrameworkContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.PresentationFrameworkContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemComponentModelCompositionContracts)46'
+                       Name='$(var.SystemComponentModelCompositionContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemComponentModelCompositionContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemConfigurationContracts)46'
+                       Name='$(var.SystemConfigurationContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemConfigurationContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemConfigurationInstallContracts)46'
+                       Name='$(var.SystemConfigurationInstallContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemConfigurationInstallContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemContracts)46'
+                       Name='$(var.SystemContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemCoreContracts)46'
+                       Name='$(var.SystemCoreContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemCoreContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemDataContracts)46'
+                       Name='$(var.SystemDataContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemDataContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemDataServicesContracts)46'
+                       Name='$(var.SystemDataServicesContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemDataServicesContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemDirectoryServicesContracts)46'
+                       Name='$(var.SystemDirectoryServicesContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemDirectoryServicesContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemDrawingContracts)46'
+                       Name='$(var.SystemDrawingContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemDrawingContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemNumericsContracts)46'
+                       Name='$(var.SystemNumericsContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemNumericsContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemRuntimeCachingContracts)46'
+                       Name='$(var.SystemRuntimeCachingContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemRuntimeCachingContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemSecurityContracts)46'
+                       Name='$(var.SystemSecurityContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemSecurityContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemServiceModelContracts)46'
+                       Name='$(var.SystemServiceModelContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemServiceModelContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemServiceProcessContracts)46'
+                       Name='$(var.SystemServiceProcessContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemServiceProcessContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemWebApplicationServicesContracts)46'
+                       Name='$(var.SystemWebApplicationServicesContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemWebApplicationServicesContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemWebContracts)46'
+                       Name='$(var.SystemWebContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemWebContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemWindowsFormsContracts)46'
+                       Name='$(var.SystemWindowsFormsContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemWindowsFormsContracts)'
+                       Vital='yes'/>
+                    <File
+                       Id='$(var.SystemXmlContracts)46'
+                       Name='$(var.SystemXmlContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemXmlContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.SystemXmlLinqContracts)46'
+                       Name='$(var.SystemXmlLinqContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.SystemXmlLinqContracts)' Vital='yes'/>
+                    <File
+                       Id='$(var.WindowsBaseContracts)46'
+                       Name='$(var.WindowsBaseContracts)'
+                       Source='$(var.ContractReferenceAssemblyRoot)\.NETFramework\v4.6\$(var.WindowsBaseContracts)' Vital='yes'/>
+                  </Component>
+                </Directory>
               </Directory>
               <Directory Id='SilverlightContracts' Name='Silverlight'>
                 <Directory Id='OUTOFBANDDIRSL30' Name='v3.0'>
@@ -1187,6 +1294,7 @@
         <ComponentRef Id='OutOfBandContracts35' />
         <ComponentRef Id='OutOfBandContracts40' />
         <ComponentRef Id='OutOfBandContracts45' />
+        <ComponentRef Id='OutOfBandContracts46' />
         <ComponentRef Id='OutOfBandContractsSL30' />
         <ComponentRef Id='OutOfBandContractsSL40' />
         <ComponentRef Id='OutOfBandContractsSL50' />