From 3b3cae4cc04124da3ca1a6ae035a722810c451d8 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Mon, 14 Nov 2016 15:21:29 -0800
Subject: [PATCH] Move to building with the Dev15 RC2 SDK

---
 Restore.cmd                                   |  4 +--
 build/Targets/Imports.targets                 | 24 -------------
 build/Targets/Settings.props                  | 35 +++----------------
 ...llow.project.json => dev15p5.project.json} |  2 +-
 build/ToolsetPackages/dev15rc.project.json    |  2 +-
 build/config/RepoUtilData.json                |  2 +-
 src/VisualStudio/Setup.Next/project.json      |  6 +++-
 7 files changed, 14 insertions(+), 61 deletions(-)
 rename build/ToolsetPackages/{dev15Willow.project.json => dev15p5.project.json} (57%)

diff --git a/Restore.cmd b/Restore.cmd
index eb6060373b0..854731fa3f4 100644
--- a/Restore.cmd
+++ b/Restore.cmd
@@ -41,8 +41,8 @@ call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev14.project.json"
 echo Restoring packages: Toolsets (Dev15 VS SDK build tools)
 call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
-echo Restoring packages: Toolsets (Dev15 VS SDK 'Willow' build tools)
-call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15Willow.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
+echo Restoring packages: Toolsets (Dev15 VS SDK Preview 5build tools)
+call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15p5.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
 echo Restoring packages: Toolsets (Dev15 VS SDK RC build tools)
 call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15rc.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 9f9a468b2f9..9136231730e 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -290,30 +290,6 @@
     </NuGetPackageToIncludeInVsix>
   </ItemDefinitionGroup>
 
-  <!-- Currently, the Willow installer can't install vsixes that have a <Prerequisites> element
-       but the Dev15 RC SDK packages can NOT install vsixes without them as part of the build.
-       To work around this conflict, we include them in our manifest files, but if we're building
-       with something older than Dev15 RC (as we do for official builds that we insert into setup)
-       we'll run a transform to strip out the <Prerequisites> element. -->
-  <Target Name="RewriteVsixManifestOnOfficialBuild"
-          BeforeTargets="FindSourceVsixManifest"
-          Condition="'$(IsDev15RC)' != 'true'">
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-    <XslTransformation XslInputPath="$(MSBuildThisFileDirectory)TransformVsixManifest.xslt"
-                       XmlInputPaths="source.extension.vsixmanifest"
-                       OutputPaths="$(IntermediateOutputPath)\source.extension.vsixmanifest" />
-    <ItemGroup>
-      <!-- Note that `FindSourceVsixManifest` finds the first item in @None that matches the name.
-           Our template projects include other manifests as content that are in @None, so make
-           sure we put our tranformed item back at the beginning of the list. -->
-      <None Remove="source.extension.vsixmanifest" />
-      <_TempNoneForReordering Include="@(None)" />
-      <None Remove="@(None)" />
-      <None Include="$(IntermediateOutputPath)\source.extension.vsixmanifest;@(_TempNoneForReordering)" />
-
-    </ItemGroup>
-  </Target>
-
   <!-- This is a copy of the Microsoft.VisualStudio.SDK.EmbedInteropTypes NuGet package, but only the list of
        assemblies that we need. The package includes things like EnvDTE which are reasonable for consumers, but
        strange since we actually _implement_ DTE and use it as an exchange type with generics in a few places. -->
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index 2454ef251db..0253f23c9c5 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -54,15 +54,12 @@
     <DebugType>pdbonly</DebugType>
     <UseSharedCompilation>true</UseSharedCompilation>
 
-    <!-- This is a really hacky way to detect whether we are on a legacy or a willow based VS install.
-         Basically, we check for a registry key that will only exist in legacy VS installs, and assume
-         we are a willow based installation if our VSVersion is 15.0 and the registry key doesn't exist. -->
-    <IsVSBeforeDev15Preview4 Condition="'$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\15.0@InstallDir)' != ''">true</IsVSBeforeDev15Preview4>
-    <IsVSBeforeDev15Preview4 Condition="'$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\15.0@InstallDir)' != ''">true</IsVSBeforeDev15Preview4>
-    <IsVSBeforeDev15Preview4 Condition="'$(IsVSBeforeDev15Preview4)' == 'true' AND Exists('$(MSBuildBinPath)\..\..\..\Common7\IDE\devenv.isolation.ini')">false</IsVSBeforeDev15Preview4>
-    <IsVSBeforeDev15Preview4 Condition="'$(IsVSBeforeDev15Preview4)' == 'true' AND Exists('$(MSBuildBinPath)\..\..\..\..\Common7\IDE\devenv.isolation.ini')">false</IsVSBeforeDev15Preview4>
+    <!-- Presently our code can build on machines with Dev14 or Dev15 but only successfully deploy 
+         in the Dev15 environment.  -->
     <IsDev15RC Condition="Exists('$(MSBuildBinPath)\..\..\..\Common7\IDE\Microsoft.VisualStudio.ExtensionEngine.dll')">true</IsDev15RC>
     <IsDev15RC Condition="Exists('$(MSBuildBinPath)\..\..\..\..\Common7\IDE\Microsoft.VisualStudio.ExtensionEngine.dll')">true</IsDev15RC>
