diff --git a/Microsoft.Research/ImportedCodeTools/CodeTools.msm b/Microsoft.Research/ImportedCodeTools/CodeTools.msm
index 4f1662a8..2532a345 100644
Binary files a/Microsoft.Research/ImportedCodeTools/CodeTools.msm and b/Microsoft.Research/ImportedCodeTools/CodeTools.msm differ
diff --git a/Microsoft.Research/ImportedCodeTools/CodeToolsUpdate.exe b/Microsoft.Research/ImportedCodeTools/CodeToolsUpdate.exe
index 331b0710..1bf086fe 100644
Binary files a/Microsoft.Research/ImportedCodeTools/CodeToolsUpdate.exe and b/Microsoft.Research/ImportedCodeTools/CodeToolsUpdate.exe differ
diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
new file mode 100644
index 00000000..385b0722
--- /dev/null
+++ b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
@@ -0,0 +1,254 @@
+
+
+
+
+
+
+ $(PrepareForRunDependsOn);CodeContractsRunCodeAnalysisOnTarget;CodeContractsPerformCodeAnalysis
+ $(IntermediateOutputPath)CodeContractAnalysisRun.log
+
+
+
+
+
+ $(CodeContractsInstallDir)Bin\cccheck.exe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetMember`))
+ $([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetType`))
+ $([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetNamespace`))
+ $([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetProjectGuid`))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ low
+
+
+
+
+ low
+
+
+
+
+ mediumlow
+
+
+
+
+ medium
+
+
+
+
+ full
+
+
+
+
+ low
+
+
+
+
+
+
+
+
+
+ noObl
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @(ContractDeclarativeAssembly->'%(RootDir)')@(ContractDeclarativeAssembly->'%(Directory)')
+ @(ContractDeclarativeAssembly->'%(FullPath)')
+ -platform "$(CodeContractsPlatformPath)"
+ $(CodeContractCodeAnalysisOptions) -cclib "$(CodeContractsClassLibrary)"
+ $(CodeContractCodeAnalysisOptions) -assemblyMode=standard
+ $(CodeContractCodeAnalysisOptions) -maxwarnings 1200
+ $(CodeContractCodeAnalysisOptions) -nonnull:noObl
+ $(CodeContractCodeAnalysisOptions) -nonnull
+ $(CodeContractCodeAnalysisOptions) -bounds:$(CodeContractsBounds) -arrays -wp=true -bounds:type=subpolyhedra,reduction=simplex,diseq=false
+ $(CodeContractCodeAnalysisOptions) -buffers:type=subpolyhedra,fastcheck=false
+ $(CodeContractCodeAnalysisOptions) -arrays -adaptive
+ $(CodeContractCodeAnalysisOptions) -arithmetic
+ $(CodeContractCodeAnalysisOptions) -enum
+ $(CodeContractCodeAnalysisOptions) -check assumptions
+ $(CodeContractCodeAnalysisOptions) -suggest asserttocontracts
+ $(CodeContractCodeAnalysisOptions) -check conditionsvalidity
+ $(CodeContractCodeAnalysisOptions) -missingPublicRequiresAreErrors
+ $(CodeContractCodeAnalysisOptions) -missingPublicEnsuresAreErrors
+ $(CodeContractCodeAnalysisOptions) -suggest calleeassumes
+ $(CodeContractCodeAnalysisOptions) -suggest assumes
+ $(CodeContractCodeAnalysisOptions) -suggest requires
+ $(CodeContractCodeAnalysisOptions) -suggest methodensures -suggest propertyensures
+ $(CodeContractCodeAnalysisOptions) -suggest necessaryensures
+ $(CodeContractCodeAnalysisOptions) -suggest objectinvariants
+ $(CodeContractCodeAnalysisOptions) -suggest readonlyfields
+ $(CodeContractCodeAnalysisOptions) -infer requires
+ $(CodeContractCodeAnalysisOptions) -infer methodensures
+ $(CodeContractCodeAnalysisOptions) -infer autopropertiesensures
+ $(CodeContractCodeAnalysisOptions) -infer objectinvariants
+ $(CodeContractCodeAnalysisOptions) -cache
+ $(CodeContractCodeAnalysisOptions) -forcecacheserver=true
+ $(CodeContractCodeAnalysisOptions) -failOnWarnings
+ $(CodeContractCodeAnalysisOptions) -cacheFileDirectory "$(CodeContractsCacheDirectory)"
+ $(CodeContractCodeAnalysisOptions) -cacheVersion "$(CodeContractsCacheVersion)"
+ $(CodeContractCodeAnalysisOptions) -cacheMaxSize "$(CodeContractsCacheMaxSize)"
+ $(CodeContractCodeAnalysisOptions) -memberNameSelect:$(CodeContractsTargetMember)
+ $(CodeContractCodeAnalysisOptions) -typeNameSelect:$(CodeContractsTargetType)
+ $(CodeContractCodeAnalysisOptions) -lowScoreForExternal=false
+ $(CodeContractCodeAnalysisOptions) -namespaceSelect:$(CodeContractsTargetNamespace)
+ $(CodeContractCodeAnalysisOptions) -baseline "$(CodeContractsBaseLineFile)"
+ $(CodeContractCodeAnalysisOptions) -cacheserver:$(CodeContractsSQLServerOption)
+ $(CodeContractCodeAnalysisOptions) $(CodeContractsExtraAnalysisOptions)
+ false
+ true
+ true
+ false
+
+
+
+ <_CodeContractsCCCheckArguments>-nobox -nologo -nopex -remote -suggest=!! -premode combined -suggest codefixes -framework:$(TargetFrameworkVersion) -warninglevel $(CodeContractsAnalysisWarning) $(CodeContractCodeAnalysisOptions) "-resolvedPaths:@(ReferencePath)" "-libPaths:@(CodeContractsAllLibPaths) " "$(DeclarativeAssemblyPath)"
+
+
+
+ <_CodeContractsCCCheckArgumentLines
+ Include="$(_CodeContractsCCCheckArguments)"
+ />
+
+
+
+
+
+
+
+
+
diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
new file mode 100644
index 00000000..ea49123f
--- /dev/null
+++ b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
@@ -0,0 +1,654 @@
+
+
+
+ True
+
+
+
+
+
+ $(IntermediateOutputPath)Decl\
+ CodeContracts\
+ $(CodeContractsInstallDir)Bin\ccrefgen.exe
+
+
+
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\Silverlight\v5.0
+
+
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\Silverlight\v4.0\Profile\WindowsPhone
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\Silverlight\v4.0
+
+
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\Silverlight\v3.0
+
+
+
+
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\.NETFramework\v4.0
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\.NETFramework\v4.5
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\.NETFramework\v4.5
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\.NETFramework\v4.5
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\.NETFramework\v4.5
+
+
+
+
+ $(CodeContractsInstallDir)Contracts\v3.5
+
+
+
+
+
+
+
+
+
+ CodeContractsSlipInDefineSymbolDynamically;$(CompileDependsOn);CodeContractReferenceAssembly
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+ 4
+
+
+
+
+ 3
+
+
+
+
+ 2
+
+
+
+
+
+ 1
+
+
+
+
+ 1
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+ $(CompileDependsOn); CodeContractInstrument
+
+
+
+
+ $(CompileDependsOn);ContractXmlDocumentation
+
+
+
+
+
+ $(CodeContractRewriteOptions) "/framework:$(TargetFrameworkVersion)"
+ $(CodeContractRewriteOptions) "/targetplatform:$(CodeContractsPlatformPath)"
+ $(CodeContractRewriteOptions) "/contractLibrary:$(CodeContractsClassLibrary)"
+ $(CodeContractRewriteOptions) "/assemblyMode=standard"
+ $(CodeContractRewriteOptions) /publicsurface
+ $(CodeContractRewriteOptions) /throwonfailure
+ $(CodeContractRewriteOptions) /callsiterequires
+ $(CodeContractRewriteOptions) /skipQuantifiers
+ $(CodeContractRewriteOptions) "/rewriterMethods:$(CodeContractsCustomRewriterAssembly),$(CodeContractsCustomRewriterClass)"
+ $(CodeContractRewriteOptions) $(CodeContractsExtraRewriteOptions)
+ /level:$(CodeContractsRuntimeLevel) /nologo /rewrite $(CodeContractRewriteOptions) "/resolvedPaths:@(ReferencePath,';')" "/libpaths:@(CodeContractsAllLibPaths) " "$(TargetName)$(TargetExt)"
+ $(CodeContractsInstallDir)Bin\ccrewrite.exe
+
+ $(IntermediateOutputPath)$(TargetName).rewritten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_CodeContractsCCRewriteArguments>$(CodeContractRewriteOptions)
+
+
+
+ <_CodeContractsCCRewriteArgumentLines
+ Include="$(_CodeContractsCCRewriteArguments)"
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "$(CodeContractsSdkPath)Bin\NETFX 4.6 Tools\sn.exe"
+
+
+
+
+
+
+
+
+
+
+ <_CodeContractOutputDirectory Include="$(OutDir)$(CodeContractsContractSubDir)"/>
+ <_ContractDummyReferenceAssembly Include="$(OutDir)$(CodeContractsContractSubDir)$(TargetName).noReferenceAssembly"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_CodeContractsCCRefGenArguments>"/resolvedPaths:@(ReferencePath,';')" "/libPaths:@(CodeContractsAllLibPaths) " /pdb "/out:@(ContractReferenceAssembly)" "@(ContractDeclarativeAssembly)"
+
+
+
+ <_CodeContractsCCRefGenArgumentLines
+ Include="$(_CodeContractsCCRefGenArguments)"
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_CodeContractsBuildReferences
+ Include="@(ReferencePath->'%(RootDir)%(Directory)')"/>
+ <_CodeContractsBuildReferences
+ Include="@(ReferencePath->'%(RootDir)%(Directory)CodeContracts')"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(CodeContractsInstallDir)Bin\ccdocgen.exe
+
+
+
+
+
+ <_CodeContractsCCDocGenArguments>-assembly "@(ContractReferenceAssembly)" -xmlFile "@(DocFileItem)" "-resolvedPaths:@(ReferencePath)" -libpaths "@(CodeContractsAllLibPaths) "
+
+
+
+ <_CodeContractsCCDocGenArgumentLines
+ Include="$(_CodeContractsCCDocGenArguments)"
+ />
+
+
+
+
+
+
+
+
+
+ $(CodeContractsInstallDir)MsBuild\v14.0\Microsoft.CodeContractAnalysis.targets
+
+
+
+
+
diff --git a/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs b/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
index 9cd157c4..5ca65885 100644
--- a/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
+++ b/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
@@ -66,6 +66,7 @@
+
@@ -80,8 +81,10 @@
+
+
@@ -1337,6 +1376,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1372,6 +1431,7 @@
-->
+
diff --git a/Microsoft.Research/ManagedContract.Setup/VSIX/VS14.extension.vsixmanifest b/Microsoft.Research/ManagedContract.Setup/VSIX/VS14.extension.vsixmanifest
new file mode 100644
index 00000000..ee6deb3a
--- /dev/null
+++ b/Microsoft.Research/ManagedContract.Setup/VSIX/VS14.extension.vsixmanifest
@@ -0,0 +1,26 @@
+
+
+
+
+ Code Contracts Tools
+ Tools to instrument and statically analyze .NET code with CodeContracts
+ http://visualstudiogallery.msdn.microsoft.com/1ec7db13-3363-46c9-851f-1ce455f66970
+ License.rtf
+ codecontracts_SM.png
+ codecontracts_project.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml b/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml
index 6af80ea4..0fd17e9d 100644
--- a/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml
+++ b/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml
@@ -217,6 +217,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VS14DEVENV
+
+
+
+
+
+
+
+
+
+
+ VS14_ROOT_FOLDER_EXISTS
+
+
+
+
diff --git a/Microsoft.VisualStudio.CodeTools/CodeToolsSetup/CodeTools.wxs b/Microsoft.VisualStudio.CodeTools/CodeToolsSetup/CodeTools.wxs
index 6bd5776b..f9e883e8 100644
--- a/Microsoft.VisualStudio.CodeTools/CodeToolsSetup/CodeTools.wxs
+++ b/Microsoft.VisualStudio.CodeTools/CodeToolsSetup/CodeTools.wxs
@@ -66,6 +66,7 @@
+
@@ -300,6 +302,20 @@
+
+
+
+
+
+
+
+
+
+