Skip to content

Commit f6cc1fb

Browse files
sean-mcmanusdependabot[bot]DavidARaygoza
authored
Cherry-picks and changelog update for 1.31.5 release (#14393)
* Bump @xmldom/xmldom from 0.8.11 to 0.8.12 in /Extension (#14340) Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.8.11 to 0.8.12. - [Release notes](https://github.com/xmldom/xmldom/releases) - [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md) - [Commits](xmldom/xmldom@0.8.11...0.8.12) --- updated-dependencies: - dependency-name: "@xmldom/xmldom" dependency-version: 0.8.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Set context flag for when C++ language server is activated (#14382) The primary purpose of this is for this flag to be consumed by the C++ devtools extensions. This way the C++ specific Copilot tools will only appear in tools list and register when the C++ language server is actually activated. * Update lodash. (#14350) * Bump picomatch from 2.3.1 to 2.3.2 in /ExtensionPack (#14318) Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump picomatch from 2.3.1 to 2.3.2 in /.github/actions (#14319) Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sean McManus <seanmcm@microsoft.com> * Bump picomatch from 2.3.1 to 2.3.2 in /Themes (#14323) Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update picomatch. (#14324) * Update brace-expansion v5. (#14325) * Update brace-expansion and serialize-javascript. (#14328) * Bump serialize-javascript from 7.0.4 to 7.0.5 in /.github/actions (#14332) Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 7.0.4 to 7.0.5. - [Release notes](https://github.com/yahoo/serialize-javascript/releases) - [Commits](yahoo/serialize-javascript@v7.0.4...v7.0.5) --- updated-dependencies: - dependency-name: serialize-javascript dependency-version: 7.0.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update brace-expansion for other folders (#14333) * Update brace-expansion for other folders. * Fix Reinstalling the Extension.md not being included. (#14390) * Update for 1.31.5. * Fix typo in changelog. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Raygoza <100718117+DavidARaygoza@users.noreply.github.com>
2 parents 668b33c + e0bd199 commit f6cc1fb

10 files changed

Lines changed: 75 additions & 70 deletions

File tree

‎.github/actions/package-lock.json‎

Lines changed: 15 additions & 15 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"yargs": "^17.5.1"
4141
},
4242
"overrides": {
43-
"serialize-javascript": "^7.0.4",
43+
"serialize-javascript": "^7.0.5",
4444
"flatted": "^3.4.2",
4545
"fast-xml-parser": "^5.5.7"
4646
}

‎Extension/.vscodeignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ eslint.config.js
3535
gulpfile.js
3636
localized_string_ids.h
3737
readme.developer.md
38-
Reinstalling the Extension.md
3938
test.tsconfig.json
4039
translations_auto_pr.js
4140
tsconfig.json

‎Extension/CHANGELOG.md‎

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

3+
## Version 1.31.5: April 20, 2026
4+
### Bug Fixes
5+
* Fix `Reinstalling the Extension.md` not being found. [#14389](https://github.com/microsoft/vscode-cpptools/issues/14389)
6+
* Fix the `C/C++ DevTools` extension language service tools not working after the `C/C++` extension updates via `Restart Extensions`. [#14392](https://github.com/microsoft/vscode-cpptools/issues/14392)
7+
38
## Version 1.31.4: March 31, 2026
49
### Bug Fix
510
* Debugging cpptools and cpptools-srv processes on macOS (to get call stacks) is now blocked when SIP is enabled (due to a potential security issue).

‎Extension/package.json‎

Lines changed: 2 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.31.4-main",
5+
"version": "1.31.5-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -6883,7 +6883,7 @@
68836883
"resolutions": {
68846884
"postcss": "^8.4.31",
68856885
"gulp-typescript/**/glob-parent": "^5.1.2",
6886-
"serialize-javascript": "^7.0.4",
6886+
"serialize-javascript": "^7.0.5",
68876887
"@azure/msal-browser": "^4.29.1",
68886888
"flatted": "^3.4.1"
68896889
}

‎Extension/src/LanguageServer/extension.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ export async function activate(): Promise<void> {
272272
}
273273

274274
await registerRelatedFilesProvider();
275+
await vscode.commands.executeCommand('setContext', 'cpptools.languageServerActivated', true);
275276
}
276277

277278
export function updateLanguageConfigurations(): void {

‎Extension/yarn.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,9 +1310,9 @@
13101310
integrity sha1-Ml20I5XNSf5sFAV/mpAOQn34gQ4=
13111311

13121312
"@xmldom/xmldom@^0.8.8":
1313-
version "0.8.11"
1314-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608"
1315-
integrity sha1-t53i1nOJc0xXxSWV96cwXjDC1gg=
1313+
version "0.8.12"
1314+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@xmldom/xmldom/-/xmldom-0.8.12.tgz#cf488a5435fa06c7374ad1449c69cea0f823624b"
1315+
integrity sha1-z0iKVDX6Bsc3StFEnGnOoPgjYks=
13161316

13171317
"@xtuc/ieee754@^1.2.0":
13181318
version "1.2.0"
@@ -1747,24 +1747,24 @@ boundary@^2.0.0:
17471747
integrity sha1-FpyLHw1Ezywlk4lnoyjzfgpOXvw=
17481748

17491749
brace-expansion@^1.1.7:
1750-
version "1.1.12"
1751-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
1752-
integrity sha1-q5tFRGblqMw6GHvqrVgEEqnFuEM=
1750+
version "1.1.13"
1751+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6"
1752+
integrity sha1-03h1wB3J7/mI3UnREqV8tntU7+Y=
17531753
dependencies:
17541754
balanced-match "^1.0.0"
17551755
concat-map "0.0.1"
17561756

17571757
brace-expansion@^2.0.1:
1758-
version "2.0.2"
1759-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
1760-
integrity sha1-VPxTI3phPYVMe9N0Y6rRffhyFOc=
1758+
version "2.0.3"
1759+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-2.0.3.tgz#0493338bdd58e319b1039c67cf7ee439892c01d9"
1760+
integrity sha1-BJMzi91Y4xmxA5xnz37kOYksAdk=
17611761
dependencies:
17621762
balanced-match "^1.0.0"
17631763

17641764
brace-expansion@^5.0.2:
1765-
version "5.0.3"
1766-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.3.tgz#6a9c6c268f85b53959ec527aeafe0f7300258eef"
1767-
integrity sha1-apxsJo+FtTlZ7FJ66v4PcwAlju8=
1765+
version "5.0.5"
1766+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/brace-expansion/-/brace-expansion-5.0.5.tgz#dcc3a37116b79f3e1b46db994ced5d570e930fdb"
1767+
integrity sha1-3MOjcRa3nz4bRtuZTO1dVw6TD9s=
17681768
dependencies:
17691769
balanced-match "^4.0.2"
17701770

@@ -4271,9 +4271,9 @@ lodash.truncate@^4.4.2:
42714271
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
42724272

42734273
lodash@^4.17.23:
4274-
version "4.17.23"
4275-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
4276-
integrity sha1-8ROwN4OGEDvk9okziMc9C95/LFo=
4274+
version "4.18.1"
4275+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
4276+
integrity sha1-/ytmwfYybVlRPeJAe/iBQ5gSdxw=
42774277

42784278
log-symbols@^4.1.0:
42794279
version "4.1.0"
@@ -4974,14 +4974,14 @@ picocolors@^1.1.1:
49744974
integrity sha1-PTIa8+q5ObCDyPkpodEs2oHCa2s=
49754975

49764976
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
4977-
version "2.3.1"
4978-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
4979-
integrity sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=
4977+
version "2.3.2"
4978+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
4979+
integrity sha1-WpQpFeJrNy3A8OZ1MUmhbmscVgE=
49804980

49814981
picomatch@^4.0.3:
4982-
version "4.0.3"
4983-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
4984-
integrity sha1-eWx2E20e6tcV2x57rXhd7daVoEI=
4982+
version "4.0.4"
4983+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
4984+
integrity sha1-/W9eAKFDCG4HTf/kySS4+yk7BYk=
49854985

49864986
pkg-dir@^4.2.0:
49874987
version "4.2.0"
@@ -5448,10 +5448,10 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4, semve
54485448
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
54495449
integrity sha1-KEZONgYOmR+noR0CedLT87V6foo=
54505450

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=
5451+
serialize-javascript@^6.0.2, serialize-javascript@^7.0.5:
5452+
version "7.0.5"
5453+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/serialize-javascript/-/serialize-javascript-7.0.5.tgz#c798cc0552ffbb08981914a42a8756e339d0d5b1"
5454+
integrity sha1-x5jMBVL/uwiYGRSkKodW4znQ1bE=
54555455

54565456
set-function-length@^1.2.2:
54575457
version "1.2.2"

‎ExtensionPack/package-lock.json‎

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

‎Themes/package-lock.json‎

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

‎Themes/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
]
6464
},
6565
"devDependencies": {
66-
"@vscode/vsce": "3.7.1"
66+
"@vscode/vsce": "^3.7.1"
6767
},
6868
"overrides": {
6969
"@azure/msal-browser": "^4.29.1"

0 commit comments

Comments
 (0)