Build platform-agnostic paths

Author: fwal

__tests__/visual-studio.test.ts

@@ -1,4 +1,5 @@
 import os from "os";
+import * as path from "path";
 import * as vs from "../src/visual-studio";
 import { swiftPackage } from "../src/swift-versions";
 import { OS, System } from "../src/os";
@@ -70,16 +71,21 @@ describe("visual studio resolver", () => {
   });
 
   it("finds vswhere path from environment value", async () => {
-    const vswherePath = "C:\\bin\\";
-    const vswhereExe = "C:\\bin\\vswhere.exe";
+    const vswherePath = path.join("C:", "bin");
+    const vswhereExe = path.join(vswherePath, "vswhere.exe");
     process.env.VSWHERE_PATH = vswherePath;
     expect(await vs.getVsWherePath()).toBe(vswhereExe);
   });
 
   it("finds vswhere path from ProgramFiles environment value", async () => {
-    const vswhereExe =
-      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe";
-    process.env["ProgramFiles(x86)"] = "C:\\Program Files (x86)";
+    const vswhereExe = path.join(
+      "C:",
+      "Program Files (x86)",
+      "Microsoft Visual Studio",
+      "Installer",
+      "vswhere.exe"
+    );
+    process.env["ProgramFiles(x86)"] = path.join("C:", "Program Files (x86)");
     expect(await vs.getVsWherePath()).toBe(vswhereExe);
   });
 });

src/visual-studio.ts

@@ -146,7 +146,9 @@ export async function getVsWherePath() {
       // fall back to VS-installed path
       vswhereToolExe = path.join(
         process.env["ProgramFiles(x86)"] as string,
-        "Microsoft Visual Studio\\Installer\\vswhere.exe"
+        "Microsoft Visual Studio",
+        "Installer",
+        "vswhere.exe"
       );
       core.debug(`Trying Visual Studio-installed path: ${vswhereToolExe}`);
     }

src/windows-install.ts

@@ -57,7 +57,8 @@ export async function install(version: string, system: System) {
     "Developer",
     "Toolchains",
     "unknown-Asserts-development.xctoolchain",
-    "usr\\bin"
+    "usr",
+    "bin"
   );
 
   if (code != 0 || !fs.existsSync(swiftInstallPath)) {
@@ -67,8 +68,8 @@ export async function install(version: string, system: System) {
   core.addPath(swiftInstallPath);
 
   const additionalPaths = [
-    path.join(swiftLibPath, "Swift-development\\bin"),
-    path.join(swiftLibPath, "icu-67\\usr\\bin"),
+    path.join(swiftLibPath, "Swift-development", "bin"),
+    path.join(swiftLibPath, "icu-67", "usr", "bin"),
   ];
   additionalPaths.forEach((value, index, array) => core.addPath(value));