actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from aminya/msvc-fix

This commit is contained in:
Amin Yahyaabadi 2021-09-17 06:16:20 -05:00 committed by GitHub
parent e9a591d9d4 ed2713efc5
commit fa26938fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/msvc/msvc.ts
View File

@ -43,19 +43,19 @@ export async function setupMSVC(
exportVariable("VCTargetsPath", VCTargetsPath) exportVariable("VCTargetsPath", VCTargetsPath)
} }
} else if (version === "2017") { } else if (version === "2017") {
toolset = "15.9.38.0" toolset = "14.16"
await setupChocoPack("visualstudio2017buildtools", toolset, [ await setupChocoPack("visualstudio2017buildtools", "15.9.38.0", [
"--package-parameters", "--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") { } else if (version === "2019") {
toolset = "16.11.2.0" toolset = "14.29.30133"
await setupChocoPack("visualstudio2019buildtools", toolset, [ await setupChocoPack("visualstudio2019buildtools", "16.11.2.0", [
"--package-parameters", "--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)) { if (VCTargetsPath !== undefined && existsSync(VCTargetsPath)) {
exportVariable("VCTargetsPath", VCTargetsPath) exportVariable("VCTargetsPath", VCTargetsPath)