From c87ff3b02c4a8373dad838c333ac6c8dcbe8b214 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 16 Sep 2021 13:20:03 -0500 Subject: [PATCH] fix: fix the toolset versions for vs2017 and vs2019 https://github.com/jberezanski/ChocolateyPackages/issues/117#issuecomment-921071306 --- src/msvc/msvc.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/msvc/msvc.ts b/src/msvc/msvc.ts index 2a483f04..eee2db74 100644 --- a/src/msvc/msvc.ts +++ b/src/msvc/msvc.ts @@ -43,19 +43,19 @@ export async function setupMSVC( exportVariable("VCTargetsPath", VCTargetsPath) } } else if (version === "2017") { - toolset = "15.9.38.0" - await setupChocoPack("visualstudio2017buildtools", toolset, [ + toolset = "14.16" + await setupChocoPack("visualstudio2017buildtools", "15.9.38.0", [ "--package-parameters", "add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive", ]) - VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\Microsoft\\VC\\v150" + VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Tools\\MSVC\\14.16" // TODO verify path } else if (version === "2019") { - toolset = "16.11.2.0" - await setupChocoPack("visualstudio2019buildtools", toolset, [ + toolset = "14.29.30133" + await setupChocoPack("visualstudio2019buildtools", "16.11.2.0", [ "--package-parameters", "add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --passive", ]) - VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Microsoft\\VC\\v160" + VCTargetsPath = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133" } if (VCTargetsPath !== undefined && existsSync(VCTargetsPath)) { exportVariable("VCTargetsPath", VCTargetsPath)