Skip to content

Commit c83ef08

Browse files
TyriarTyriar
committed
Merge remote-tracking branch 'origin/main' into tyriar/terminalLogService
2 parents fea4ff2 + 982869f commit c83ef08

File tree

308 files changed

+5804
-2921
lines changed

Some content is hidden

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

308 files changed

+5804
-2921
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@
242242
"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
243243
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
244244
"--disable-features=CalculateNativeWinOcclusion",
245+
"--disable-extension=vscode.vscode-api-tests"
245246
],
246247
"webRoot": "${workspaceFolder}",
247248
"cascadeTerminateToConfigurations": [

‎.vscode/tasks.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@
112112
"dependsOrder": "sequence",
113113
"problemMatcher": []
114114
},
115+
{
116+
"label": "Kill VS Code - Build, Yarn, VS Code - Build",
117+
"dependsOn": [
118+
"Kill VS Code - Build",
119+
"npm: install",
120+
"VS Code - Build"
121+
],
122+
"group": "build",
123+
"dependsOrder": "sequence",
124+
"problemMatcher": []
125+
},
115126
{
116127
"type": "npm",
117128
"script": "watch-webd",

‎.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.13"
3+
ms_build_id "21803499"
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2e153664ca2d5fdcb0a717cbb7e836ecba2681a43327f38541e3b1f23b27f612 *electron-v22.3.13-darwin-arm64-symbols.zip
2+
edd48266e3726284e374b83c0db39ff18e9ef0b7176b2b22d816fdf37ba7d07a *electron-v22.3.13-darwin-arm64.zip
3+
4a660e202b8aeed7279de3a802ca1f6aa9c4cd2fb351e17d37d89c5b2b8ee88f *electron-v22.3.13-darwin-x64-symbols.zip
4+
b62b718824d686ae9deb400dc74cc86fde0710735af26d449bf720ec89b13e7f *electron-v22.3.13-darwin-x64.zip
5+
6d8ef72edc000db6507b3295902aa4f30d9fe7fa8108388a1077f863ba11b778 *electron-v22.3.13-linux-arm64-symbols.zip
6+
1f85d242d2d6d151c604f516eff984da57797cd5d2708bbc07d88a4258bfb1f1 *electron-v22.3.13-linux-arm64.zip
7+
49d1a786c8ab5062f9491a190b1f3e22c54f7446a6697a01fef6b953e72d1a8d *electron-v22.3.13-linux-armv7l-symbols.zip
8+
d396a7722f63163e63b9f660328a1c1e992284e5fd9dd5f6d0dca572eb34528a *electron-v22.3.13-linux-armv7l.zip
9+
5efcbf5f3ab1bb8a25f1e51d49a22e524f4c609e5ab62f5ecc7350364e01fa57 *electron-v22.3.13-linux-x64-symbols.zip
10+
c568012570aa4e1ead7f28f63e698c268356c45c878561c1ade727b612bffbda *electron-v22.3.13-linux-x64.zip
11+
af336308d3c0455c76eeb218febc3025bbdeffccfdf3e2a8d5c11cbfed07f60c *electron-v22.3.13-win32-arm64-pdb.zip
12+
450f7921563a7e62cdf99df7b2c78840438fb8191aac81eeb5c74ffc34d085b6 *electron-v22.3.13-win32-arm64-symbols.zip
13+
ac5fe8d782588911fe7f2ebce1d79a72049848a1d7936af161fd6c79f7715db6 *electron-v22.3.13-win32-arm64.zip
14+
28974547d19138d03033be29bd6b894afa81ad935df5c55d3069f9d575ffb4d7 *electron-v22.3.13-win32-ia32-pdb.zip
15+
2d20f6cefca0ee1e73b66a0b4914c2bb88a01c622ed82a80c2ac20aac9ddefec *electron-v22.3.13-win32-ia32-symbols.zip
16+
af5730eb327634fc56dd6ebef7ebffb1679fa75d48fa8cca75d701c0c006a4bc *electron-v22.3.13-win32-ia32.zip
17+
ed133e9cf47121f3d8211dd3a47f218fa87bc667bed953b2a79074d9ecd1e37b *electron-v22.3.13-win32-x64-pdb.zip
18+
da3db91fe904fe8ac27182e39260bbdc30262aa0b3f1a94b06d7aadc72053829 *electron-v22.3.13-win32-x64-symbols.zip
19+
36e84e789e61931ed1b417059aae7d04fe0b70f929e19f088c2b95c6bb7d5b05 *electron-v22.3.13-win32-x64.zip
20+
49b351092088c781095f33a675c586161ef7e0ae9f4da159aef9ab4caf172018 *ffmpeg-v22.3.13-darwin-arm64.zip
21+
040b749109b89b6b5569faf1b7a3718b8cbc25375b1db01ffa91624e0d01c0d9 *ffmpeg-v22.3.13-darwin-x64.zip
22+
59d2e2b2f2cc515a86a4e0cfd1116d10a8b25a8d58d45bb04de3512e156c944b *ffmpeg-v22.3.13-linux-arm64.zip
23+
b9d3b227bee17666d395ee7882ef477a733c3eeef3f1d9f2e3616d2d02eb3376 *ffmpeg-v22.3.13-linux-armv7l.zip
24+
fa07ef910b23a4ef4b6761bc16d20c0e70ff0259325c4d523129e2d9c5084174 *ffmpeg-v22.3.13-linux-x64.zip
25+
c38b135b7025750ca44e3cc08e1c913ab095a28336915753195d3287be07578d *ffmpeg-v22.3.13-win32-arm64.zip
26+
57f0baa841cb49ed3ae63e54466d175b12838939be786b86465bdd192dce7cdc *ffmpeg-v22.3.13-win32-ia32.zip
27+
f77162496ad8e408fb5c153ba7842ec7d3964785d0f7231b3d4903088e0ab1cd *ffmpeg-v22.3.13-win32-x64.zip

0 commit comments

Comments
 (0)