Skip to content

Commit

Permalink
Merge pull request #12517 from microsoft/seanmcm/1_21_4_release
Browse files Browse the repository at this point in the history
Merge for 1.21.4
  • Loading branch information
sean-mcmanus authored Jul 25, 2024
2 parents 287ee39 + 41a05a9 commit f818529
Show file tree
Hide file tree
Showing 4 changed files with 515 additions and 357 deletions.
3 changes: 3 additions & 0 deletions Extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# C/C++ for Visual Studio Code Changelog

## Version 1.21.4: July 25, 2024
* Re-enable compatibility with VS Code 1.67.0 (instead of 1.82.0). [#12507](https://github.com/microsoft/vscode-cpptools/issues/12507)

## Version 1.21.3: July 24, 2024
* Fix a crash on Linux ARM OS's. [#12497](https://github.com/microsoft/vscode-cpptools/issues/12497)

Expand Down
219 changes: 194 additions & 25 deletions Extension/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

---------------------------------------------------------

semver 7.6.2 - ISC
semver 7.6.3 - ISC
https://github.com/npm/node-semver#readme

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

---------------------------------------------------------

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

copyright Microsoft 2018
Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

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

---------------------------------------------------------

---------------------------------------------------------

@microsoft/1ds-post-js 4.3.0 - MIT
https://github.com/microsoft/ApplicationInsights-JS#readme

copyright Microsoft 2018
copyright Microsoft 2020
copyright Microsoft 2018-2020
copyright Microsoft 2022 Simple
Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

Copyright (c) Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

---------------------------------------------------------

---------------------------------------------------------

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

Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

Expand Down Expand Up @@ -830,12 +867,46 @@ SOFTWARE.

---------------------------------------------------------

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

Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

Copyright (c) Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------

@microsoft/applicationinsights-core-js 3.3.0 - MIT
https://github.com/microsoft/ApplicationInsights-JS#readme

Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

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


---------------------------------------------------------

---------------------------------------------------------

@microsoft/applicationinsights-web-basic 3.3.0 - MIT
https://github.com/microsoft/ApplicationInsights-JS#readme

Copyright (c) Microsoft Corporation
Copyright (c) Microsoft and contributors
Copyright (c) NevWare21 Solutions LLC and contributors

The MIT License (MIT)

Copyright (c) Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------
Expand Down Expand Up @@ -931,17 +1036,17 @@ SOFTWARE.

---------------------------------------------------------

@nevware21/ts-async 0.5.1 - MIT
@nevware21/ts-async 0.5.2 - MIT
https://github.com/nevware21/ts-async

Copyright (c) 2022 Nevware21
Copyright (c) 2023 Nevware21
Copyright (c) 2024 Nevware21
Copyright (c) NevWare21 and contributors
Copyright (c) 2022 NevWare21 Solutions LLC
Copyright (c) 2023 NevWare21 Solutions LLC
Copyright (c) 2024 NevWare21 Solutions LLC
Copyright (c) NevWare21 Solutions LLC and contributors

MIT License

Copyright (c) 2022 Nevware21
Copyright (c) 2022 NevWare21 Solutions LLC

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

---------------------------------------------------------

@nevware21/ts-utils 0.11.2 - MIT
@nevware21/ts-utils 0.11.3 - MIT
https://github.com/nevware21/ts-utils

Copyright (c) 2022 NevWare21
Copyright (c) 2022 Nevware21
Copyright (c) 2023 Nevware21
Copyright (c) 2024 Nevware21
Copyright (c) NevWare21 and contributors
Copyright (c) 2022 NevWare21 Solutions LLC
Copyright (c) 2023 NevWare21 Solutions LLC
Copyright (c) 2024 NevWare21 Solutions LLC
Copyright (c) NevWare21 Solutions LLC and contributors

MIT License

Copyright (c) 2022 NevWare21
Copyright (c) 2022 NevWare21 Solutions LLC

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

---------------------------------------------------------

comment-json 4.2.3 - MIT
comment-json 4.2.4 - MIT
https://github.com/kaelzhang/node-comment-json#readme

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


---------------------------------------------------------

---------------------------------------------------------

debug 4.3.4 - MIT
https://github.com/debug-js/debug#readme

Copyright (c) 2018-2021 Josh Junon
Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>

(The MIT License)

Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>
Copyright (c) 2018-2021 Josh Junon

Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the 'Software'), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.



---------------------------------------------------------

---------------------------------------------------------
Expand Down Expand Up @@ -1867,6 +2003,38 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------

ms 2.1.2 - MIT
https://github.com/zeit/ms#readme

Copyright (c) 2016 Zeit, Inc.

The MIT License (MIT)

Copyright (c) 2016 Zeit, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------
Expand Down Expand Up @@ -1907,6 +2075,7 @@ SOFTWARE.
node-loader 2.0.0 - MIT
https://github.com/webpack-contrib/node-loader

Copyright JS Foundation and other contributors

Copyright JS Foundation and other contributors

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

---------------------------------------------------------

vscode-jsonrpc 8.2.0 - MIT
vscode-jsonrpc 8.1.0 - MIT
https://github.com/Microsoft/vscode-languageserver-node#readme

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

---------------------------------------------------------

vscode-languageclient 9.0.1 - MIT
vscode-languageclient 8.1.0 - MIT
https://github.com/Microsoft/vscode-languageserver-node#readme

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

---------------------------------------------------------

vscode-languageserver-protocol 3.17.5 - MIT
vscode-languageserver-protocol 3.17.3 - MIT
https://github.com/Microsoft/vscode-languageserver-node#readme

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

---------------------------------------------------------

vscode-languageserver-types 3.17.5 - MIT
vscode-languageserver-types 3.17.3 - MIT
https://github.com/Microsoft/vscode-languageserver-node#readme

Copyright (c) Microsoft Corporation
Expand Down
4 changes: 2 additions & 2 deletions Extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cpptools",
"displayName": "C/C++",
"description": "C/C++ IntelliSense, debugging, and code browsing.",
"version": "1.21.3-main",
"version": "1.21.4-main",
"publisher": "ms-vscode",
"icon": "LanguageCCPP_color_128x.png",
"readme": "README.md",
Expand Down Expand Up @@ -6545,7 +6545,7 @@
"ssh-config": "^4.4.4",
"tmp": "^0.2.3",
"vscode-cpptools": "^6.1.0",
"vscode-languageclient": "^9.0.1",
"vscode-languageclient": "^8.1.0",
"vscode-nls": "^5.2.0",
"vscode-tas-client": "^0.1.84",
"which": "^2.0.2"
Expand Down
Loading

0 comments on commit f818529

Please sign in to comment.