Skip to content

Commit adf4681

Browse files
authored
Merge pull request #14291 from microsoft/seanmcm/1_31_3_release
Merge for 1.31.3
2 parents fa71378 + a53dac8 commit adf4681

12 files changed

Lines changed: 110 additions & 87 deletions

File tree

.github/actions/package-lock.json

Lines changed: 25 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@
3838
"ts-node": "^10.9.1",
3939
"typescript": "^4.7.4",
4040
"yargs": "^17.5.1"
41+
},
42+
"overrides": {
43+
"serialize-javascript": "^7.0.4",
44+
"flatted": "^3.4.1"
4145
}
4246
}

Build/package/jobs_package_vsix.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ jobs:
3838
inputs:
3939
version: 22.x
4040

41-
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
42-
displayName: Use Yarn 1.x
43-
4441
- script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
4542
displayName: Delete .npmrc if it exists
4643

@@ -51,9 +48,9 @@ jobs:
5148
script: |
5249
export SRC_DIR=$(echo $BUILD_SOURCESDIRECTORY | sed 's|\\|/|g')
5350
cd "$SRC_DIR/${{ parameters.srcDir }}"
54-
yarn install
51+
npm install
5552
if [ $? -ne 0 ]; then
56-
echo "yarn install failed, sleeping for 30s before retrying..."
53+
echo "npm install failed, sleeping for 30s before retrying..."
5754
sleep 30
5855
exit 1
5956
fi

Extension/CHANGELOG.md

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
# C/C++ for Visual Studio Code Changelog
22

