1
1
import { setupChocoPack } from "../utils/setup/setupChocoPack"
2
- import { error , exportVariable } from "@actions/core"
3
- import { existsSync } from "fs"
2
+ import { error } from "@actions/core"
4
3
import { setupVCVarsall } from "../vcvarsall/vcvarsall"
5
4
6
5
type MSVCVersion = "2015" | "2017" | "2019" | string
@@ -22,21 +21,17 @@ export async function setupMSVC(
22
21
// https://github.com/aminya/setup-cpp/issues/1
23
22
try {
24
23
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" , [ ] )
28
26
VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140"
29
- if ( existsSync ( VCTargetsPath ) ) {
30
- exportVariable ( "VCTargetsPath" , VCTargetsPath )
31
- }
32
27
} else if ( version === "2017" ) {
33
28
toolset = "14.16"
34
29
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
36
31
} else if ( version === "2019" ) {
37
32
toolset = "14.29"
38
33
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"
40
35
}
41
36
} catch ( e ) {
42
37
error ( e as string | Error )
0 commit comments