Merge pull request #16858 from jaredpar/fix-sdk

Move to new VS SDK build tools

build/Targets/Dependencies.props

@@ -6,7 +6,7 @@
     <ManagedEsentVersion>1.9.4</ManagedEsentVersion>
     <MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
     <MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
-    <MicroBuildPluginsSwixBuildVersion>1.0.101</MicroBuildPluginsSwixBuildVersion>
+    <MicroBuildPluginsSwixBuildVersion>1.1.0-g0701ee829f</MicroBuildPluginsSwixBuildVersion>
     <MicrosoftBuildVersion>15.1.0-preview-000458-02</MicrosoftBuildVersion>
     <MicrosoftBuild14Version>14.3.0</MicrosoftBuild14Version>
     <MicrosoftBuildFrameworkVersion>15.1.0-preview-000458-02</MicrosoftBuildFrameworkVersion>
@@ -27,6 +27,7 @@
     <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
     <MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
     <MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
+    <MicrosoftVSSDKBuildToolsVersion>15.0.26124-RC3</MicrosoftVSSDKBuildToolsVersion>
     <RoslynToolsMicrosoftLocateVSVersion>0.2.4-beta</RoslynToolsMicrosoftLocateVSVersion>
     <RoslynToolsMicrosoftSignToolVersion>0.3.0-beta</RoslynToolsMicrosoftSignToolVersion>
     <RoslynToolsMicrosoftVSIXExpInstallerVersion>0.2.4-beta</RoslynToolsMicrosoftVSIXExpInstallerVersion>

build/Targets/Settings.props

@@ -73,7 +73,7 @@
     <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.25929-RC2</VisualStudioBuildToolsVersion>
+    <VisualStudioBuildToolsVersion>$(MicrosoftVSSDKBuildToolsVersion)</VisualStudioBuildToolsVersion>
 
     <!-- For the moment our Dev14 VSI suites must continue to use the Dev14 SDK. -->
     <VisualStudioBuildToolsVersion Condition="'$(IsDev14VsiBuild)' == 'true'">14.3.25420</VisualStudioBuildToolsVersion>

build/ToolsetPackages/dev15rc.project.json

 {
   "dependencies": {
-    "Microsoft.VSSDK.BuildTools": "15.0.25929-RC2"
+    "Microsoft.VSSDK.BuildTools": "15.0.26124-RC3"
   },
   "frameworks": {
     "net46": {}
   }
-}
-
+}
\ No newline at end of file

build/ToolsetPackages/project.json

@@ -3,7 +3,7 @@
     "Microsoft.Build.Logging.StructuredLogger": "1.0.58",
     "MicroBuild.Core.Sentinel": "1.0.0",
     "MicroBuild.Core": "0.2.0",
-    "MicroBuild.Plugins.SwixBuild": "1.0.101",
+    "MicroBuild.Plugins.SwixBuild": "1.1.0-g0701ee829f",
     "Microsoft.NETCore.Platforms": "1.1.0",
     "Microsoft.DiaSymReader.Native": "1.5.0-beta1",
     "Microsoft.Net.Compilers": "2.0.0-rc2-61102-09",

build/config/RepoUtilData.json

 {
   "fixedPackages": {
-    "Microsoft.VSSDK.BuildTools": [ "14.3.25420", "15.0.25929-RC2" ],
+    "Microsoft.VSSDK.BuildTools": [ "14.3.25420" ],
     "Newtonsoft.Json": "9.0.1",
     "System.Reflection.Metadata": "1.0.21",
     "System.Collections.Immutable": "1.1.36",
@@ -37,7 +37,8 @@
         "RoslynTools.*",
         "^Microsoft.?Build.*",
         "GitLink",
-        "Microsoft.NETCore.Runtime.CoreCLR"
+        "Microsoft.NETCore.Runtime.CoreCLR",
+        "Microsoft.VSSDK.BuildTools"
       ]
     }
   },