Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MSVC installation and windows paths #2

Merged
merged 3 commits into from
Sep 17, 2021
Merged

Fix MSVC installation and windows paths #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f8038
fix: fix the toolset versions for vs2017 and vs2019
aminya Sep 16, 2021
3f0939b
fix: use --add to add msvc workloads
aminya Sep 17, 2021
ed2713e
fix: quote the arguments
aminya Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/msvc/msvc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"'--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",
"'--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)
Expand Down