Skip to content

Commit c803cf8

Browse files
adrianstephensadrianstephens
authored
Merge branch 'microsoft:main' into enable-debug/watch/context-menu-contribution
2 parents e3f2cbf + 8ef2f68 commit c803cf8

File tree

751 files changed

+58041
-16955
lines changed

Some content is hidden

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

751 files changed

+58041
-16955
lines changed

‎.github/workflows/basic.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ jobs:
118118
- name: Run Valid Layers Checks
119119
run: npm run valid-layers-check
120120

121+
- name: Run Property Init Order Checks
122+
run: npm run property-init-order-check
123+
121124
- name: Compile /build/
122125
run: npm run compile
123126
working-directory: build

‎.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ jobs:
299299
- name: Run Valid Layers Checks
300300
run: npm run valid-layers-check
301301

302+
- name: Run Property Init Order Checks
303+
run: npm run property-init-order-check
304+
302305
- name: Compile /build/
303306
run: npm run compile
304307
working-directory: build

‎.npmrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
disturl="https://electronjs.org/headers"
2-
target="34.2.0"
3-
ms_build_id="11044223"
2+
target="34.3.2"
3+
ms_build_id="11161073"
44
runtime="electron"
55
build_from_source="true"
66
legacy-peer-deps="true"

‎.vscode-test.js

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const { defineConfig } = require('@vscode/test-cli');
1919
* A list of extension folders who have opted into tests, or configuration objects.
2020
* Edit me to add more!
2121
*
22-
* @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
22+
* @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
2323
*/
2424
const extensions = [
2525
{
@@ -65,6 +65,20 @@ const extensions = [
6565
{
6666
label: 'microsoft-authentication',
6767
mocha: { timeout: 60_000 }
68+
},
69+
{
70+
label: 'vscode-api-tests-folder',
71+
extensionDevelopmentPath: `extensions/vscode-api-tests`,
72+
workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
73+
mocha: { timeout: 60_000 },
74+
files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
75+
},
76+
{
77+
label: 'vscode-api-tests-workspace',
78+
extensionDevelopmentPath: `extensions/vscode-api-tests`,
79+
workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
80+
mocha: { timeout: 60_000 },
81+
files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
6882
}
6983
];
7084

@@ -75,9 +89,12 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
7589

7690
const config = defineConfig(extensions.map(extension => {
7791
/** @type {import('@vscode/test-cli').TestConfiguration} */
78-
const config = typeof extension === 'object'
79-
? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
80-
: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
92+
const config = {
93+
platform: 'desktop',
94+
files: `extensions/${extension.label}/out/**/*.test.js`,
95+
extensionDevelopmentPath: `extensions/${extension.label}`,
96+
...extension,
97+
};
8198

8299
config.mocha ??= {};
83100
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {

‎.vscode/launch.json

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,51 @@
251251
"timeout": 0,
252252
"env": {
253253
"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
254-
"VSCODE_SKIP_PRELAUNCH": "1"
254+
"VSCODE_SKIP_PRELAUNCH": "1",
255+
},
256+
"cleanUp": "wholeBrowser",
257+
"runtimeArgs": [
258+
"--inspect-brk=5875",
259+
"--no-cached-data",
260+
"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
261+
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
262+
"--disable-features=CalculateNativeWinOcclusion",
263+
"--disable-extension=vscode.vscode-api-tests"
264+
],
265+
"userDataDir": "${userHome}/.vscode-oss-dev",
266+
"webRoot": "${workspaceFolder}",
267+
"cascadeTerminateToConfigurations": [
268+
"Attach to Extension Host"
269+
],
270+
"pauseForSourceMap": false,
271+
"outFiles": [
272+
"${workspaceFolder}/out/**/*.js"
273+
],
274+
"browserLaunchLocation": "workspace",
275+
"presentation": {
276+
"hidden": true,
277+
},
278+
},
279+
{
280+
// To debug observables you also need the extension "ms-vscode.debug-value-editor"
281+
"type": "chrome",
282+
"request": "launch",
283+
"name": "Launch VS Code Internal (Dev Debug)",
284+
"windows": {
285+
"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
286+
},
287+
"osx": {
288+
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
289+
},
290+
"linux": {
291+
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
292+
},
293+
"port": 9222,
294+
"timeout": 0,
295+
"env": {
296+
"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
297+
"VSCODE_SKIP_PRELAUNCH": "1",
298+
"VSCODE_DEV_DEBUG": "1",
255299
},
256300
"cleanUp": "wholeBrowser",
257301
"runtimeArgs": [
@@ -568,6 +612,21 @@
568612
"order": 1
569613
}
570614
},
615+
{
616+
"name": "VS Code (Debug Observables)",
617+
"stopAll": true,
618+
"configurations": [
619+
"Launch VS Code Internal (Dev Debug)",
620+
"Attach to Main Process",
621+
"Attach to Extension Host",
622+
"Attach to Shared Process",
623+
],
624+
"preLaunchTask": "Ensure Prelaunch Dependencies",
625+
"presentation": {
626+
"group": "0_vscode",
627+
"order": 1
628+
}
629+
},
571630
{
572631
"name": "Search, Renderer, and Main processes",
573632
"configurations": [

‎.vscode/notebooks/api.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": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"February 2025\""
10+
"value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"March 2025\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"out-vscode-reh/**": true,
5050
"extensions/**/dist/**": true,
5151
"extensions/**/out/**": true,
52+
"extensions/terminal-suggest/src/completions/upstream/**": true,
5253
"test/smoke/out/**": true,
5354
"test/automation/out/**": true,
5455
"test/integration/browser/out/**": true
@@ -176,5 +177,6 @@
176177
"*": "error",
177178
"ts": "warning",
178179
"eslint": "warning"
179-
}
180+
},
181+
"editor.experimental.preferTreeSitter.typescript": true
180182
}

‎build/.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ disturl="https://nodejs.org/dist"
22
runtime="node"
33
build_from_source="true"
44
legacy-peer-deps="true"
5+
force_process_config="true"
56
timeout=180000

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ steps:
4242
- script: |
4343
set -e
4444
if [ -n "$SYSROOT_ARCH" ]; then
45-
export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
4645
export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
4746
node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
4847
if [ "$SYSROOT_ARCH" == "arm64" ]; then
@@ -73,7 +72,7 @@ steps:
7372
7473
# verify glibc requirement
7574
if [ -n "$SYSROOT_ARCH" ]; then
76-
glibc_version="2.17"
75+
glibc_version="2.28"
7776
while IFS= read -r line; do
7877
if [[ $line == *"GLIBC_"* ]]; then
7978
version=$(echo "$line" | awk '{print $5}' | tr -d '()')
@@ -83,8 +82,8 @@ steps:
8382
fi
8483
fi
8584
done < <("$OBJDUMP" -T "$PWD/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code")
86-
if [[ "$glibc_version" != "2.17" ]]; then
87-
echo "Error: binary has dependency on GLIBC > 2.17, found $glibc_version"
85+
if [[ "$glibc_version" != "2.28" ]]; then
86+
echo "Error: binary has dependency on GLIBC > 2.28, found $glibc_version"
8887
exit 1
8988
fi
9089
fi
@@ -120,22 +119,6 @@ steps:
120119
ArtifactServices.Symbol.UseAAD: false
121120
displayName: Publish Symbols
122121

123-
- task: CopyFiles@2
124-
inputs:
125-
SourceFolder: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release
126-
Contents: 'code.*'
127-
TargetFolder: $(Agent.TempDirectory)/binskim-cli
128-
displayName: Copy files for BinSkim
129-
130-
- task: BinSkim@4
131-
inputs:
132-
InputType: Basic
133-
Function: analyze
134-
TargetPattern: guardianGlob
135-
AnalyzeTargetGlob: $(Agent.TempDirectory)/binskim-cli/*.*
136-
AnalyzeSymPath: $(Agent.TempDirectory)/binskim-cli
137-
displayName: Run BinSkim
138-
139122
- powershell: |
140123
. build/azure-pipelines/win32/exec.ps1
141124
$ErrorActionPreference = "Stop"

‎build/azure-pipelines/cli/install-rust-posix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
- name: channel
33
type: string
4-
default: 1.81
4+
default: 1.85
55
- name: targets
66
default: []
77
type: object

0 commit comments

Comments
 (0)