Skip to content

Commit

Permalink
Only visual studio 2015 neesd fixes the windows sdk path (#3837)
Browse files Browse the repository at this point in the history
Co-authored-by: Garrett Campbell <[email protected]>
  • Loading branch information
lygstate and gcampbell-msft authored Jul 18, 2024
1 parent 1a5d186 commit 8ed18b2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Bug Fixes:
- Fix the bug where if a relative path specified for `installDir`, it is not calculated relative to the source directory, which is how it should be according to the CMake `installDir` docs [here](https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html#configure-preset). [#3871](https://github.com/microsoft/vscode-cmake-tools/issues/3871)
- Fix issue with CMakeLists.txt depth search. [#3901](https://github.com/microsoft/vscode-cmake-tools/issues/3901)
- Fix localized file path for schema files. [#3872](https://github.com/microsoft/vscode-cmake-tools/issues/3872)
- Disable annoy and invalid extenion message about fix windows sdk for MSVC 2022. [#3837](https://github.com/microsoft/vscode-cmake-tools/pull/3837)

## 1.18.43

Expand Down
2 changes: 1 addition & 1 deletion src/installs/visualStudio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ async function collectDevBatVars(hostArch: string, devBat: string, args: string[
} catch (err) {
log.error(`Parse '${WindowsSDKVersion}' failed`);
}
if (util.compareVersion(WindowsSDKVersionParsed, { major: 10, minor: 0, patch: 14393 }) >= 0) {
if (majorVersion === 14 && util.compareVersion(WindowsSDKVersionParsed, { major: 10, minor: 0, patch: 14393 }) >= 0) {
const WindowsSdkDir = vars['WindowsSdkDir'] ?? '';
const existPath = vars['PATH'] ?? '';
const oldWinSdkBinPath = path.join(WindowsSdkDir, 'bin', hostArch);
Expand Down

0 comments on commit 8ed18b2

Please sign in to comment.