Fix for issue #4: Support VS2013 for CC Editor Extensions

.gitignore

@@ -82,6 +82,10 @@ dlldata.c
 *.svclog
 *.scc
 
+# Exclude reference assemblies
+!References/**/*
+
+
 # Chutzpah Test files
 _Chutzpah*
 

CodeContracts.sln

@@ -2099,9 +2099,11 @@ Global
 		{449B96DF-2C90-4495-B081-D97D4F02620E}.Release|x86.ActiveCfg = Release|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Devlab9|Any CPU.ActiveCfg = Devlab9|Any CPU
+		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Devlab9|Any CPU.Build.0 = Devlab9|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Devlab9|Mixed Platforms.ActiveCfg = Devlab9|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Devlab9|Mixed Platforms.Build.0 = Devlab9|Any CPU
 		{784AA6A9-013E-4D8E-82D6-934571CF1357}.Devlab9|Win32.ActiveCfg = Devlab9|Any CPU
@@ -2120,9 +2122,11 @@ Global
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Devlab9|Any CPU.ActiveCfg = Devlab9|Any CPU
+		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Devlab9|Any CPU.Build.0 = Devlab9|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Devlab9|Mixed Platforms.ActiveCfg = Devlab9|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Devlab9|Mixed Platforms.Build.0 = Devlab9|Any CPU
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Devlab9|Win32.ActiveCfg = Devlab9|Any CPU
@@ -2140,9 +2144,11 @@ Global
 		{235196BB-603A-470A-AF8E-EF6C8D01C4DC}.Release|x86.ActiveCfg = Release|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Devlab9|Any CPU.ActiveCfg = Devlab9|Any CPU
+		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Devlab9|Any CPU.Build.0 = Devlab9|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Devlab9|Mixed Platforms.ActiveCfg = Devlab9|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Devlab9|Mixed Platforms.Build.0 = Devlab9|Any CPU
 		{D3F9BE8B-BA9F-4919-87CE-EE1878EDA40C}.Devlab9|Win32.ActiveCfg = Devlab9|Any CPU
@@ -2160,9 +2166,11 @@ Global
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Devlab9|Any CPU.ActiveCfg = Devlab9|Any CPU
+		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Devlab9|Any CPU.Build.0 = Devlab9|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Devlab9|Mixed Platforms.ActiveCfg = Devlab9|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Devlab9|Mixed Platforms.Build.0 = Devlab9|Any CPU
 		{5982130C-B0DD-4E10-82F7-A23F40A16315}.Devlab9|Win32.ActiveCfg = Devlab9|Any CPU

Microsoft.Research/CCTools/CCCheckPulseUI/CCCheckPulseUI.csproj

@@ -38,6 +38,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\References\VS10\MSIL\2.0\Microsoft.Office.Interop.Excel.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Microsoft.Research/ContractAdornments/VS2010/ContractAdornments.csproj

@@ -3,9 +3,10 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <RootFolder>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Common.CodeContracts.props))</RootFolder>
+    <VsSdkPropertiesFolder>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),VSSDK.props))</VsSdkPropertiesFolder>
   </PropertyGroup>
   <!--  <Import Project="$(RootFolder)\Common.CodeContracts.props" /> -->
-
+  <Import Project="$(VsSdkPropertiesFolder)\VSSDK.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,12 +21,10 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -172,44 +171,54 @@
       <HintPath>..\..\ImportedCCI2\Microsoft.Cci.SourceModel.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.CSharp.Services.Language.Interop.dll, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\Microsoft.VisualStudio.CSharp.Services.Language.Interop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.CSharp.Services.Language, Version=10.0.0.0">
       <HintPath>References\Microsoft.VisualStudio.CSharp.Services.Language.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Language.Intellisense.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
+    <Reference Include="Microsoft.VisualStudio.Shell.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Shell.10.0.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>True</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Text.Data.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.UI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Text.UI.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS10\MSIL\4.0\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.10.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -406,10 +415,6 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
   </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
@@ -420,4 +425,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

Microsoft.Research/ContractAdornments/VS2012/ContractAdornments11.csproj

@@ -3,9 +3,10 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <RootFolder>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Common.CodeContracts.props))</RootFolder>
+    <VsSdkPropertiesFolder>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),VSSDK.props))</VsSdkPropertiesFolder>
   </PropertyGroup>
-<!--  <Import Project="$(RootFolder)\Common.CodeContracts.props" /> -->
-
+  <!--  <Import Project="$(RootFolder)\Common.CodeContracts.props" /> -->
+  <Import Project="$(VsSdkPropertiesFolder)\VSSDK.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -24,12 +25,10 @@
     <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -193,17 +192,29 @@
       <HintPath>..\..\ImportedCCI2\Microsoft.Cci.SourceModel.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.CSharp.Services.Language, Version=11.0.0.0">
       <HintPath>References\Microsoft.VisualStudio.CSharp.Services.Language.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.CSharp.Services.Language.Interop, Version=11.0.0.0">
       <HintPath>References\Microsoft.VisualStudio.CSharp.Services.Language.Interop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Editor, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Language.Intellisense.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Shell.11.0.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
@@ -215,10 +226,22 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
-    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Text.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Text.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\References\VS11\MSIL\4.0\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -365,11 +388,6 @@
     <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>
@@ -448,10 +466,6 @@
     <Prefer32Bit>false</Prefer32Bit>
     <DeployExtension>False</DeployExtension>
   </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />

Microsoft.Research/ContractAdornments/VS2012/source.extension.vsixmanifest

@@ -5,7 +5,7 @@
               Id="ContractAdornments.MicrosoftResearch.2fb66ab7-53ec-479b-bd35-e9dd5be0426b"
               Language="en"
               Publisher="Microsoft Research" />
-    <DisplayName>Code Contracts Editor Extensions VS2012</DisplayName>
+    <DisplayName>Code Contracts Editor Extensions VS2012 and VS2013</DisplayName>
     <Description xml:space="preserve">Displays Code Contracts (when editing C#) in code, Intellisense, and in metadata files.
 
 Inheritance: