Adding arm64 detection

microsoft · Nov 7, 2022 · 1bba226 · 1bba226
1 parent 0b44c67
commit 1bba226
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,10 +40,18 @@ jobs:
         vs-prerelease: true
         msbuild-architecture: 'x64'
 
+    - name: Setup MSBuild (arm64)
+      id: setup_msbuild_path_arm
+      uses: ./
+      with:
+        vs-prerelease: true
+        msbuild-architecture: 'arm64'
+
     - name: echo msbuild path
       run: |
         echo "vswhere-path: ${{ steps.setup_msbuild_explicit.outputs.msbuildPath }}"
         echo "PATH: ${{ steps.setup_msbuild_path.outputs.msbuildPath }}"
+        echo "ARM PATH: ${{ steps.setup_msbuild_path_arm.outputs.msbuildPath }}"
         echo "Fallback: ${{ steps.setup_msbuild_fallback.outputs.msbuildPath }}"
 
     - name: echo MSBuild

diff --git a/dist/index.js b/dist/index.js
@@ -1701,9 +1701,9 @@ function run() {
                 stdout: (data) => {
                     const installationPath = data.toString().trim();
                     core.debug(`Found installation path: ${installationPath}`);
-                    // x64 only exists in one possible location, so no fallback probing
-                    if (MSBUILD_ARCH === "x64") {
-                        let toolPath = path.join(installationPath, 'MSBuild\\Current\\Bin\\amd64\\MSBuild.exe');
+                    // x64 and arm64 only exist in one possible location, so no fallback probing
+                    if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
+                        let toolPath = path.join(installationPath, 'MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe');
                         core.debug(`Checking for path: ${toolPath}`);
                         if (!fs.existsSync(toolPath)) {
                             return;

diff --git a/src/main.ts b/src/main.ts
@@ -71,12 +71,12 @@ async function run(): Promise<void> {
         const installationPath = data.toString().trim()
         core.debug(`Found installation path: ${installationPath}`)
 
-        // x64 only exists in one possible location, so no fallback probing
-        if (MSBUILD_ARCH === "x64") {
+        // x64 and arm64 only exist in one possible location, so no fallback probing
+        if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
           let toolPath = path.join(
             installationPath,
-            'MSBuild\\Current\\Bin\\amd64\\MSBuild.exe'
-          );
+            'MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe'
+          )
           core.debug(`Checking for path: ${toolPath}`)
           if (!fs.existsSync(toolPath)) {
             return