Skip to content

Commit 9c80241

Browse files
DonJayamanneDonJayamanne
authored
Merge branch 'main' into issue163133
2 parents 2fad3d9 + a887d72 commit 9c80241

File tree

95 files changed

+1489
-709
lines changed

Some content is hidden

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

95 files changed

+1489
-709
lines changed

‎ThirdPartyNotices.txt

Lines changed: 84 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,58 @@ This repository incorporates material as listed below or described in the code.
44

55

66

7+
---------------------------------------------------------
8+
9+
@iktakahiro/markdown-it-katex 4.0.2 - MIT
10+
https://github.com/mjbvz/markdown-it-katex
11+
12+
The MIT License (MIT)
13+
14+
Copyright (c) 2016 Waylon Flinn
15+
16+
Permission is hereby granted, free of charge, to any person obtaining a copy
17+
of this software and associated documentation files (the "Software"), to deal
18+
in the Software without restriction, including without limitation the rights
19+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
20+
copies of the Software, and to permit persons to whom the Software is
21+
furnished to do so, subject to the following conditions:
22+
23+
The above copyright notice and this permission notice shall be included in all
24+
copies or substantial portions of the Software.
25+
26+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32+
SOFTWARE.
33+
34+
---
35+
36+
The MIT License (MIT)
37+
38+
Copyright (c) 2018 Takahiro Ethan Ikeuchi @iktakahiro
39+
40+
Permission is hereby granted, free of charge, to any person obtaining a copy
41+
of this software and associated documentation files (the "Software"), to deal
42+
in the Software without restriction, including without limitation the rights
43+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
44+
copies of the Software, and to permit persons to whom the Software is
45+
furnished to do so, subject to the following conditions:
46+
47+
The above copyright notice and this permission notice shall be included in all
48+
copies or substantial portions of the Software.
49+
50+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
51+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
52+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
53+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
54+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
55+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
56+
SOFTWARE.
57+
---------------------------------------------------------
58+
759
---------------------------------------------------------
860

961
atom/language-clojure 0.22.8 - MIT
@@ -194,7 +246,7 @@ suitability for any purpose.
194246

195247
---------------------------------------------------------
196248

197-
atom/language-sass 0.61.4 - MIT
249+
atom/language-sass 0.62.1 - MIT
198250
https://github.com/atom/language-sass
199251

200252
The MIT License (MIT)
@@ -481,35 +533,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
481533

482534
---------------------------------------------------------
483535

484-
demyte/language-cshtml 0.3.0 - MIT
485-
https://github.com/demyte/language-cshtml
486-
487-
The MIT License (MIT)
488-
489-
Copyright (c) 2014 James Summerton
490-
491-
Permission is hereby granted, free of charge, to any person obtaining
492-
a copy of this software and associated documentation files (the
493-
"Software"), to deal in the Software without restriction, including
494-
without limitation the rights to use, copy, modify, merge, publish,
495-
distribute, sublicense, and/or sell copies of the Software, and to
496-
permit persons to whom the Software is furnished to do so, subject to
497-
the following conditions:
498-
499-
The above copyright notice and this permission notice shall be
500-
included in all copies or substantial portions of the Software.
501-
502-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
503-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
504-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
505-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
506-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
507-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
508-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
509-
---------------------------------------------------------
510-
511-
---------------------------------------------------------
512-
513536
Document Object Model 4.0.0 - W3C License
514537
https://www.w3.org/DOM/
515538

@@ -945,6 +968,35 @@ SOFTWARE.
945968

946969
---------------------------------------------------------
947970

