diff --git a/src/msvc/msvc.ts b/src/msvc/msvc.ts index 2ac15a9c..cd0e6df0 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)