Skip to content

Commit 6c24374

Browse files
isidornisidorn
authored
Merge branch 'main' into isidor/courageous-yak
2 parents 1d73a47 + e0529df commit 6c24374

File tree

419 files changed

+8872
-3886
lines changed

Some content is hidden

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

419 files changed

+8872
-3886
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ vscode.lsif
1616
vscode.db
1717
/.profile-oss
1818
/cli/target
19+
/cli/openssl
1920
product.overrides.json

‎.vscode/launch.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"version": "0.1.0",
33
"configurations": [
4-
{
5-
"request": "attach",
6-
"type": "node",
7-
""
8-
},
94
{
105
"type": "node",
116
"request": "launch",
@@ -247,6 +242,7 @@
247242
"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
248243
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
249244
"--disable-features=CalculateNativeWinOcclusion",
245+
"--disable-extension=vscode.vscode-api-tests"
250246
],
251247
"webRoot": "${workspaceFolder}",
252248
"cascadeTerminateToConfigurations": [

‎.vscode/notebooks/endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.yarnrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
disturl "https://electronjs.org/headers"
2-
target "22.3.11"
3-
ms_build_id "21658788"
2+
target "22.3.14"
3+
ms_build_id "21893604"
44
runtime "electron"
55
build_from_source "true"

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,3 @@ steps:
231231
Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
232232
Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
233233
Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
234-
235-
- script: |
236-
set -e
237-
AZURE_STORAGE_ACCOUNT="ticino" \
238-
AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
239-
AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
240-
AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
241-
VSCODE_ARCH="$(VSCODE_ARCH)" \
242-
node build/azure-pipelines/upload-configuration
243-
displayName: Upload configuration (for Bing settings search)
244-
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
245-
continueOnError: true

‎build/azure-pipelines/upload-configuration.ts

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎build/checksums/electron.txt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
3af1be2861b5de836b35e7a2e5eeaffa2b4517c3024ebd8658033be5aa98c3ce *electron-v22.3.11-darwin-arm64-symbols.zip
2-
5441f785aefc23d53466872b8f1836a172b20f0a0ddf019dfe6cfc498e9e8e19 *electron-v22.3.11-darwin-arm64.zip
3-
473ba98236a945113f3ea5e3b7d3c3d1bc108bb8c99c5d35917c4ee01c0bb4be *electron-v22.3.11-darwin-x64-symbols.zip
4-
8bd965b00c19de5e880feeff92e01cb0570c436ff6a97e271123e340fee157c3 *electron-v22.3.11-darwin-x64.zip
5-
689281dc20066f98673261b77337d018237f8b0d11f6e3b14dedec24d90f2df4 *electron-v22.3.11-linux-arm64-symbols.zip
6-
d9ade7f28e10c3ca0ddc5ada982574a3d84f30fb9f92a82608666608b801ca8a *electron-v22.3.11-linux-arm64.zip
7-
926a0adfb9bf1d2ed3cd26b0bcc8efe66eb793ddc309dff8e6f230abf12ca6e5 *electron-v22.3.11-linux-armv7l-symbols.zip
8-
857eadea9ba34dacf7822d4bb58fd62fd585cc5c5a5b81c0ac32e55108038382 *electron-v22.3.11-linux-armv7l.zip
9-
529057b7fe9be5958bd56b2d18b32d85cb9337ccb76878c67afb799b0f166130 *electron-v22.3.11-linux-x64-symbols.zip
10-
6b5d2a18eab1d14b9f60180c246fb07cd09b298e4e8da1bf517b83ca6c0d0242 *electron-v22.3.11-linux-x64.zip
11-
472a3a15ee7e94ba4cc47052ec4be90fa1072955367bdf135591f12e623af167 *electron-v22.3.11-win32-arm64-pdb.zip
12-
104a685a78556c61c3f7c6fe33f84a3091199150e44e701e513a5d49afef0c55 *electron-v22.3.11-win32-arm64-symbols.zip
13-
3debd92e3be6b74c6b8f25ec7963e8ab94fb877c50c06026aea4bac308311604 *electron-v22.3.11-win32-arm64.zip
14-
38617bd350dd5f757be2cd43afb2238ac42d97714f96a1f27839d04447a31d82 *electron-v22.3.11-win32-ia32-pdb.zip
15-
12b8a47ddae57eb55dcf8aa1fdf39b9575fcb150de1c9bb2444d8702a7d3efec *electron-v22.3.11-win32-ia32-symbols.zip
16-
463062b6bdc09c11ab083c667aae2d6b677f945449ff7bf482059c6086a28e7b *electron-v22.3.11-win32-ia32.zip
17-
3f5bf196a4de1c2b8efedc5f0ef690a41645b33a36e62c307164cb66e20cfaa7 *electron-v22.3.11-win32-x64-pdb.zip
18-
b4edb586a021013333badb6e1974e42e0b673f5f49bc7909a338b3e9ad46f7ef *electron-v22.3.11-win32-x64-symbols.zip
19-
7944be5db19c2fa16aa887ec0ca287e84dfe8676d8223165b811ffec1dd57b3d *electron-v22.3.11-win32-x64.zip
20-
f2e3db6dc9c7b6e779a034bc4ede297213a05f1a80e0d5fc7fa02e6f8438ecd2 *ffmpeg-v22.3.11-darwin-arm64.zip
21-
5b1732b2f67aa98cb5a0ad9b5caf085c11449bc9710971a2344c10f471cc986f *ffmpeg-v22.3.11-darwin-x64.zip
22-
8233e865973bed62bb1d16011a29eb1e39851725509523bb3c54281b9ecad7e0 *ffmpeg-v22.3.11-linux-arm64.zip
23-
18464ab29adc06c72602b30b4c101ed27edadccee9476f3bd54411e791b415ee *ffmpeg-v22.3.11-linux-armv7l.zip
24-
4467c2e6c5b45cf11d8c2e06bfed76982c95fc50701cf13350b19d100080addd *ffmpeg-v22.3.11-linux-x64.zip
25-
8abc4dddf1e105a3375f56a8dd804101c014919a87dcd231cdb3b19ad6c30f7a *ffmpeg-v22.3.11-win32-arm64.zip
26-
295d3d628460c4b25f751ebc3763bf7ec72a57a337f89ed1ef6f666e3dcfecf5 *ffmpeg-v22.3.11-win32-ia32.zip
27-
17c5e7ec2248521d7064cfa91e9d894981e53a6391e65b83e35ff4f30001b2c5 *ffmpeg-v22.3.11-win32-x64.zip
1+
3ba067c6f338f9a525c4b697e9cf8e3c3b3d9f6abfdfb11fba47e053da0f3496 *electron-v22.3.14-darwin-arm64-symbols.zip
2+
c08bf19e11c006346b210585cf0803cd0b07107a362a2414cc185f6a228afbf2 *electron-v22.3.14-darwin-arm64.zip
3+
72ced94e7230d3138dd84acbf38dc593d4a93ec796a3a478f99aa6974030d79c *electron-v22.3.14-darwin-x64-symbols.zip
4+
77c1c96411326b00d3ef7c9f6af96a3b4c2fa2314196fce3374fcf734dd8dc67 *electron-v22.3.14-darwin-x64.zip
5+
d847c59f3835749dcdd5376daefb3a5992f1ed5d7693f871328296e1388fb69d *electron-v22.3.14-linux-arm64-symbols.zip
6+
95bb9ee160c60b50ff25b307fb8bc36bdb5297d43c6e366f0b835f36c4f327c9 *electron-v22.3.14-linux-arm64.zip
7+
38a51d81f9ffe6e2ebf25844999fddbeb4edc63ae22136af1502db373bb024ab *electron-v22.3.14-linux-armv7l-symbols.zip
8+
bf589c74f07fe11586ffcf8c122d34b91c5ced08d54532ee883d1e025b6d1b02 *electron-v22.3.14-linux-armv7l.zip
9+
28d0eda61ea736375c549d0955f36b7d3e3c2019453ef83d793dae8b0d74f461 *electron-v22.3.14-linux-x64-symbols.zip
10+
89b72e40fb8b9106deda3e6ffa30dd80beaa8f2e2a9d037b55c034a5a27a7b60 *electron-v22.3.14-linux-x64.zip
11+
b9ba15fcf7c60cf57e95fae731bc0c336e131ed4fac91b4c59d50a28407ca0b0 *electron-v22.3.14-win32-arm64-pdb.zip
12+
9f375d01feeb9e28f9c0913a4e22be900c0a7ff4e51449bb9b859ce1bd18f9f3 *electron-v22.3.14-win32-arm64-symbols.zip
13+
17e354aca0683f79d79f7fa7ecfa8a4381b356d04fa45ec0aa85b5f048151c10 *electron-v22.3.14-win32-arm64.zip
14+
900ca316ce939547ab62847c8833a78c1002a69b936be7e9af328a3518a7d379 *electron-v22.3.14-win32-ia32-pdb.zip
15+
90af7a48b4e722a3436b6a8893540fb746d99b4832ca48c355a63fa0930f6446 *electron-v22.3.14-win32-ia32-symbols.zip
16+
487d811c7cf3282f4c3a17b5ab7ab1fd71dbc585449d77da3a9bf052657ac4ad *electron-v22.3.14-win32-ia32.zip
17+
41ce6c3d87c89f6b48aac74649657a120c28c78513908996dc20e57a640d4653 *electron-v22.3.14-win32-x64-pdb.zip
18+
57b35bfa186b64a9dd1eb2bb85141bb998d0378bb20ac8038718b41d16deb978 *electron-v22.3.14-win32-x64-symbols.zip
19+
f45eba3faa7e10fb1c6e5cf044dd42733a7c8cb455de57647b74e7510b0b94b6 *electron-v22.3.14-win32-x64.zip
20+
16a75de6e3e4643589237e6e1c680c43b4e77fe04918bfbe4408775b7e616afc *ffmpeg-v22.3.14-darwin-arm64.zip
21+
92db0c163c326d33a516ebfc56c7bd4faae9456f4238dde916c580b459b8dc8d *ffmpeg-v22.3.14-darwin-x64.zip
22+
59d2e2b2f2cc515a86a4e0cfd1116d10a8b25a8d58d45bb04de3512e156c944b *ffmpeg-v22.3.14-linux-arm64.zip
23+
b9d3b227bee17666d395ee7882ef477a733c3eeef3f1d9f2e3616d2d02eb3376 *ffmpeg-v22.3.14-linux-armv7l.zip
24+
fa07ef910b23a4ef4b6761bc16d20c0e70ff0259325c4d523129e2d9c5084174 *ffmpeg-v22.3.14-linux-x64.zip
25+
7f744b657ae7c26f80cae0f2771a00edd368350229b85118a246573987dd6ff1 *ffmpeg-v22.3.14-win32-arm64.zip
26+
562e04d2cf1c970b6128d66d08dfe8d88a28e54adf599293eee2bd6c292fd16b *ffmpeg-v22.3.14-win32-ia32.zip
27+
f69510384ef912fd9b4961f97357789a4a36e8df6ff382aeeab23fbb063def9a *ffmpeg-v22.3.14-win32-x64.zip

0 commit comments

Comments
 (0)