971+
dotnet/razor-tooling 1.0.0 - MIT
972+
https://github.com/dotnet/razor-tooling
973+
974+
MIT License
975+
976+
Copyright (c) .NET Foundation and Contributors
977+
All Rights Reserved
978+
979+
Permission is hereby granted, free of charge, to any person obtaining a copy
980+
of this software and associated documentation files (the "Software"), to deal
981+
in the Software without restriction, including without limitation the rights
982+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
983+
copies of the Software, and to permit persons to whom the Software is
984+
furnished to do so, subject to the following conditions:
985+
986+
The above copyright notice and this permission notice shall be included in all
987+
copies or substantial portions of the Software.
988+
989+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
990+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
991+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
992+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
993+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
994+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
995+
SOFTWARE.
996+
---------------------------------------------------------
997+
998+
---------------------------------------------------------
999+
9481000
expand-abbreviation 0.5.8 - MIT
9491001
https://github.com/emmetio/expand-abbreviation
9501002

@@ -1216,7 +1268,7 @@ SOFTWARE.
12161268

12171269
---------------------------------------------------------
12181270

1219-
jeff-hykin/better-cpp-syntax 1.15.18 - MIT
1271+
jeff-hykin/better-cpp-syntax 1.15.23 - MIT
12201272
https://github.com/jeff-hykin/better-cpp-syntax
12211273

12221274
MIT License
@@ -1300,7 +1352,7 @@ SOFTWARE.
13001352

13011353
---------------------------------------------------------
13021354

1303-
jlelong/vscode-latex-basics 1.3.0 - MIT
1355+
jlelong/vscode-latex-basics 1.4.0 - MIT
13041356
https://github.com/jlelong/vscode-latex-basics
13051357

13061358
Copyright (c) vscode-latex-basics authors

‎build/azure-pipelines/darwin/cli-build-darwin.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ parameters:
33
type: string
44
- name: VSCODE_BUILD_MACOS
55
type: boolean
6+
default: false
67
- name: VSCODE_BUILD_MACOS_ARM64
78
type: boolean
9+
default: false
810
- name: channel
911
type: string
1012
default: stable

‎build/azure-pipelines/linux/cli-build-linux.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,25 @@ steps:
3737
displayName: Extract openssl prebuilt
3838
3939
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
40-
- bash: |
41-
set -e
42-
sudo apt-get update
43-
sudo apt-get install -yq build-essential curl file git graphviz musl-dev musl-tools linux-libc-dev pkgconf zip unzip xutils-dev ninja-build
44-
sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
45-
displayName: Install build dependencies
40+
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
41+
- bash: |
42+
set -e
43+
sudo apt-get update
44+
sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev
45+
sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
46+
displayName: Install musl build dependencies
4647
4748
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
4849
- bash: |
4950
set -e
5051
sudo apt-get install -yq gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
51-
displayName: Install cross compilation toolchains
52+
displayName: Install arm32 toolchains
53+
54+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
55+
- bash: |
56+
set -e
57+
sudo apt-get install -yq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
58+
displayName: Install arm64 toolchains
5259
5360
- task: NodeTool@0
5461
inputs:
@@ -107,6 +114,7 @@ steps:
107114
VSCODE_CLI_TARGET: aarch64-unknown-linux-gnu
108115
VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli
109116
VSCODE_CLI_ENV:
117+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
110118
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
111119
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
112120

‎build/azure-pipelines/product-build.yml

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ stages:
180180
dependsOn: []
181181
jobs:
182182
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
183-
- job: Linux
183+
- job: LinuxX64
184184
pool: vscode-1es-linux
185185
steps:
186186
- template: ./linux/cli-build-linux.yml
@@ -189,11 +189,19 @@ stages:
189189
VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }}
190190
VSCODE_BUILD_LINUX_ALPINE: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE }}
191191

192-
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
193-
- job: LinuxArm64
192+
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
193+
- job: LinuxGnuARM
194+
pool: vscode-1es-linux
195+
steps:
196+
- template: ./linux/cli-build-linux.yml
197+
parameters:
198+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
199+
VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
200+
VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
201+
202+
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}:
203+
- job: LinuxAlpineARM64
194204
pool: vscode-1es-linux-20.04-arm64
195-
variables:
196-
VSCODE_ARCH: arm64
197205
steps:
198206
- task: NodeTool@0
199207
displayName: Install Node.js
@@ -207,29 +215,52 @@ stages:
207215
parameters:
208216
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
209217
VSCODE_BUILD_LINUX_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64 }}
210-
VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }}
211-
VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }}
212218

