Skip to content

Commit 1da5fb1

Browse files
committed
fix: enable VCTargetsPath and use 14.0 for VS2015
1 parent 95f4f7d commit 1da5fb1

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/msvc/msvc.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { setupChocoPack } from "../utils/setup/setupChocoPack"
2-
import { error, exportVariable } from "@actions/core"
3-
import { existsSync } from "fs"
2+
import { error } from "@actions/core"
43
import { setupVCVarsall } from "../vcvarsall/vcvarsall"
54

65
type MSVCVersion = "2015" | "2017" | "2019" | string
@@ -22,21 +21,17 @@ export async function setupMSVC(
2221
// https://github.com/aminya/setup-cpp/issues/1
2322
try {
2423
if (version === "2015") {
25-
toolset = "14.0.25420.1"
26-
await setupChocoPack("visualcpp-build-tools", toolset, [])
27-
24+
toolset = "14.0"
25+
await setupChocoPack("visualcpp-build-tools", "14.0.25420.1", [])
2826
VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140"
29-
if (existsSync(VCTargetsPath)) {
30-
exportVariable("VCTargetsPath", VCTargetsPath)
31-
}
3227
} else if (version === "2017") {
3328
toolset = "14.16"
3429
await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", [])
35-
// VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
30+
VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
3631
} else if (version === "2019") {
3732
toolset = "14.29"
3833
await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", [])
39-
// VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
34+
VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
4035
}
4136
} catch (e) {
4237
error(e as string | Error)

0 commit comments

Comments
 (0)