fix: enable VCTargetsPath and use 14.0 for VS2015

aminya · Dec 6, 2021 · b2d6049 · b2d6049
1 parent 95f4f7d
commit b2d6049
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/msvc/msvc.ts b/src/msvc/msvc.ts
@@ -22,21 +22,17 @@ export async function setupMSVC(
   // https://github.com/aminya/setup-cpp/issues/1
   try {
     if (version === "2015") {
-      toolset = "14.0.25420.1"
-      await setupChocoPack("visualcpp-build-tools", toolset, [])
-
+      toolset = "14.0"
+      await setupChocoPack("visualcpp-build-tools", "14.0.25420.1", [])
       VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140"
-      if (existsSync(VCTargetsPath)) {
-        exportVariable("VCTargetsPath", VCTargetsPath)
-      }
     } else if (version === "2017") {
       toolset = "14.16"
       await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", [])
-      // VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
+      VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
     } else if (version === "2019") {
       toolset = "14.29"
       await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", [])
-      // VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
+      VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
     }
   } catch (e) {
     error(e as string | Error)