Revert "Switch to VS 2017 15.7.1 with 10.0.17134.0 SDK" This reverts commit 5a7f3c442684be5eeb244b904bbfc8e6edaf6fda. Reason for revert: this breaks v8's VC++ goma builds, reverting until goma is updated to support this compiler Original change's description: > Switch to VS 2017 15.7.1 with 10.0.17134.0 SDK > > This change switches the VS 2017 package to use VS 2017 Update 7.1 while > using the 10.0.17134.12 SDK. The new SDK is needed to support new HDR > features, and to stop forcing external developers to install an old > ([Spring] Creators Update) SDK. This change will also bring in a new > linker and other build tools, but the version of clang-cl will be > unchanged. > > Packaging was done on a Windows Server 2016 VM, cleanly created for this > purpose. > > Compiler was packaged up by downloading VS 2017 Update 7.1, from > https://www.visualstudio.com/vs/, and then passing these parameters to > the installer: > > --add Microsoft.VisualStudio.Workload.NativeDesktop > --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended > --passive > > Then Add or Remove Programs was used to modify the 10.0.17134.0 SDK to add > the Debuggers package. > > Then the packaging script was run like this: > > python depot_tools\win_toolchain\package_from_installed.py 2017 -w 10.0.17134.0 > > Bug: 773476 > Change-Id: Ic819f3ae79d7e869227bf33fbb8d202e2f57039b > Reviewed-on: https://chromium-review.googlesource.com/1054027 > Reviewed-by: Nico Weber <thakis@chromium.org> > Reviewed-by: Dirk Pranke <dpranke@chromium.org> > Commit-Queue: Bruce Dawson <brucedawson@chromium.org> > Cr-Commit-Position: refs/heads/master@{#559033} TBR=thakis@chromium.org,dpranke@chromium.org,hubbe@chromium.org,brucedawson@chromium.org Change-Id: Ib8e84084a9717dafa6616f132b4824d93cbf39bf No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 773476 Reviewed-on: https://chromium-review.googlesource.com/1063810 Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Commit-Queue: Bruce Dawson <brucedawson@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#559471} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 7ad7e759dd35a114375a671f02669c9a0283bea1
diff --git a/tools/gn/visual_studio_writer.cc b/tools/gn/visual_studio_writer.cc index 856d548..a8fe041 100644 --- a/tools/gn/visual_studio_writer.cc +++ b/tools/gn/visual_studio_writer.cc
@@ -79,7 +79,7 @@ const char kVersionStringVs2015[] = "Visual Studio 2015"; // Visual Studio 2015 const char kVersionStringVs2017[] = "Visual Studio 2017"; // Visual Studio 2017 const char kWindowsKitsVersion[] = "10"; // Windows 10 SDK -const char kWindowsKitsDefaultVersion[] = "10.0.17134.0"; // Windows 10 SDK +const char kWindowsKitsDefaultVersion[] = "10.0.15063.0"; // Windows 10 SDK const char kGuidTypeProject[] = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; const char kGuidTypeFolder[] = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
diff --git a/tools/gn/visual_studio_writer_unittest.cc b/tools/gn/visual_studio_writer_unittest.cc index bd9ab96..b924182 100644 --- a/tools/gn/visual_studio_writer_unittest.cc +++ b/tools/gn/visual_studio_writer_unittest.cc
@@ -31,7 +31,7 @@ TEST_F(VisualStudioWriterTest, ResolveSolutionFolders) { VisualStudioWriter writer(setup_.build_settings(), "Win32", VisualStudioWriter::Version::Vs2015, - "10.0.17134.0"); + "10.0.15063.0"); std::string path = MakeTestPath("/foo/chromium/src/out/Debug/obj/base/base.vcxproj"); @@ -90,7 +90,7 @@ TEST_F(VisualStudioWriterTest, ResolveSolutionFolders_AbsPath) { VisualStudioWriter writer(setup_.build_settings(), "Win32", VisualStudioWriter::Version::Vs2015, - "10.0.17134.0"); + "10.0.15063.0"); std::string path = MakeTestPath("/foo/chromium/src/out/Debug/obj/base/base.vcxproj");