Skip to content

Commit 0d976f5

Browse files
authored
Merge pull request #13632 from microsoft/seanmcm/updateVsBranch
Update vs branch
2 parents 7a5fad9 + 6b29c5e commit 0d976f5

40 files changed

+806
-775
lines changed

.github/actions/package-lock.json

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

Extension/CHANGELOG.md

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

3+
## Version 1.26.0: May 22, 2025
4+
### Enhancement
5+
* Add support for c++26/2c, gnu++26/2c, and c++23preview configurations. [#12963](https://github.com/microsoft/vscode-cpptools/issues/12963), [#13133](https://github.com/microsoft/vscode-cpptools/issues/13133)
6+
7+
### Bug Fixes
8+
* Fix an invalid IntelliSense error with C++23 escape sequences. [#13338](https://github.com/microsoft/vscode-cpptools/issues/13338)
9+
* Fix switch header/source for CUDA files. [#13575](https://github.com/microsoft/vscode-cpptools/issues/13575)
10+
* Update Apple clang 16.4 to LLVM clang version mappings and fix incorrect mappings for Apple clang 14.
11+
* Update the bundled clang-tidy and clang-format from 1.20.3 to 1.20.5 (for bug fixes).
12+
313
## Version 1.25.3: April 28, 2025
414
### Enhancements
515
* Add a configuration warning message explaining why paths in quotes can't be found. [#11955](https://github.com/microsoft/vscode-cpptools/issues/11955)

Extension/ThirdPartyNotices.txt

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -377,61 +377,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
377377
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
378378

379379

380-
---------------------------------------------------------
381-
382-
---------------------------------------------------------
383-
384-
fs.realpath 1.0.0 - ISC
385-
https://github.com/isaacs/fs.realpath#readme
386-
387-
Copyright (c) Isaac Z. Schlueter and Contributors
388-
Copyright Joyent, Inc. and other Node contributors
389-
390-
The ISC License
391-
392-
Copyright (c) Isaac Z. Schlueter and Contributors
393-
394-
Permission to use, copy, modify, and/or distribute this software for any
395-
purpose with or without fee is hereby granted, provided that the above
396-
copyright notice and this permission notice appear in all copies.
397-
398-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
399-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
400-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
401-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
402-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
403-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
404-
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
405-
406-
----
407-
408-
This library bundles a version of the `fs.realpath` and `fs.realpathSync`
409-
methods from Node.js v0.10 under the terms of the Node.js MIT license.
410-
411-
Node's license follows, also included at the header of `old.js` which contains
412-
the licensed code:
413-
414-
Copyright Joyent, Inc. and other Node contributors.
415-
416-
Permission is hereby granted, free of charge, to any person obtaining a
417-
copy of this software and associated documentation files (the "Software"),
418-
to deal in the Software without restriction, including without limitation
419-
the rights to use, copy, modify, merge, publish, distribute, sublicense,
420-
and/or sell copies of the Software, and to permit persons to whom the
421-
Software is furnished to do so, subject to the following conditions:
422-
423-
The above copyright notice and this permission notice shall be included in
424-
all copies or substantial portions of the Software.
425-
426-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
427-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
428-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
429-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
430-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
431-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
432-
DEALINGS IN THE SOFTWARE.
433-
434-
435380
---------------------------------------------------------
436381

437382
---------------------------------------------------------
@@ -752,6 +697,61 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
752697
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
753698

754699

700+
---------------------------------------------------------
701+
702+
---------------------------------------------------------
703+
704+
fs.realpath 1.0.0 - ISC AND MIT
705+
https://github.com/isaacs/fs.realpath#readme
706+
707+
Copyright (c) Isaac Z. Schlueter and Contributors
708+
Copyright Joyent, Inc. and other Node contributors
709+
710+
The ISC License
711+
712+
Copyright (c) Isaac Z. Schlueter and Contributors
713+
714+
Permission to use, copy, modify, and/or distribute this software for any
715+
purpose with or without fee is hereby granted, provided that the above
716+
copyright notice and this permission notice appear in all copies.
717+
718+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
719+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
720+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
721+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
722+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
723+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
724+
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
725+
726+
----
727+
728+
This library bundles a version of the `fs.realpath` and `fs.realpathSync`
729+
methods from Node.js v0.10 under the terms of the Node.js MIT license.
730+
731+
Node's license follows, also included at the header of `old.js` which contains
732+
the licensed code:
733+
734+
Copyright Joyent, Inc. and other Node contributors.
735+
736+
Permission is hereby granted, free of charge, to any person obtaining a
737+
copy of this software and associated documentation files (the "Software"),
738+
to deal in the Software without restriction, including without limitation
739+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
740+
and/or sell copies of the Software, and to permit persons to whom the
741+
Software is furnished to do so, subject to the following conditions:
742+
743+
The above copyright notice and this permission notice shall be included in
744+
all copies or substantial portions of the Software.
745+
746+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
747+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
748+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
749+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
750+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
751+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
752+
DEALINGS IN THE SOFTWARE.
753+
754+
755755
---------------------------------------------------------
756756

757757
---------------------------------------------------------
@@ -2393,7 +2393,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
23932393

23942394
---------------------------------------------------------
23952395

2396-
vscode-cpptools 6.1.0 - MIT
2396+
vscode-cpptools 6.3.0 - MIT
23972397
https://github.com/Microsoft/vscode-cpptools-api#readme
23982398

23992399
Copyright (c) Microsoft Corporation

0 commit comments

Comments
 (0)