3-
## Version 1.31.1: March 10, 2026
4-
### Enhancements
5-
* Update clang-tidy and clang-format from 21.1.4 to 22.1.0.
6-
* Update support for the latest compiler versions.
7-
8-
### Bug Fixes
9-
* Fix workspace symbol search with `scope::variable` not working after symbols are deleted and then added back. [#14200](https://github.com/microsoft/vscode-cpptools/issues/14200)
10-
* Fix bugs where a path was checked for existence but not whether it was a file or a folder. [#14257](https://github.com/microsoft/vscode-cpptools/issues/14257)
11-
* Add IntelliSense support for `__builtin_is_implicit_lifetime`.
12-
* Fix three IntelliSense process crashes.
13-
* Fix a bug with `-embed-directory`.
14-
* Add some missing translations.
15-
16-
## Version 1.31.0: February 19, 2026
17-
### Enhancements
3+
## Version 1.31.3: March 23, 2026
184
* Add support for `program` in attach debug configurations. [#14046](https://github.com/microsoft/vscode-cpptools/issues/14046)
195
* Thanks for the contribution. [@Subham-KRLX (Subham)](https://github.com/Subham-KRLX) [PR #14108](https://github.com/microsoft/vscode-cpptools/pull/14108)
6+
* Update clang-tidy and clang-format from 21.1.4 to 22.1.1.
7+
* Update support for the latest compiler versions.
208
* Update SQLite to the latest version.
219

2210
### Bug Fixes
2311
* Fix an IntelliSense error with deducing `this` (explicit object member functions) with conversion operators. [#14140](https://github.com/microsoft/vscode-cpptools/issues/14140)
2412
* Fix `embed-dir` compiler arguments not being handled for IntelliSense. [#14154](https://github.com/microsoft/vscode-cpptools/issues/14154)
13+
* Fix workspace symbol search with `scope::variable` not working after symbols are deleted and then added back. [#14200](https://github.com/microsoft/vscode-cpptools/issues/14200)
14+
* Fix bugs where a path was checked for existence but not whether it was a file or a folder. [#14257](https://github.com/microsoft/vscode-cpptools/issues/14257)
15+
* Add IntelliSense support for `__builtin_is_implicit_lifetime`.
16+
* Fix three IntelliSense process crashes.
17+
* Fix some missing translations.
2518

26-
## Version 1.30.5: February 9. 2026
19+
## Version 1.30.5: February 9, 2026
2720
### Bug Fix
2821
* Fix a potential language server deadlock after editing code.
2922

Extension/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.30.5-main",
5+
"version": "1.31.3-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -6880,6 +6880,9 @@
68806880
},
68816881
"resolutions": {
68826882
"postcss": "^8.4.31",
6883-
"gulp-typescript/**/glob-parent": "^5.1.2"
6883+
"gulp-typescript/**/glob-parent": "^5.1.2",
6884+
"serialize-javascript": "^7.0.4",
6885+
"@azure/msal-browser": "^4.29.1",
6886+
"flatted": "^3.4.1"
68846887
}
68856888
}

Extension/readme.developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The `launch.json` entries now specify a `preLaunchTask` that will build the exte
5252
the `yarn watch` command, and will wait until the build is ready. The watch command will continue to watch from
5353
that point.
5454

55-
If the extension is already built, the the watch will be very quick.
55+
If the extension is already built, the watch will be very quick.
5656

5757
### From Inside VS Code
5858
There are two tasks that can be run from inside VS Code to build the extension.

Extension/src/LanguageServer/configurations.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,10 +1672,10 @@ export class CppProperties {
16721672
if (!isCl && compilerPathAndArgs.compilerPath) {
16731673
const compilerPathMayNeedQuotes: boolean = !resolvedCompilerPath.startsWith('"') && resolvedCompilerPath.includes(" ") && compilerPathAndArgs.compilerArgsFromCommandLineInPath.length > 0;
16741674
let pathExists: boolean = true;
1675-
const existsWithExeAdded: (path: string) => boolean = (path: string) => isWindows && !path.startsWith("/") && util.checkFileExistsSync(path + ".exe");
1675+
const existsWithExeAdded: (path: string) => boolean = (path: string) => isWindows && !path.startsWith("/") && fs.existsSync(path + ".exe");
16761676

16771677
resolvedCompilerPath = compilerPathAndArgs.compilerPath;
1678-
if (!util.checkFileExistsSync(resolvedCompilerPath)) {
1678+
if (!fs.existsSync(resolvedCompilerPath)) {
16791679
if (existsWithExeAdded(resolvedCompilerPath)) {
16801680
resolvedCompilerPath += ".exe";
16811681
} else {
@@ -1686,7 +1686,7 @@ export class CppProperties {
16861686
} else if (rootUri) {
16871687
// Test if it was a relative path.
16881688
const absolutePath: string = rootUri.fsPath + path.sep + resolvedCompilerPath;
1689-
if (!util.checkFileExistsSync(absolutePath)) {
1689+
if (!fs.existsSync(absolutePath)) {
16901690
if (existsWithExeAdded(absolutePath)) {
16911691
resolvedCompilerPath = absolutePath + ".exe";
16921692
} else {

Extension/yarn.lock

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,23 @@
9797
"@typespec/ts-http-runtime" "^0.3.0"
9898
tslib "^2.6.2"
9999

100-
"@azure/msal-browser@^4.2.0":
101-
version "4.29.0"
102-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-browser/-/msal-browser-4.29.0.tgz#6d711acd3b463b46bdae05445b83547816fb8f5c"
103-
integrity sha1-bXEazTtGO0a9rgVEW4NUeBb7j1w=
100+
"@azure/msal-browser@^4.2.0", "@azure/msal-browser@^4.29.1":
101+
version "4.29.1"
102+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-browser/-/msal-browser-4.29.1.tgz#01dc1d2f6ed325e32c03d3939c171f4f4d20a56d"
103+
integrity sha1-AdwdL27TJeMsA9OTnBcfT00gpW0=
104104
dependencies:
105-
"@azure/msal-common" "15.15.0"
105+
"@azure/msal-common" "15.16.1"
106106

107107
"@azure/msal-common@15.15.0":
108108
version "15.15.0"
109109
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-common/-/msal-common-15.15.0.tgz#05e758b41923499af7ca0965edaafc28a2acf615"
110110
integrity sha1-BedYtBkjSZr3ygll7ar8KKKs9hU=
111111

112+
"@azure/msal-common@15.16.1":
113+
version "15.16.1"
114+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-common/-/msal-common-15.16.1.tgz#5df3697ec0d53d08278f2536d53bd52214e52c39"
115+
integrity sha1-XfNpfsDVPQgnjyU21TvVIhTlLDk=
116+
112117
"@azure/msal-node@^3.5.0":
113118
version "3.8.8"
114119
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@azure/msal-node/-/msal-node-3.8.8.tgz#e7f161ceea81ea41b4ea6eaeadb5bfda35f8d0ba"
@@ -3031,10 +3036,10 @@ flat@^5.0.2:
30313036
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
30323037
integrity sha1-jKb+MyBp/6nTJMMnGYxZglnOskE=
30333038

3034-
flatted@^3.2.9:
3035-
version "3.3.3"
3036-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
3037-
integrity sha1-Z8j62VRUp8er6/dLt47nSkQCM1g=
3039+
flatted@^3.2.9, flatted@^3.4.1:
3040+
version "3.4.1"
3041+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/flatted/-/flatted-3.4.1.tgz#84ccd9579e76e9cc0d246c11d8be0beb019143e6"
3042+
integrity sha1-hMzZV5526cwNJGwR2L4L6wGRQ+Y=
30383043

30393044
flush-write-stream@^1.0.2:
30403045
version "1.1.1"
@@ -5125,13 +5130,6 @@ queue-microtask@^1.2.2:
51255130
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
51265131
integrity sha1-SSkii7xyTfrEPg77BYyve2z7YkM=
51275132

5128-
randombytes@^2.1.0:
5129-
version "2.1.0"
5130-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
5131-
integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=
5132-
dependencies:
5133-
safe-buffer "^5.1.0"
5134-
51355133
rc-config-loader@^4.1.3:
51365134
version "4.1.4"
51375135
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/rc-config-loader/-/rc-config-loader-4.1.4.tgz#6cc79042ac193ebed9f082fcba7b823d9dc143cc"
@@ -5450,12 +5448,10 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4, semve
54505448
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
54515449
integrity sha1-KEZONgYOmR+noR0CedLT87V6foo=
54525450

5453-
serialize-javascript@^6.0.2:
5454-
version "6.0.2"
5455-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
5456-
integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI=
5457-
dependencies:
5458-
randombytes "^2.1.0"
5451+
serialize-javascript@^6.0.2, serialize-javascript@^7.0.4:
5452+
version "7.0.4"
5453+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/serialize-javascript/-/serialize-javascript-7.0.4.tgz#c517735bd5b7631dd1fc191ee19cbb713ff8e05c"
5454+
integrity sha1-xRdzW9W3Yx3R/Bke4Zy7cT/44Fw=
54595455

54605456
set-function-length@^1.2.2:
54615457
version "1.2.2"
@@ -6284,9 +6280,9 @@ undici-types@~7.18.0:
62846280
integrity sha1-KTV6iee3ykrvO/D9P9DNc4hCKek=
62856281

62866282
undici@^7.19.0:
6287-
version "7.22.0"
6288-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.22.0.tgz#7a82590a5908e504a47d85c60b0f89ca14240e60"
6289-
integrity sha1-eoJZClkI5QSkfYXGCw+JyhQkDmA=
6283+
version "7.24.0"
6284+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/undici/-/undici-7.24.0.tgz#c7349cdede0db44226b5930783b11207831a5eaf"
6285+
integrity sha1-xzSc3t4NtEImtZMHg7ESB4MaXq8=
62906286

62916287
unicorn-magic@^0.1.0:
62926288
version "0.1.0"

ExtensionPack/package-lock.json

Lines changed: 17 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExtensionPack/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343
],
4444
"devDependencies": {
4545
"@vscode/vsce": "^3.7.1"
46+
},
47+
"overrides": {
48+
"@azure/msal-browser": "^4.29.1"
4649
}
4750
}

0 commit comments

Comments
 (0)