+    <DeployExtension Condition="'$(IsDev15RC)' != 'true' or '$(VisualStudioVersion)' != '15.0'">false</DeployExtension>
+    <VisualStudioBuildToolsVersion>15.0.25907-RC2</VisualStudioBuildToolsVersion>
   </PropertyGroup>
 
   <!-- Unix specific settings -->
@@ -180,30 +177,6 @@
     </When>
   </Choose>
 
-  <!-- Visual Studio specific properties -->
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '15.0' AND '$(IsVSBeforeDev15Preview4)' == 'true'">
-      <PropertyGroup>
-        <VisualStudioBuildToolsVersion>15.0.25201-dev15preview2</VisualStudioBuildToolsVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(VisualStudioVersion)' == '15.0' AND '$(IsDev15RC)' == 'true'">
-      <PropertyGroup>
-        <VisualStudioBuildToolsVersion>15.0.25825-RC</VisualStudioBuildToolsVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(VisualStudioVersion)' == '15.0'">
-      <PropertyGroup>
-        <VisualStudioBuildToolsVersion>15.0.25604-Preview4</VisualStudioBuildToolsVersion>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <VisualStudioBuildToolsVersion>14.3.25420</VisualStudioBuildToolsVersion>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
   <ItemGroup Condition="'$(ProjectLanguage)' == 'CSharp' AND '$(TargetNetFX20)' == 'true'">
     <_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" />
   </ItemGroup>
diff --git a/build/ToolsetPackages/dev15Willow.project.json b/build/ToolsetPackages/dev15p5.project.json
similarity index 57%
rename from build/ToolsetPackages/dev15Willow.project.json
rename to build/ToolsetPackages/dev15p5.project.json
index e7b5d99c8fb..cbc259c7ffa 100644
--- a/build/ToolsetPackages/dev15Willow.project.json
+++ b/build/ToolsetPackages/dev15p5.project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4"
+        "Microsoft.VSSDK.BuildTools": "15.0.25728-Preview5"
     },
     "frameworks": {
         "net46": {}
diff --git a/build/ToolsetPackages/dev15rc.project.json b/build/ToolsetPackages/dev15rc.project.json
index 2a04cdcc551..13f49c242bb 100644
--- a/build/ToolsetPackages/dev15rc.project.json
+++ b/build/ToolsetPackages/dev15rc.project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.VSSDK.BuildTools": "15.0.25825-RC"
+        "Microsoft.VSSDK.BuildTools": "15.0.25907-RC2"
     },
     "frameworks": {
         "net46": {}
diff --git a/build/config/RepoUtilData.json b/build/config/RepoUtilData.json
index fc87cbfe508..308d66e7b5e 100644
--- a/build/config/RepoUtilData.json
+++ b/build/config/RepoUtilData.json
@@ -1,7 +1,7 @@
 {
     "fixedPackages": {
         "Microsoft.VisualStudio.Language.Intellisense": "14.3.25407",
-        "Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25201-dev15preview2","15.0.25604-Preview4", "15.0.25825-RC" ],
+        "Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25825-RC" ],
         "System.Reflection.Metadata": "1.0.21",
         "System.Collections.Immutable": "1.1.36",
         "Microsoft.VisualStudio.Editor": [ "14.3.25407", "15.0.25726-Preview5" ],
diff --git a/src/VisualStudio/Setup.Next/project.json b/src/VisualStudio/Setup.Next/project.json
index 71c1c5c466f..2e755319cdb 100644
--- a/src/VisualStudio/Setup.Next/project.json
+++ b/src/VisualStudio/Setup.Next/project.json
@@ -1,5 +1,9 @@
 {
     "dependencies": {
+        "Microsoft.VisualStudio.Shell.Framework": "15.0.25726-Preview5",
+        "Microsoft.VisualStudio.Shell.15.0": "15.0.25726-Preview5",
+        "Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.25413-Preview5",
+        "Microsoft.VisualStudio.Shell.Immutable.11.0": "15.0.25413-Preview5",
         "RoslynDependencies.Microsoft.VisualStudio.CallHierarchy.Package.Definitions": {
             "version": "14.3.25407",
             "suppressParent": "all"
@@ -11,4 +15,4 @@
     "runtimes": {
         "win7": { }
     }
-}
\ No newline at end of file
+}
-- 
GitLab