Skip to content

Commit f818529

Browse files
sean-mcmanussean-mcmanus
authored
Merge pull request #12517 from microsoft/seanmcm/1_21_4_release
Merge for 1.21.4
2 parents 287ee39 + 41a05a9 commit f818529

File tree

4 files changed

+515
-357
lines changed

4 files changed

+515
-357
lines changed

‎Extension/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# C/C++ for Visual Studio Code Changelog
22

3+
## Version 1.21.4: July 25, 2024
4+
* Re-enable compatibility with VS Code 1.67.0 (instead of 1.82.0). [#12507](https://github.com/microsoft/vscode-cpptools/issues/12507)
5+
36
## Version 1.21.3: July 24, 2024
47
* Fix a crash on Linux ARM OS's. [#12497](https://github.com/microsoft/vscode-cpptools/issues/12497)
58

‎Extension/ThirdPartyNotices.txt

+194-25
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
683683

684684
---------------------------------------------------------
685685

686-
semver 7.6.2 - ISC
686+
semver 7.6.3 - ISC
687687
https://github.com/npm/node-semver#readme
688688

689689
Copyright Isaac Z. Schlueter
@@ -762,12 +762,13 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
762762

763763
---------------------------------------------------------
764764

765-
@microsoft/applicationinsights-channel-js 3.2.2 - MIT
765+
@microsoft/1ds-core-js 4.3.0 - MIT
766766
https://github.com/microsoft/ApplicationInsights-JS#readme
767767

768+
copyright Microsoft 2018
768769
Copyright (c) Microsoft Corporation
769770
Copyright (c) Microsoft and contributors
770-
Copyright (c) NevWare21 and contributors
771+
Copyright (c) NevWare21 Solutions LLC and contributors
771772

772773
The MIT License (MIT)
773774

@@ -791,17 +792,53 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
791792
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
792793
SOFTWARE.
793794

795+
---------------------------------------------------------
796+
797+
---------------------------------------------------------
798+
799+
@microsoft/1ds-post-js 4.3.0 - MIT
800+
https://github.com/microsoft/ApplicationInsights-JS#readme
801+
802+
copyright Microsoft 2018
803+
copyright Microsoft 2020
804+
copyright Microsoft 2018-2020
805+
copyright Microsoft 2022 Simple
806+
Copyright (c) Microsoft Corporation
807+
Copyright (c) Microsoft and contributors
808+
Copyright (c) NevWare21 Solutions LLC and contributors
809+
810+
The MIT License (MIT)
811+
812+
Copyright (c) Microsoft Corporation
813+
814+
Permission is hereby granted, free of charge, to any person obtaining a copy
815+
of this software and associated documentation files (the "Software"), to deal
816+
in the Software without restriction, including without limitation the rights
817+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
818+
copies of the Software, and to permit persons to whom the Software is
819+
furnished to do so, subject to the following conditions:
820+
821+
The above copyright notice and this permission notice shall be included in all
822+
copies or substantial portions of the Software.
823+
824+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
825+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
826+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
827+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
828+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
829+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
830+
SOFTWARE.
794831

795832
---------------------------------------------------------
796833

797834
---------------------------------------------------------
798835

799-
@microsoft/applicationinsights-common 3.2.2 - MIT
836+
@microsoft/applicationinsights-channel-js 3.3.0 - MIT
800837
https://github.com/microsoft/ApplicationInsights-JS#readme
801838

802839
Copyright (c) Microsoft Corporation
803840
Copyright (c) Microsoft and contributors
804-
Copyright (c) NevWare21 and contributors
841+
Copyright (c) NevWare21 Solutions LLC and contributors
805842

806843
The MIT License (MIT)
807844

@@ -830,12 +867,46 @@ SOFTWARE.
830867

831868
---------------------------------------------------------
832869

833-
@microsoft/applicationinsights-core-js 3.2.2 - MIT
870+
@microsoft/applicationinsights-common 3.3.0 - MIT
834871
https://github.com/microsoft/ApplicationInsights-JS#readme
835872

836873
Copyright (c) Microsoft Corporation
837874
Copyright (c) Microsoft and contributors
838-
Copyright (c) NevWare21 and contributors
875+
Copyright (c) NevWare21 Solutions LLC and contributors
876+
877+
The MIT License (MIT)
878+
879+
Copyright (c) Microsoft Corporation
880+
881+
Permission is hereby granted, free of charge, to any person obtaining a copy
882+
of this software and associated documentation files (the "Software"), to deal
883+
in the Software without restriction, including without limitation the rights
884+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
885+
copies of the Software, and to permit persons to whom the Software is
886+
furnished to do so, subject to the following conditions:
887+
888+
The above copyright notice and this permission notice shall be included in all
889+
copies or substantial portions of the Software.
890+
891+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
892+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
893+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
894+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
895+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
896+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
897+
SOFTWARE.
898+
899+
900+
---------------------------------------------------------
901+
902+
---------------------------------------------------------
903+
904+
@microsoft/applicationinsights-core-js 3.3.0 - MIT
905+
https://github.com/microsoft/ApplicationInsights-JS#readme
906+
907+
Copyright (c) Microsoft Corporation
908+
Copyright (c) Microsoft and contributors
909+
Copyright (c) NevWare21 Solutions LLC and contributors
839910

840911
The MIT License (MIT)
841912

@@ -893,6 +964,40 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
893964
SOFTWARE.
894965

895966

967+
---------------------------------------------------------
968+
969+
---------------------------------------------------------
970+
971+
@microsoft/applicationinsights-web-basic 3.3.0 - MIT
972+
https://github.com/microsoft/ApplicationInsights-JS#readme
973+
974+
Copyright (c) Microsoft Corporation
975+
Copyright (c) Microsoft and contributors
976+
Copyright (c) NevWare21 Solutions LLC and contributors
977+
978+
The MIT License (MIT)
979+
980+
Copyright (c) Microsoft Corporation
981+
982+
Permission is hereby granted, free of charge, to any person obtaining a copy
983+
of this software and associated documentation files (the "Software"), to deal
984+
in the Software without restriction, including without limitation the rights
985+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
986+
copies of the Software, and to permit persons to whom the Software is
987+
furnished to do so, subject to the following conditions:
988+
989+
The above copyright notice and this permission notice shall be included in all
990+
copies or substantial portions of the Software.
991+
992+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
993+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
994+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
995+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
996+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
997+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
998+
SOFTWARE.
999+
1000+
8961001
---------------------------------------------------------
8971002

8981003
---------------------------------------------------------
@@ -931,17 +1036,17 @@ SOFTWARE.
9311036

9321037
---------------------------------------------------------
9331038

934-
@nevware21/ts-async 0.5.1 - MIT
1039+
@nevware21/ts-async 0.5.2 - MIT
9351040
https://github.com/nevware21/ts-async
9361041

937-
Copyright (c) 2022 Nevware21
938-
Copyright (c) 2023 Nevware21
939-
Copyright (c) 2024 Nevware21
940-
Copyright (c) NevWare21 and contributors
1042+
Copyright (c) 2022 NevWare21 Solutions LLC
1043+
Copyright (c) 2023 NevWare21 Solutions LLC
1044+
Copyright (c) 2024 NevWare21 Solutions LLC
1045+
Copyright (c) NevWare21 Solutions LLC and contributors
9411046

9421047
MIT License
9431048

944-
Copyright (c) 2022 Nevware21
1049+
Copyright (c) 2022 NevWare21 Solutions LLC
9451050

9461051
Permission is hereby granted, free of charge, to any person obtaining a copy
9471052
of this software and associated documentation files (the "Software"), to deal
@@ -966,18 +1071,17 @@ SOFTWARE.
9661071

9671072
---------------------------------------------------------
9681073

969-
@nevware21/ts-utils 0.11.2 - MIT
1074+
@nevware21/ts-utils 0.11.3 - MIT
9701075
https://github.com/nevware21/ts-utils
9711076

972-
Copyright (c) 2022 NevWare21
973-
Copyright (c) 2022 Nevware21
974-
Copyright (c) 2023 Nevware21
975-
Copyright (c) 2024 Nevware21
976-
Copyright (c) NevWare21 and contributors
1077+
Copyright (c) 2022 NevWare21 Solutions LLC
1078+
Copyright (c) 2023 NevWare21 Solutions LLC
1079+
Copyright (c) 2024 NevWare21 Solutions LLC
1080+
Copyright (c) NevWare21 Solutions LLC and contributors
9771081

9781082
MIT License
9791083

980-
Copyright (c) 2022 NevWare21
1084+
Copyright (c) 2022 NevWare21 Solutions LLC
9811085

9821086
Permission is hereby granted, free of charge, to any person obtaining a copy
9831087
of this software and associated documentation files (the "Software"), to deal
@@ -1403,7 +1507,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
14031507

14041508
---------------------------------------------------------
14051509

1406-
comment-json 4.2.3 - MIT
1510+
comment-json 4.2.4 - MIT
14071511
https://github.com/kaelzhang/node-comment-json#readme
14081512

14091513
Copyright (c) 2013 kaelzhang
@@ -1489,6 +1593,38 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
14891593
IN THE SOFTWARE.
14901594

14911595

1596+
---------------------------------------------------------
1597+
1598+
---------------------------------------------------------
1599+
1600+
debug 4.3.4 - MIT
1601+
https://github.com/debug-js/debug#readme
1602+
1603+
Copyright (c) 2018-2021 Josh Junon
1604+
Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>
1605+
1606+
(The MIT License)
1607+
1608+
Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>
1609+
Copyright (c) 2018-2021 Josh Junon
1610+
1611+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
1612+
and associated documentation files (the 'Software'), to deal in the Software without restriction,
1613+
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1614+
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
1615+
subject to the following conditions:
1616+
1617+
The above copyright notice and this permission notice shall be included in all copies or substantial
1618+
portions of the Software.
1619+
1620+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
1621+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
1622+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
1623+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
1624+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1625+
1626+
1627+
14921628
---------------------------------------------------------
14931629

14941630
---------------------------------------------------------
@@ -1867,6 +2003,38 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
18672003
THE SOFTWARE.
18682004

18692005

2006+
---------------------------------------------------------
2007+
2008+
---------------------------------------------------------
2009+
2010+
ms 2.1.2 - MIT
2011+
https://github.com/zeit/ms#readme
2012+
2013+
Copyright (c) 2016 Zeit, Inc.
2014+
2015+
The MIT License (MIT)
2016+
2017+
Copyright (c) 2016 Zeit, Inc.
2018+
2019+
Permission is hereby granted, free of charge, to any person obtaining a copy
2020+
of this software and associated documentation files (the "Software"), to deal
2021+
in the Software without restriction, including without limitation the rights
2022+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
2023+
copies of the Software, and to permit persons to whom the Software is
2024+
furnished to do so, subject to the following conditions:
2025+
2026+
The above copyright notice and this permission notice shall be included in all
2027+
copies or substantial portions of the Software.
2028+
2029+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2030+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2031+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2032+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2033+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2034+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2035+
SOFTWARE.
2036+
2037+
18702038
---------------------------------------------------------
18712039

18722040
---------------------------------------------------------
@@ -1907,6 +2075,7 @@ SOFTWARE.
19072075
node-loader 2.0.0 - MIT
19082076
https://github.com/webpack-contrib/node-loader
19092077

2078+
Copyright JS Foundation and other contributors
19102079

19112080
Copyright JS Foundation and other contributors
19122081

@@ -2395,7 +2564,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
23952564

23962565
---------------------------------------------------------
23972566

2398-
vscode-jsonrpc 8.2.0 - MIT
2567+
vscode-jsonrpc 8.1.0 - MIT
23992568
https://github.com/Microsoft/vscode-languageserver-node#readme
24002569

24012570
Copyright (c) Microsoft Corporation
@@ -2417,7 +2586,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
24172586

24182587
---------------------------------------------------------
24192588

2420-
vscode-languageclient 9.0.1 - MIT
2589+
vscode-languageclient 8.1.0 - MIT
24212590
https://github.com/Microsoft/vscode-languageserver-node#readme
24222591

24232592
Copyright (c) Microsoft Corporation
@@ -2439,7 +2608,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
24392608

24402609
---------------------------------------------------------
24412610

2442-
vscode-languageserver-protocol 3.17.5 - MIT
2611+
vscode-languageserver-protocol 3.17.3 - MIT
24432612
https://github.com/Microsoft/vscode-languageserver-node#readme
24442613

24452614
Copyright (c) Microsoft Corporation
@@ -2462,7 +2631,7 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
24622631

24632632
---------------------------------------------------------
24642633

2465-
vscode-languageserver-types 3.17.5 - MIT
2634+
vscode-languageserver-types 3.17.3 - MIT
24662635
https://github.com/Microsoft/vscode-languageserver-node#readme
24672636

24682637
Copyright (c) Microsoft Corporation

‎Extension/package.json

+2-2
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.21.3-main",
5+
"version": "1.21.4-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -6545,7 +6545,7 @@
65456545
"ssh-config": "^4.4.4",
65466546
"tmp": "^0.2.3",
65476547
"vscode-cpptools": "^6.1.0",
6548-
"vscode-languageclient": "^9.0.1",
6548+
"vscode-languageclient": "^8.1.0",
65496549
"vscode-nls": "^5.2.0",
65506550
"vscode-tas-client": "^0.1.84",
65516551
"which": "^2.0.2"

0 commit comments

Comments
 (0)