Skip to content

Commit ed04bd4

Browse files
mjbvzmjbvz
committed
Merge branch 'main' into hidden-spider
2 parents 0e63f13 + 10434e3 commit ed04bd4

File tree

5,787 files changed

+476947
-211309
lines changed

Some content is hidden

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

5,787 files changed

+476947
-211309
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
111:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-09-10
9+
eslint:
10+
lastModifiedDate: 2024-09-10
11+
psscriptanalyzer:
12+
lastModifiedDate: 2024-09-10
13+
armory:
14+
lastModifiedDate: 2024-09-10
15+
binary:
16+
credscan:
17+
lastModifiedDate: 2025-02-04
18+
binskim:
19+
lastModifiedDate: 2025-02-04
20+
spotbugs:
21+
lastModifiedDate: 2025-02-04

‎.config/guardian/.gdnbaselines

+255
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2025-01-28 06:29:05Z",
10+
"lastUpdatedDate": "2025-01-28 06:29:05Z"
11+
}
12+
},
13+
"results": {
14+
"ea3b2bf4f5b3d0bd8a6ad35cc61e49f2a1596660fd66d17d740e4806e7ed7dcc": {
15+
"signature": "ea3b2bf4f5b3d0bd8a6ad35cc61e49f2a1596660fd66d17d740e4806e7ed7dcc",
16+
"alternativeSignatures": [
17+
"ff528c0b5a010ae7b5e9178b004a8b816a429a28ba98ce8336466b490a09dcef"
18+
],
19+
"target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.97.0-insider.exe",
20+
"memberOf": [
21+
"default"
22+
],
23+
"tool": "binskim",
24+
"ruleId": "BA2009",
25+
"createdDate": "2025-01-30 19:19:49Z",
26+
"expirationDate": "2025-07-19 21:12:48Z",
27+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
28+
},
29+
"12babbc85192ed1c8d927693da788537c1eef199bbecbe226f940a2d0e97637c": {
30+
"signature": "12babbc85192ed1c8d927693da788537c1eef199bbecbe226f940a2d0e97637c",
31+
"alternativeSignatures": [
32+
"35b0519e201e56fb87fc6fb085e6fb1df5b89715142bb9086a5b2006e0fd4ced"
33+
],
34+
"target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.97.0-insider.exe",
35+
"memberOf": [
36+
"default"
37+
],
38+
"tool": "binskim",
39+
"ruleId": "BA2018",
40+
"createdDate": "2025-01-30 19:19:49Z",
41+
"expirationDate": "2025-07-19 21:12:48Z",
42+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
43+
},
44+
"49163bd1dc9d965d3baced1694dc8c43305b8bf96e884f478d8e4bd124454ba0": {
45+
"signature": "49163bd1dc9d965d3baced1694dc8c43305b8bf96e884f478d8e4bd124454ba0",
46+
"alternativeSignatures": [
47+
"aa80bcf44aa8ddd20fb9802e9032c1257048b973896a944ded70bb195f060b2a"
48+
],
49+
"target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.97.0-insider.exe",
50+
"memberOf": [
51+
"default"
52+
],
53+
"tool": "binskim",
54+
"ruleId": "BA2009",
55+
"createdDate": "2025-01-30 19:21:17Z",
56+
"expirationDate": "2025-07-19 21:12:48Z",
57+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
58+
},
59+
"c405af02e021c3a473d4e45ec4daa658db1527ea7430c6be968d182e7b50fbd1": {
60+
"signature": "c405af02e021c3a473d4e45ec4daa658db1527ea7430c6be968d182e7b50fbd1",
61+
"alternativeSignatures": [
62+
"619d2a1a77f55b4181493b8cfdf09be5261e539115752af2e4938f5ac04af132"
63+
],
64+
"target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.97.0-insider.exe",
65+
"memberOf": [
66+
"default"
67+
],
68+
"tool": "binskim",
69+
"ruleId": "BA2018",
70+
"createdDate": "2025-01-30 19:21:17Z",
71+
"expirationDate": "2025-07-19 21:12:48Z",
72+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
73+
},
74+
"71b8515b2eb51cfd5eace11cedb15189d51ce9e479095a5938334416088cbc03": {
75+
"signature": "71b8515b2eb51cfd5eace11cedb15189d51ce9e479095a5938334416088cbc03",
76+
"alternativeSignatures": [
77+
"b34279fc5fec828b8dcd9ca873804e85d7d9cd78554ec109d2dd493351a7a244"
78+
],
79+
"target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.97.0-insider.exe",
80+
"memberOf": [
81+
"default"
82+
],
83+
"tool": "binskim",
84+
"ruleId": "BA2009",
85+
"createdDate": "2025-01-30 19:51:51Z",
86+
"expirationDate": "2025-07-19 21:12:48Z",
87+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
88+
},
89+
"9238de77a5320039def14694d1b6f501cc2288f13c9c688d2e0501fc5a56ee61": {
90+
"signature": "9238de77a5320039def14694d1b6f501cc2288f13c9c688d2e0501fc5a56ee61",
91+
"alternativeSignatures": [
92+
"1d17616a549e9f36d814c4e802d651b1af453ce0a23d4478eef39be81adcc16b"
93+
],
94+
"target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.97.0-insider.exe",
95+
"memberOf": [
96+
"default"
97+
],
98+
"tool": "binskim",
99+
"ruleId": "BA2018",
100+
"createdDate": "2025-01-30 19:51:51Z",
101+
"expirationDate": "2025-07-19 21:12:48Z",
102+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
103+
},
104+
"bad8b698b48c1da9ece953903581c66bf98bc829ae1a6adcd3b5c2056a6fcd01": {
105+
"signature": "bad8b698b48c1da9ece953903581c66bf98bc829ae1a6adcd3b5c2056a6fcd01",
106+
"alternativeSignatures": [
107+
"057376d31b97e8ce3ecf6a180a553b932d7e5be6e2b07a08027d5dfabe35e82c"
108+
],
109+
"target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.97.0-insider.exe",
110+
"memberOf": [
111+
"default"
112+
],
113+
"tool": "binskim",
114+
"ruleId": "BA2009",
115+
"createdDate": "2025-01-30 19:53:13Z",
116+
"expirationDate": "2025-07-19 21:12:48Z",
117+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
118+
},
119+
"cc7c248b0fd4c105e9a393ae232bf0d314ec50e65357a5e7e7d68f6f10c77077": {
120+
"signature": "cc7c248b0fd4c105e9a393ae232bf0d314ec50e65357a5e7e7d68f6f10c77077",
121+
"alternativeSignatures": [
122+
"f3867098aff3368682df9926e85a35ec05cf905f27d0c157430021c3169f899d"
123+
],
124+
"target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.97.0-insider.exe",
125+
"memberOf": [
126+
"default"
127+
],
128+
"tool": "binskim",
129+
"ruleId": "BA2018",
130+
"createdDate": "2025-01-30 19:53:13Z",
131+
"expirationDate": "2025-07-19 21:12:48Z",
132+
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
133+
},
134+
"8c53250a171412b84dedcbb22cdab9ec365d9b52d74b09c070097fff45372de0": {
135+
"signature": "8c53250a171412b84dedcbb22cdab9ec365d9b52d74b09c070097fff45372de0",
136+
"alternativeSignatures": [
137+
"314267784b0ea867006e00b809a93498fae3264e42d1a3a7745ab13180a5b6ef"
138+
],
139+
"target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.98.0-insider.exe",
140+
"memberOf": [
141+
"default"
142+
],
143+
"tool": "binskim",
144+
"ruleId": "BA2009",
145+
"createdDate": "2025-02-04 06:16:33Z",
146+
"expirationDate": "2025-07-24 07:25:17Z",
147+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
148+
},
149+
"a6a58d971da858f4af219672cef73ffd0aacc47f1e2c12b8b44a428e1330d3de": {
150+
"signature": "a6a58d971da858f4af219672cef73ffd0aacc47f1e2c12b8b44a428e1330d3de",
151+
"alternativeSignatures": [
152+
"4e40f2f1683f0bf2245f35d0ebbcf2f446274d84b1db09d8e76ddfdcad5d4479"
153+
],
154+
"target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.98.0-insider.exe",
155+
"memberOf": [
156+
"default"
157+
],
158+
"tool": "binskim",
159+
"ruleId": "BA2018",
160+
"createdDate": "2025-02-04 06:16:33Z",
161+
"expirationDate": "2025-07-24 07:25:17Z",
162+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
163+
},
164+
"90e0f060e01e4a55620f609ac3241b62e8f54a059e9f4d292e93a4305fd3c39e": {
165+
"signature": "90e0f060e01e4a55620f609ac3241b62e8f54a059e9f4d292e93a4305fd3c39e",
166+
"alternativeSignatures": [
167+
"377fe43ff8404d07f4a6ca763175004f360397ded6cf5d55b655646ada90e39c"
168+
],
169+
"target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.98.0-insider.exe",
170+
"memberOf": [
171+
"default"
172+
],
173+
"tool": "binskim",
174+
"ruleId": "BA2009",
175+
"createdDate": "2025-02-04 06:17:54Z",
176+
"expirationDate": "2025-07-24 07:25:17Z",
177+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
178+
},
179+
"f36c3dc19566098a923877d16d6ebfcbd971f8fcd8210afb8f5558fb5ba1f203": {
180+
"signature": "f36c3dc19566098a923877d16d6ebfcbd971f8fcd8210afb8f5558fb5ba1f203",
181+
"alternativeSignatures": [
182+
"1af1f475c1617701e3d7a8fd465916bcc60c3125b8807af5d47d49137d9d468c"
183+
],
184+
"target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.98.0-insider.exe",
185+
"memberOf": [
186+
"default"
187+
],
188+
"tool": "binskim",
189+
"ruleId": "BA2018",
190+
"createdDate": "2025-02-04 06:17:54Z",
191+
"expirationDate": "2025-07-24 07:25:17Z",
192+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
193+
},
194+
"71193d108c53bb802f5c491276365bcff0645fb380be57288f3fbd6896166d3a": {
195+
"signature": "71193d108c53bb802f5c491276365bcff0645fb380be57288f3fbd6896166d3a",
196+
"alternativeSignatures": [
197+
"420cae2e6e34b93d7b74fc1ffddfdf23b57650ae989d838bb2d67f28e4e1db0e"
198+
],
199+
"target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.98.0-insider.exe",
200+
"memberOf": [
201+
"default"
202+
],
203+
"tool": "binskim",
204+
"ruleId": "BA2009",
205+
"createdDate": "2025-02-04 07:11:19Z",
206+
"expirationDate": "2025-07-24 07:25:17Z",
207+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
208+
},
209+
"444c302f49bdedcafe772322a09727b2279e3265d99deb2e307defeae3ef200b": {
210+
"signature": "444c302f49bdedcafe772322a09727b2279e3265d99deb2e307defeae3ef200b",
211+
"alternativeSignatures": [
212+
"4ff6ccbdb0745d43d3b61f82fb2f4d8a64fe9787525df81a6d7b825e79282085"
213+
],
214+
"target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.98.0-insider.exe",
215+
"memberOf": [
216+
"default"
217+
],
218+
"tool": "binskim",
219+
"ruleId": "BA2018",
220+
"createdDate": "2025-02-04 07:11:19Z",
221+
"expirationDate": "2025-07-24 07:25:17Z",
222+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
223+
},
224+
"4670c7c096a69ca428429ffa1f5250aac9f2e07beac0ffe587ffb37bdb1da4d4": {
225+
"signature": "4670c7c096a69ca428429ffa1f5250aac9f2e07beac0ffe587ffb37bdb1da4d4",
226+
"alternativeSignatures": [
227+
"7cead96cb508ab6e37e27bcc0f8b7ed8d0761b77f4793958c46c5ff3892ab1b6"
228+
],
229+
"target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.98.0-insider.exe",
230+
"memberOf": [
231+
"default"
232+
],
233+
"tool": "binskim",
234+
"ruleId": "BA2009",
235+
"createdDate": "2025-02-04 07:13:22Z",
236+
"expirationDate": "2025-07-24 07:25:17Z",
237+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
238+
},
239+
"a359b4a5ed2378a73f3bba93e3fb1c595db7423c3082635d12d101bbeb0a51b8": {
240+
"signature": "a359b4a5ed2378a73f3bba93e3fb1c595db7423c3082635d12d101bbeb0a51b8",
241+
"alternativeSignatures": [
242+
"125b52a21ef619a95e695085deb9492280bcf2c1decdd5e87e6416af5982d02d"
243+
],
244+
"target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.98.0-insider.exe",
245+
"memberOf": [
246+
"default"
247+
],
248+
"tool": "binskim",
249+
"ruleId": "BA2018",
250+
"createdDate": "2025-02-04 07:13:22Z",
251+
"expirationDate": "2025-07-24 07:25:17Z",
252+
"justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
253+
}
254+
}
255+
}

