Skip to content

Commit e4f859d

Browse files
sean-mcmanussean-mcmanus
authored
Merge pull request #13718 from microsoft/main
Merge for 1.26.3 release
2 parents 97c5f14 + df70e44 commit e4f859d

File tree

102 files changed

+1927
-2322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1927
-2322
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/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ server
1010
debugAdapters
1111
LLVM
1212
bin/cpptools*
13+
bin/libc.so
1314
bin/*.dll
1415
bin/.vs
1516
bin/LICENSE.txt

‎Extension/CHANGELOG.md‎

Lines changed: 28 additions & 1055 deletions
Large diffs are not rendered by default.

‎Extension/ThirdPartyNotices.txt‎

Lines changed: 58 additions & 58 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
---------------------------------------------------------
@@ -1323,7 +1323,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
13231323

13241324
---------------------------------------------------------
13251325

1326-
brace-expansion 1.1.11 - MIT
1326+
brace-expansion 1.1.12 - MIT
13271327
https://github.com/juliangruber/brace-expansion
13281328

13291329
Copyright (c) 2013 Julian Gruber <[email protected]>
@@ -1355,7 +1355,7 @@ SOFTWARE.
13551355

13561356
---------------------------------------------------------
13571357

1358-
brace-expansion 2.0.1 - MIT
1358+
brace-expansion 2.0.2 - MIT
13591359
https://github.com/juliangruber/brace-expansion
13601360

13611361
Copyright (c) 2013 Julian Gruber <[email protected]>
@@ -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 7.1.1 - MIT
23972397
https://github.com/Microsoft/vscode-cpptools-api#readme
23982398

23992399
Copyright (c) Microsoft Corporation

‎Extension/bin/linux.clang.arm.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__arm__=1",
8-
"-D__ARM_32BIT_STATE=1",
9-
"-D__PTRDIFF_TYPE__=int",
10-
"-D__SIZE_TYPE__=unsigned int",
11-
"-D__WCHAR_TYPE__=long int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__arm__=1",
7+
"-D__ARM_32BIT_STATE=1",
8+
"-D__PTRDIFF_TYPE__=int",
9+
"-D__SIZE_TYPE__=unsigned int",
10+
"-D__WCHAR_TYPE__=long int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.arm64.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__aarch64__=1",
8-
"-D__ARM_64BIT_STATE=1",
9-
"-D__PTRDIFF_TYPE__=long int",
10-
"-D__SIZE_TYPE__=long unsigned int",
11-
"-D__WCHAR_TYPE__=int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__aarch64__=1",
7+
"-D__ARM_64BIT_STATE=1",
8+
"-D__PTRDIFF_TYPE__=long int",
9+
"-D__SIZE_TYPE__=long unsigned int",
10+
"-D__WCHAR_TYPE__=int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.x64.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__x86_64=1",
8-
"-D__x86_64__=1",
9-
"-D__PTRDIFF_TYPE__=long int",
10-
"-D__SIZE_TYPE__=long unsigned int",
11-
"-D__WCHAR_TYPE__=int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__x86_64=1",
7+
"-D__x86_64__=1",
8+
"-D__PTRDIFF_TYPE__=long int",
9+
"-D__SIZE_TYPE__=long unsigned int",
10+
"-D__WCHAR_TYPE__=int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.x86.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__i386=1",
8-
"-D__i386__=1",
9-
"-D__PTRDIFF_TYPE__=int",
10-
"-D__SIZE_TYPE__=unsigned int",
11-
"-D__WCHAR_TYPE__=long int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__i386=1",
7+
"-D__i386__=1",
8+
"-D__PTRDIFF_TYPE__=int",
9+
"-D__SIZE_TYPE__=unsigned int",
10+
"-D__WCHAR_TYPE__=long int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/macos.clang.arm.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__arm__=1",
7-
"-D__ARM_32BIT_STATE=1",
8-
"-D__PTRDIFF_TYPE__=int",
9-
"-D__SIZE_TYPE__=unsigned int",
10-
"-D__WCHAR_TYPE__=long int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__arm__=1",
6+
"-D__ARM_32BIT_STATE=1",
7+
"-D__PTRDIFF_TYPE__=int",
8+
"-D__SIZE_TYPE__=unsigned int",
9+
"-D__WCHAR_TYPE__=long int"
10+
],
11+
"defaults_op": "merge"
12+
}

‎Extension/bin/macos.clang.arm64.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__aarch64__=1",
7-
"-D__ARM_64BIT_STATE=1",
8-
"-D__PTRDIFF_TYPE__=long int",
9-
"-D__SIZE_TYPE__=long unsigned int",
10-
"-D__WCHAR_TYPE__=int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__aarch64__=1",
6+
"-D__ARM_64BIT_STATE=1",
7+
"-D__PTRDIFF_TYPE__=long int",
8+
"-D__SIZE_TYPE__=long unsigned int",
9+
"-D__WCHAR_TYPE__=int"
10+
],
11+
"defaults_op": "merge"
12+
}

0 commit comments

Comments
 (0)