diff options
| -rw-r--r-- | ThirdPartyNotices.txt | 2 | ||||
| -rw-r--r-- | cglicenses.json | 32 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 18299cdf169..93abc78486d 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -40,7 +40,7 @@ This project incorporates components from the projects listed below. The origina 33. mdn-data version 1.1.12 (https://github.com/mdn/data) 34. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage) 35. Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage) -36. Microsoft/vscode-mssql version 1.6.0 (https://github.com/Microsoft/vscode-mssql) +36. Microsoft/vscode-mssql version 1.9.0 (https://github.com/Microsoft/vscode-mssql) 37. mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile) 38. octref/language-css version 0.42.11 (https://github.com/octref/language-css) 39. PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax) diff --git a/cglicenses.json b/cglicenses.json index 0d588440ae2..fcbac22e310 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -169,5 +169,37 @@ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", "SOFTWARE." ] + }, + { + // Reason: The license at https://github.com/floatdrop/pinkie/blob/master/license + // cannot be found by the OSS tool automatically. + "name": "pinkie", + "fullLicenseText": [ + "The MIT License (MIT)", + "", + "Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)", + "", + "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." + ] + }, + { + "name": "big-integer", + "prependLicenseText": ["Copyright released to public domain"] } ] diff --git a/package.json b/package.json index aec42333db1..8e9e8c229ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.45.0", - "distro": "c53a7597c62f1369369feb88bb4ef0d264109f9b", + "distro": "59e59ecea2dc92bd7d084fbaccc266ede9f6d553", "author": { "name": "Microsoft Corporation" }, |