‎.configurations/configuration.dsc.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ properties:
1818
id: OpenJS.NodeJS.LTS
1919
version: "20.14.0"
2020
source: winget
21-
- resource: NpmDsc/NpmPackage
22-
id: yarn
23-
dependsOn:
24-
- npm
25-
directives:
26-
description: Install Yarn
27-
allowPrerelease: true
28-
settings:
29-
Name: 'yarn'
30-
Global: true
31-
PackageDirectory: '${WinGetConfigRoot}\..\'
3221
- resource: Microsoft.WinGet.DSC/WinGetPackage
3322
directives:
3423
description: Install Python 3.10
@@ -56,7 +45,7 @@ properties:
5645
includeRecommended: true
5746
components:
5847
- Microsoft.VisualStudio.Workload.VCTools
59-
- resource: YarnDsc/YarnInstall
48+
- resource: NpmDsc/NpmInstall
6049
dependsOn:
6150
- npm
6251
directives:

‎.devcontainer/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN git config --system codespaces-theme.hide-status 1
77

88
USER node
99
RUN npm install -g node-gyp
10-
RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
10+
RUN NPM_CACHE="$(npm config get cache)" && rm -rf "$NPM_CACHE" && ln -s /vscode-dev/npm-cache "$NPM_CACHE"
1111
RUN echo 'export DISPLAY="${DISPLAY:-:1}"' | tee -a ~/.bashrc >> ~/.zshrc
1212

