Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This will look for Visual Studio in the Correct directory. #143479

Merged
merged 14 commits into from Feb 28, 2022
Merged

This will look for Visual Studio in the Correct directory. #143479

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9bff15c
Specified the address of 'Microsoft Visual Studio' depending upon the…
Feb 19, 2022
128db49
Merge branch 'main' into main
Feb 20, 2022
398fda9
Changed preinstall to look for Visual Studio in the correct directory
Feb 20, 2022
5e60405
Merge branch 'main' into main
Feb 20, 2022
e3a6032
Merge branch 'main' into main
Feb 20, 2022
fd8d6b0
Merge branch 'microsoft:main' into main
Feb 22, 2022
5a4517f
Merge branch 'main' into main
Feb 22, 2022
b155059
Merge branch 'microsoft:main' into main
Feb 23, 2022
de8fbd3
Merge branch 'microsoft:main' into main
Feb 23, 2022
8babd42
Updated preinstall.js to look for VS in the correct directory
Feb 23, 2022
eb1302c
Merge branch 'main' into main
Feb 23, 2022
585c998
Merge branch 'microsoft:main' into main
Feb 25, 2022
3e6ec0d
Merge branch 'main' into main
Feb 25, 2022
18ac6ec
Merge branch 'microsoft:main' into main
Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions build/npm/preinstall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ function hasSupportedVisualStudioVersion() {
break;
}
const programFiles86Path = process.env['ProgramFiles(x86)'];
const programFiles64Path = process.env['ProgramFiles'];

if (programFiles64Path) {
vsPath = `${programFiles64Path}/Microsoft Visual Studio/${version}`;
const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
availableVersions.push(version);
break;
}
}

if (programFiles86Path) {
vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
Expand Down