Merge pull request #11294 from vslsnap/merge-master-into-future201605…

…13-150016 Merge master into future
dotnet · May 13, 2016 · d4fe93a · d4fe93a
2 parents 066798f + 06e01d8
commit d4fe93a
Show file tree

Hide file tree

Showing 99 changed files with 2,612 additions and 777 deletions.
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}"
 EndProject
@@ -363,6 +363,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTesting", "src\T
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Roslyn", "src\Deployment\Roslyn.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorFeatures.Next", "src\EditorFeatures\Next\EditorFeatures.Next.csproj", "{366BBCDC-B05F-4677-9B5B-78BA816A1484}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioSetup.Next", "src\VisualStudio\Setup.Next\VisualStudioSetup.Next.csproj", "{143FE684-6E1C-41DF-9C60-84C7772DC49C}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -395,8 +399,8 @@ Global
 		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
 		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 4
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4
@@ -3130,6 +3134,46 @@ Global
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|x64.Build.0 = Release|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|x86.ActiveCfg = Release|Any CPU
 		{600AF682-E097-407B-AD85-EE3CED37E680}.Release|x86.Build.0 = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|ARM.Build.0 = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|x64.Build.0 = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Debug|x86.Build.0 = Debug|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|Any CPU.Build.0 = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|ARM.ActiveCfg = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|ARM.Build.0 = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|x64.ActiveCfg = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|x64.Build.0 = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|x86.ActiveCfg = Release|Any CPU
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484}.Release|x86.Build.0 = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|x64.Build.0 = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Debug|x86.Build.0 = Debug|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|ARM.Build.0 = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x64.ActiveCfg = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x64.Build.0 = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x86.ActiveCfg = Release|Any CPU
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3296,5 +3340,7 @@ Global
 		{A32EAB7F-691C-4D00-98C4-F50C37BB4754} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{A57DDFE5-AB0E-4371-98E5-11B9218DF11C} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1} = {CAD2965A-19AB-489F-BE2E-7649957F914A}
+		{366BBCDC-B05F-4677-9B5B-78BA816A1484} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
+		{143FE684-6E1C-41DF-9C60-84C7772DC49C} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 	EndGlobalSection
 EndGlobal
diff --git a/build/Targets/VSL.Imports.targets b/build/Targets/VSL.Imports.targets
@@ -82,6 +82,38 @@
     </PropertyGroup>
   </Target>
 
+  <!-- ====================================================================================
+
+         Generation of binding redirects.
+
+       ==================================================================================== -->
+  <ItemGroup Condition="'$(GenerateMSBuildBindingRedirects)' == 'true'">
+      <SuggestedBindingRedirects Include="Microsoft.Build, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
+      </SuggestedBindingRedirects>
+      <SuggestedBindingRedirects Include="Microsoft.Build.Framework, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
+      </SuggestedBindingRedirects>
+      <SuggestedBindingRedirects Include="Microsoft.Build.Tasks.$(MSBuildAssemblyNameFragment), Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <MaxVersion>$(VisualStudioReferenceAssemblyVersion)</MaxVersion>
+      </SuggestedBindingRedirects>
+  </ItemGroup>
+  <PropertyGroup>
+    <ForceGenerationOfBindingRedirects Condition="'$(GenerateMSBuildBindingRedirects)' == 'true'">true</ForceGenerationOfBindingRedirects>
+    <AutoGenerateBindingRedirects Condition="'$(ForceGenerationOfBindingRedirects)' == 'true'">true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(ForceGenerationOfBindingRedirects)' == 'true'">
+
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+
   <Choose>
     <When Condition="'$(ProjectLanguage)' == 'VB'">
       <PropertyGroup>
@@ -94,7 +126,7 @@
       </PropertyGroup>
     </When>
   </Choose>
-  
+
   <Choose>
     <When Condition="'$(ProjectLanguage)' == 'C++'">
       <PropertyGroup>
@@ -112,13 +144,13 @@
       </PropertyGroup>
     </Otherwise>
   </Choose>
-  
+
   <Import Project="$(MSBuildTargetsFilePath)" />
 
   <!-- On Mono on *nix the NuGet targets aren't imported by default, so we do that here -->
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\NuGet\Microsoft.NuGet.targets"
           Condition="'$(OS)' != 'Windows_NT'" />
-  
+
   <Choose>
     <When Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND
                      '$(TargetFrameworkVersion)' == 'v5.0'">

diff --git a/src/Compilers/Core/MSBuildTaskTests/IntegrationTests.cs b/src/Compilers/Core/MSBuildTaskTests/IntegrationTests.cs
@@ -25,18 +25,8 @@ public class IntegrationTests : TestBase
 
         static IntegrationTests()
         {
-            using (var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0", writable: false))
-            {
-                if (key != null)
-                {
-                    var toolsPath = key.GetValue("MSBuildToolsPath");
-                    if (toolsPath != null)
-                    {
-                        s_msbuildDirectory = toolsPath.ToString();
-                        s_msbuildExecutable = Path.Combine(s_msbuildDirectory, "MSBuild.exe");
-                    }
-                }
-            }
+            s_msbuildDirectory = TestHelpers.GetMSBuildDirectory();
+            s_msbuildExecutable = Path.Combine(s_msbuildDirectory, "MSBuild.exe");
         }
 
         private readonly TempDirectory _tempDirectory;

diff --git a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  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">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
   </ImportGroup>
@@ -16,6 +16,7 @@
     <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Dependencies\Moq.net\Moq.net.csproj">