diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 14af9ca8b8a..5f0de3e3365 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -169,7 +169,7 @@ OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------- -atom/language-sass 0.62.1 - MIT +atom/language-sass 0.61.4 - MIT https://github.com/atom/language-sass The MIT License (MIT) @@ -517,7 +517,7 @@ to the base-name name of the original file, and an extension of txt, html, or si --------------------------------------------------------- -go-syntax 0.5.1 - MIT +go-syntax 0.6.1 - MIT https://github.com/worlpaker/go-syntax MIT License @@ -777,7 +777,7 @@ SOFTWARE. --------------------------------------------------------- -jeff-hykin/better-shell-syntax 1.6.2 - MIT +jeff-hykin/better-shell-syntax 1.7.1 - MIT https://github.com/jeff-hykin/better-shell-syntax MIT License @@ -833,7 +833,7 @@ SOFTWARE. --------------------------------------------------------- -jlelong/vscode-latex-basics 1.5.4 - MIT +jlelong/vscode-latex-basics 1.6.0 - MIT https://github.com/jlelong/vscode-latex-basics Copyright (c) vscode-latex-basics authors @@ -2463,7 +2463,7 @@ Creative Commons may be contacted at creativecommons.org. --------------------------------------------------------- -vscode-logfile-highlighter 2.15.0 - MIT +vscode-logfile-highlighter 2.17.0 - MIT https://github.com/emilast/vscode-logfile-highlighter The MIT License (MIT) diff --git a/cglicenses.json b/cglicenses.json index 1d6851e38c8..6ca8ba33b4d 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -593,11 +593,11 @@ { // Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0 "name": "system-configuration", - "fullLicenseTextUri": "https://github.com/mullvad/system-configuration-rs/blob/main/system-configuration/LICENSE-MIT" + "fullLicenseTextUri": "https://raw.githubusercontent.com/mullvad/system-configuration-rs/v0.6.0/system-configuration/LICENSE-MIT" }, { // Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0 "name": "system-configuration-sys", - "fullLicenseTextUri": "https://github.com/mullvad/system-configuration-rs/blob/main/system-configuration-sys/LICENSE-MIT" + "fullLicenseTextUri": "https://raw.githubusercontent.com/mullvad/system-configuration-rs/v0.6.0/system-configuration-sys/LICENSE-MIT" } ] diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt index 6ec82c8b541..f65f8a33397 100644 --- a/cli/ThirdPartyNotices.txt +++ b/cli/ThirdPartyNotices.txt @@ -3827,7 +3827,7 @@ DEALINGS IN THE SOFTWARE. indexmap 1.9.1 - Apache-2.0 OR MIT indexmap 2.1.0 - Apache-2.0 OR MIT -https://github.com/bluss/indexmap +https://github.com/indexmap-rs/indexmap Copyright (c) 2016--2017 @@ -4232,7 +4232,7 @@ DEALINGS IN THE SOFTWARE. --------------------------------------------------------- -libc 0.2.144 - MIT OR Apache-2.0 +libc 0.2.153 - MIT OR Apache-2.0 https://github.com/rust-lang/libc Copyright (c) 2014-2020 The Rust Project Developers @@ -4597,7 +4597,7 @@ The parts of miniz that are not covered by the unlicense is [some Zip64 code](ht --------------------------------------------------------- -mio 0.8.4 - MIT +mio 0.8.11 - MIT https://github.com/tokio-rs/mio The MIT License (MIT) @@ -6189,6 +6189,34 @@ DEALINGS IN THE SOFTWARE. --------------------------------------------------------- +os_info 3.7.0 - MIT +https://github.com/stanislav-tkach/os_info + +The MIT License (MIT) + +Copyright (c) 2017 Stanislav Tkach + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + parking 2.0.0 - Apache-2.0 OR MIT https://github.com/smol-rs/parking @@ -8637,7 +8665,7 @@ SOFTWARE. system-configuration 0.5.1 - MIT OR Apache-2.0 https://github.com/mullvad/system-configuration-rs -Copyright (c) 2017 Amagicom AB +Copyright (c) 2024 Mullvad VPN AB Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated @@ -8669,7 +8697,7 @@ DEALINGS IN THE SOFTWARE. system-configuration-sys 0.5.0 - MIT OR Apache-2.0 https://github.com/mullvad/system-configuration-rs -Copyright (c) 2017 Amagicom AB +Copyright (c) 2024 Mullvad VPN AB Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated @@ -8853,7 +8881,7 @@ DEALINGS IN THE SOFTWARE. time 0.3.21 - MIT OR Apache-2.0 https://github.com/time-rs/time -Copyright (c) 2022 Jacob Pratt et al. +Copyright (c) 2024 Jacob Pratt et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -8879,7 +8907,7 @@ SOFTWARE. time-core 0.1.1 - MIT OR Apache-2.0 https://github.com/time-rs/time -Copyright (c) 2022 Jacob Pratt et al. +Copyright (c) 2024 Jacob Pratt et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9359,7 +9387,7 @@ THE SOFTWARE. --------------------------------------------------------- -tunnels 97233d20448e1c3cb0e0fd9114acf68c7e5c0249 +tunnels 8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30 https://github.com/microsoft/dev-tunnels MIT License @@ -9613,7 +9641,7 @@ DEALINGS IN THE SOFTWARE. --------------------------------------------------------- -urlencoding 2.1.2 - MIT +urlencoding 2.1.3 - MIT https://github.com/kornelski/rust_urlencoding The MIT License (MIT) @@ -10595,6 +10623,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------- winreg 0.50.0 - MIT +winreg 0.8.0 - MIT https://github.com/gentoo90/winreg-rs The MIT License (MIT) diff --git a/package.json b/package.json index 0891a76d3c9..40300428d56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.88.0", - "distro": "7734ec27c8ec09ddc68bc3618e17d9a8b40fbfd9", + "distro": "0d4298753acb3d9ade428d16cda9ae86015707c2", "author": { "name": "Microsoft Corporation" },