213-
- ${{ if eq(variables.VSCODE_BUILD_STAGE_MACOS, true) }}:
214-
- job: MacOS
219+
- ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
220+
- job: MacOSX64
215221
pool:
216222
vmImage: macOS-11
217223
steps:
218224
- template: ./darwin/cli-build-darwin.yml
219225
parameters:
220226
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
221227
VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }}
228+
229+
- ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
230+
- job: MacOSARM64
231+
pool:
232+
vmImage: macOS-11
233+
steps:
234+
- template: ./darwin/cli-build-darwin.yml
235+
parameters:
236+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
222237
VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }}
223238

224-
- ${{ if eq(variables.VSCODE_BUILD_STAGE_WINDOWS, true) }}:
225-
- job: Windows
239+
- ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
240+
- job: WindowsX64
226241
pool: vscode-1es-windows
227242
steps:
228243
- template: ./win32/cli-build-win32.yml
229244
parameters:
230245
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
231246
VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }}
247+
248+
- ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}:
249+
- job: WindowsARM64
250+
pool: vscode-1es-windows
251+
steps:
252+
- template: ./win32/cli-build-win32.yml
253+
parameters:
254+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
232255
VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
256+
257+
- ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}:
258+
- job: WindowsX86
259+
pool: vscode-1es-windows
260+
steps:
261+
- template: ./win32/cli-build-win32.yml
262+
parameters:
263+
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
233264
VSCODE_BUILD_WIN32_32BIT: ${{ parameters.VSCODE_BUILD_WIN32_32BIT }}
234265

235266
- ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:

‎build/azure-pipelines/win32/cli-build-win32.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
parameters:
22
- name: VSCODE_BUILD_WIN32
33
type: boolean
4+
default: false
45
- name: VSCODE_BUILD_WIN32_32BIT
56
type: boolean
7+
default: false
68
- name: VSCODE_BUILD_WIN32_ARM64
79
type: boolean
10+
default: false
811
- name: VSCODE_QUALITY
912
type: string
1013
- name: channel

‎build/monaco/monaco.d.ts.recipe

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ declare namespace monaco {
4343
#include(vs/base/common/uri): URI, UriComponents
4444
#include(vs/base/common/keyCodes): KeyCode
4545
#include(vs/editor/common/services/editorBaseApi): KeyMod
46-
#include(vs/base/common/htmlContent): IMarkdownString
46+
#include(vs/base/common/htmlContent): IMarkdownString, MarkdownStringTrustedOptions
4747
#include(vs/base/browser/keyboardEvent): IKeyboardEvent
4848
#include(vs/base/browser/mouseEvent): IMouseEvent
4949
#include(vs/editor/common/editorCommon): IScrollEvent

‎cglicenses.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,5 +283,29 @@
283283
// Reason: license is in a subdirectory in repo
284284
"name": "openssl-sys",
285285
"fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl-sys/LICENSE-MIT"
286+
},
287+
{
288+
// Reason: Missing license file
289+
"name": "openssl-macros",
290+
"fullLicenseText": [
291+
"This software is released under the MIT license:",
292+
"",
293+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
294+
"this software and associated documentation files (the \"Software\"), to deal in",
295+
"the Software without restriction, including without limitation the rights to",
296+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
297+
"the Software, and to permit persons to whom the Software is furnished to do so,",
298+
"subject to the following conditions:",
299+
"",
300+
"The above copyright notice and this permission notice shall be included in all",
301+
"copies or substantial portions of the Software.",
302+
"",
303+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
304+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
305+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
306+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
307+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
308+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
309+
]
286310
}
287311
]

0 commit comments

Comments
 (0)