win: add an arch check to VS 2019 (#3025)

huseyinacacak-janea · web-flow · commit 323957b74e95 · 2024-04-23T15:46:11.000+02:00
diff --git a/lib/find-visualstudio.js b/lib/find-visualstudio.js
@@ -363,7 +363,11 @@ class VisualStudioFinder {
         return path.join(info.path, 'MSBuild', '15.0', 'Bin', 'MSBuild.exe')
       }
       if (versionYear === 2019) {
-        return msbuildPath
+        if (process.arch === 'arm64' && this.msBuildPathExists(msbuildPathArm64)) {
+          return msbuildPathArm64
+        } else {
+          return msbuildPath
+        }
       }
     }
     /**
diff --git a/test/test-find-visualstudio.js b/test/test-find-visualstudio.js
@@ -21,13 +21,7 @@ class TestVisualStudioFinder extends VisualStudioFinder {
   }
 }
 
-const shouldSkip = process.platform !== 'win32'
-
 describe('find-visualstudio', function () {
-  if (shouldSkip) {
-    return
-  }
-
   this.beforeAll(function () {
     // Condition to skip the test suite
     if (process.env.SystemRoot === undefined) {

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,11 @@ class VisualStudioFinder {`
`363`	`363`	`return path.join(info.path, 'MSBuild', '15.0', 'Bin', 'MSBuild.exe')`
`364`	`364`	`}`
`365`	`365`	`if (versionYear === 2019) {`
`366`		`- return msbuildPath`
	`366`	`+ if (process.arch === 'arm64' && this.msBuildPathExists(msbuildPathArm64)) {`
	`367`	`+ return msbuildPathArm64`
	`368`	`+ } else {`
	`369`	`+ return msbuildPath`
	`370`	`+ }`
`367`	`371`	`}`
`368`	`372`	`}`
`369`	`373`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,7 @@ class TestVisualStudioFinder extends VisualStudioFinder {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-const shouldSkip = process.platform !== 'win32'`
`25`		`-`
`26`	`24`	`describe('find-visualstudio', function () {`
`27`		`- if (shouldSkip) {`
`28`		`- return`
`29`		`- }`
`30`		`-`
`31`	`25`	`this.beforeAll(function () {`
`32`	`26`	`// Condition to skip the test suite`
`33`	`27`	`if (process.env.SystemRoot === undefined) {`