1313
USER root
14-
CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf
14+
CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/npm-cache && sleep inf

‎.devcontainer/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Code - OSS Development Container
22

3-
[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
3+
[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
44

55
This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
66

@@ -24,7 +24,7 @@ If you already have VS Code and Docker installed, you can click the badge above
2424
2525
4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**.
2626

27-
> **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
27+
> **Tip:** While you can use your local source tree instead, operations like `npm i` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
2828
2929
5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
3030

@@ -56,7 +56,7 @@ Next: **[Try it out!](#try-it)**
5656

5757
You may see improved VNC responsiveness when accessing a codespace from VS Code client since you can use a [VNC Viewer][def]. Here's how to do it.
5858

59-
1. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
59+
1. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [GitHub Codespaces extension](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).
6060

6161
> **Note:** The GitHub Codespaces extension requires the Visual Studio Code distribution of Code - OSS.
6262
@@ -85,7 +85,7 @@ To start working with Code - OSS, follow these steps:
8585
1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
8686

8787
```bash
88-
yarn install
88+
npm i
8989
bash scripts/code.sh
9090
```
9191

‎.devcontainer/post-create.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

3-
yarn install --network-timeout 180000
4-
yarn electron
3+
npm i
4+
npm run electron

‎.eslint-ignore

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
**/build/*/**/*.js
2+
**/dist/**/*.js
3+
**/extensions/**/*.d.ts
4+
**/extensions/**/build/**
5+
**/extensions/**/colorize-fixtures/**
6+
**/extensions/css-language-features/server/test/pathCompletionFixtures/**
7+
**/extensions/html-language-features/server/lib/jquery.d.ts
8+
**/extensions/html-language-features/server/src/test/pathCompletionFixtures/**
9+
**/extensions/ipynb/notebook-out/**
10+
**/extensions/markdown-language-features/media/**
11+
**/extensions/markdown-language-features/notebook-out/**
12+
**/extensions/markdown-math/notebook-out/**
13+
**/extensions/notebook-renderers/renderer-out/index.js
14+
**/extensions/simple-browser/media/index.js
15+
**/extensions/terminal-suggest/src/completions/upstream/**
16+
**/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
17+
**/extensions/terminal-suggest/third_party/**
18+
**/extensions/typescript-language-features/test-workspace/**
19+
**/extensions/typescript-language-features/extension.webpack.config.js
20+
**/extensions/typescript-language-features/extension-browser.webpack.config.js
21+
**/extensions/typescript-language-features/package-manager/node-maintainer/**
22+
**/extensions/vscode-api-tests/testWorkspace/**
23+
**/extensions/vscode-api-tests/testWorkspace2/**
24+
**/fixtures/**
25+
**/node_modules/**
26+
**/out-*/**/*.js
27+
**/out-editor-*/**
28+
**/out/**/*.js
29+
**/src/**/dompurify.js
30+
**/src/**/marked.js
31+
**/src/**/semver.js
32+
**/src/typings/**/*.d.ts
33+
**/src/vs/*/**/*.d.ts
34+
**/src/vs/base/test/common/filters.perf.data.js
35+
**/src/vs/loader.js
36+
**/test/unit/assert.js
37+
**/test/automation/out/**
38+
**/typings/**
39+
!.vscode

0 commit comments

Comments
 (0)