Skip to content

Add support for VS2022 - #48

Merged
ilammy merged 4 commits into
ilammy:masterfrom
beached:master
Oct 7, 2021
Merged

ilammy merged 4 commits into
ilammy:masterfrom
beached:master

Conversation

@beached

@beached beached commented Oct 5, 2021

Copy link
Copy Markdown
Contributor

This allows support of VS2022, it adds the check to programfiles in addition to programfilesx86

Comment thread index.js Outdated
Comment on lines +37 to +48
for (const prog_files of PROGRAM_FILES) {
for (const ver of VERSIONS) {
for (const ed of EDITIONS) {
path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
core.info(`Trying standard location: ${path}`)
if (fs.existsSync(path)) {
core.info(`Found standard location: ${path}`)
return path
}
}
}
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, please follow the original rule of indentation.

Suggested change
for (const prog_files of PROGRAM_FILES) {
for (const ver of VERSIONS) {
for (const ed of EDITIONS) {
path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
core.info(`Trying standard location: ${path}`)
if (fs.existsSync(path)) {
core.info(`Found standard location: ${path}`)
return path
}
}
}
}
for (const prog_files of PROGRAM_FILES) {
for (const ver of VERSIONS) {
for (const ed of EDITIONS) {
path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
core.info(`Trying standard location: ${path}`)
if (fs.existsSync(path)) {
core.info(`Found standard location: ${path}`)
return path
}
}
}
}

@beached

beached commented Oct 6, 2021

Copy link
Copy Markdown
Contributor Author

Sorry about that, I think I fixed it. 2 spaces per indent.

@pzhlkj6612

Copy link
Copy Markdown
Contributor

Sorry about that, I think I fixed it. 2 spaces per indent.

Well, not really. The original is 4 spaces per indent... 🤪
Could you please adjust it again?

In addition, just now, you could have applied my suggestion on GitHub without submitting a new commit manually. See Incorporating feedback in your pull request - GitHub Docs.

@pzhlkj6612 pzhlkj6612 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@ilammy

ilammy commented Oct 7, 2021

Copy link
Copy Markdown
Owner

Thanks! Both of you ❤️

@ilammy
ilammy merged commit bb050e7 into ilammy:master Oct 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants