Skip to content

Commit fc0f977

Browse files
ntroghntrogh
authored
Merge pull request #25 from microsoft/sync-main-branch
Sync main branch with public repo (BIG PR!)
2 parents b36242f + 329e5bc commit fc0f977

File tree

5,427 files changed

+36997
-16
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,427 files changed

+36997
-16
lines changed

‎.pipelines/azure-pipelines.main.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
trigger:
2+
batch: true
3+
branches:
4+
include:
5+
- main
6+
paths:
7+
exclude:
8+
- .config
9+
- .devcontainer
10+
- .pipelines
11+
- .vscode
12+
pr: none
13+
14+
resources:
15+
repositories:
16+
- repository: 1esPipelines
17+
type: git
18+
name: 1ESPipelineTemplates/1ESPipelineTemplates
19+
ref: refs/tags/release
20+
21+
pipelines:
22+
- pipeline: vscode-website-prod
23+
source: vscode-website (official)
24+
branch: release/prod
25+
trigger: true
26+
27+
variables:
28+
Codeql.Enabled: true
29+
Codeql.SourceRoot: $(Pipeline.Workspace)/vscode-website
30+
Codeql.TSAEnabled: true
31+
Codeql.TSAOptionsPath: $(Build.SourcesDirectory)/.config/tsaoptions.json
32+
33+
extends:
34+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
35+
parameters:
36+
sdl:
37+
credscan:
38+
suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
39+
git:
40+
fetchDepth: 1
41+
lfs: true
42+
retryCount: 3
43+
policheck:
44+
break: true
45+
sourceAnalysisPool: 1es-windows-2022-x64
46+
tsa:
47+
enabled: true
48+
49+
stages:
50+
- template: templates/stages/build-main.yml@self

‎.pipelines/azure-pipelines.vnext.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
trigger:
2+
batch: true
3+
branches:
4+
include:
5+
- vnext
6+
paths:
7+
exclude:
8+
- .config
9+
- .devcontainer
10+
- .pipelines
11+
- .vscode
12+
pr: none
13+
14+
resources:
15+
repositories:
16+
- repository: 1esPipelines
17+
type: git
18+
name: 1ESPipelineTemplates/1ESPipelineTemplates
19+
ref: refs/tags/release
20+
21+
pipelines:
22+
- pipeline: vscode-website-main
23+
source: vscode-website (buddy)
24+
branch: main
25+
trigger: true
26+
27+
extends:
28+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
29+
parameters:
30+
sdl:
31+
credscan:
32+
suppressionsFile: $(Build.SourcesDirectory)/.config/CredScanSuppressions.json
33+
git:
34+
fetchDepth: 1
35+
lfs: true
36+
retryCount: 3
37+
policheck:
38+
break: true
39+
sourceAnalysisPool: 1es-windows-2022-x64
40+
tsa:
41+
enabled: true
42+
43+
stages:
44+
- template: templates/stages/build-vnext.yml@self

‎.pipelines/templates/stages/build-main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
stages:
2+
- stage: Build
3+
jobs:
4+
- template: ../jobs/build.yml@self
5+
parameters:
6+
jobDisplayName: vscode-site-prod
7+
artifactName: vscode-website-prod

‎.pipelines/templates/stages/build-vnext.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
stages:
2+
- stage: Build
3+
jobs:
4+
- template: ../jobs/build.yml@self
5+
parameters:
6+
jobDisplayName: vscode-site-vnext
7+
artifactName: vscode-website-main

‎api/advanced-topics/extension-host.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: 106AA11C-DB26-493A-9E3C-16F513B2AEC8
4+
<<<<<<< HEAD
5+
<<<<<<< HEAD
6+
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
11+
<<<<<<< HEAD
412
DateApproved: 10/03/2024
13+
=======
14+
DateApproved: 10/29/2024
15+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16+
=======
17+
DateApproved: 10/29/2024
18+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19+
=======
20+
DateApproved: 10/29/2024
21+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22+
=======
23+
DateApproved: 10/29/2024
24+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25+
=======
26+
DateApproved: 10/29/2024
27+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28+
=======
29+
DateApproved: 10/29/2024
30+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31+
=======
32+
DateApproved: 10/29/2024
33+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34+
=======
35+
DateApproved: 10/29/2024
36+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
537

638
# Summarize the whole topic in less than 300 characters for SEO purpose
739
MetaDescription: The Visual Studio Code Extension Host is responsible for managing extensions and ensuring the stability and performance of Visual Studio Code.

‎api/advanced-topics/remote-extensions.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
---
22
ContentId: 5c708951-e566-42db-9d97-e9715d95cdd1
3+
<<<<<<< HEAD
4+
<<<<<<< HEAD
5+
<<<<<<< HEAD
6+
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
311
DateApproved: 10/03/2024
12+
=======
13+
DateApproved: 10/29/2024
14+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
15+
=======
16+
DateApproved: 10/29/2024
17+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
18+
=======
19+
DateApproved: 10/29/2024
20+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
21+
=======
22+
DateApproved: 10/29/2024
23+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
24+
=======
25+
DateApproved: 10/29/2024
26+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
27+
=======
28+
DateApproved: 10/29/2024
29+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
30+
=======
31+
DateApproved: 10/29/2024
32+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
33+
=======
34+
DateApproved: 10/29/2024
35+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
436

537
# Summarize the whole topic in less than 300 characters for SEO purpose
638
MetaDescription: A guide to adding Visual Studio Code Remote Development and GitHub Codespaces support to extensions

‎api/advanced-topics/tslint-eslint-migration.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
---
22
ContentId: f00c4913-58e3-4a61-aa42-e769c3430906
3+
<<<<<<< HEAD
4+
<<<<<<< HEAD
5+
<<<<<<< HEAD
6+
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
311
DateApproved: 10/03/2024
12+
=======
13+
DateApproved: 10/29/2024
14+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
15+
=======
16+
DateApproved: 10/29/2024
17+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
18+
=======
19+
DateApproved: 10/29/2024
20+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
21+
=======
22+
DateApproved: 10/29/2024
23+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
24+
=======
25+
DateApproved: 10/29/2024
26+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
27+
=======
28+
DateApproved: 10/29/2024
29+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
30+
=======
31+
DateApproved: 10/29/2024
32+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
33+
=======
34+
DateApproved: 10/29/2024
35+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
436

537
# Summarize the whole topic in less than 300 characters for SEO purpose
638
MetaDescription: A guide to migrating extension projects from the TSLint linter to ESLint.

‎api/advanced-topics/using-proposed-api.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: f4d4e9e0-8901-405c-aaf5-faa16c32588b
4+
<<<<<<< HEAD
5+
<<<<<<< HEAD
6+
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
11+
<<<<<<< HEAD
412
DateApproved: 10/03/2024
13+
=======
14+
DateApproved: 10/29/2024
15+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16+
=======
17+
DateApproved: 10/29/2024
18+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19+
=======
20+
DateApproved: 10/29/2024
21+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22+
=======
23+
DateApproved: 10/29/2024
24+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25+
=======
26+
DateApproved: 10/29/2024
27+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28+
=======
29+
DateApproved: 10/29/2024
30+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31+
=======
32+
DateApproved: 10/29/2024
33+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34+
=======
35+
DateApproved: 10/29/2024
36+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
537

638
# Summarize the whole topic in less than 300 characters for SEO purpose
739
MetaDescription: Use Visual Studio Code's Proposed API

‎api/extension-capabilities/common-capabilities.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11
---
22
# DO NOT TOUCH — Managed by doc writer
33
ContentId: 9c48dfbf-e49d-4f33-aadc-5ebf06d5dde0
4+
<<<<<<< HEAD
5+
<<<<<<< HEAD
6+
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
11+
<<<<<<< HEAD
412
DateApproved: 10/03/2024
13+
=======
14+
DateApproved: 10/29/2024
15+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
16+
=======
17+
DateApproved: 10/29/2024
18+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
19+
=======
20+
DateApproved: 10/29/2024
21+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
22+
=======
23+
DateApproved: 10/29/2024
24+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
25+
=======
26+
DateApproved: 10/29/2024
27+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
28+
=======
29+
DateApproved: 10/29/2024
30+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
31+
=======
32+
DateApproved: 10/29/2024
33+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
34+
=======
35+
DateApproved: 10/29/2024
36+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
537

638
# Summarize the whole topic in less than 300 characters for SEO purpose
739
MetaDescription: Common capabilities that Visual Studio Code extensions (plug-ins) can take advantage of
@@ -36,12 +68,76 @@ An extension can register custom Context Menu items that will be displayed in di
3668

3769
## Data Storage
3870

71+
<<<<<<< HEAD
72+
<<<<<<< HEAD
73+
<<<<<<< HEAD
74+
<<<<<<< HEAD
75+
<<<<<<< HEAD
76+
<<<<<<< HEAD
77+
<<<<<<< HEAD
78+
<<<<<<< HEAD
3979
There are four options for storing data:
80+
=======
81+
There are five options for storing data:
82+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
83+
=======
84+
There are five options for storing data:
85+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
86+
=======
87+
There are five options for storing data:
88+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
89+
=======
90+
There are five options for storing data:
91+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
92+
=======
93+
There are five options for storing data:
94+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
95+
=======
96+
There are five options for storing data:
97+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
98+
=======
99+
There are five options for storing data:
100+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
101+
=======
102+
There are five options for storing data:
103+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
40104
41105
- [`ExtensionContext.workspaceState`](/api/references/vscode-api#ExtensionContext.workspaceState): A workspace storage where you can write key/value pairs. VS Code manages the storage and will restore it when the same workspace is opened again.
42106
- [`ExtensionContext.globalState`](/api/references/vscode-api#ExtensionContext.globalState): A global storage where you can write key/value pairs. VS Code manages the storage and will restore it for each extension activation. You can selectively synchronize key/value pairs in global storage by setting the keys for sync using `setKeysForSync` method on `globalState`.
43107
- [`ExtensionContext.storageUri`](/api/references/vscode-api#ExtensionContext.storageUri): A workspace specific storage URI pointing to a local directory where your extension has read/write access. This is a good option if you need to store large files that are accessible only from the current workspace.
44108
- [`ExtensionContext.globalStorageUri`](/api/references/vscode-api#ExtensionContext.globalStorageUri): A global storage URI pointing to a local directory where your extension has read/write access. This is a good option if you need to store large files that are accessible from all workspaces.
109+
<<<<<<< HEAD
110+
<<<<<<< HEAD
111+
<<<<<<< HEAD
112+
<<<<<<< HEAD
113+
<<<<<<< HEAD
114+
<<<<<<< HEAD
115+
<<<<<<< HEAD
116+
<<<<<<< HEAD
117+
=======
118+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
119+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
120+
=======
121+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
122+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
123+
=======
124+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
125+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
126+
=======
127+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
128+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
129+
=======
130+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
131+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
132+
=======
133+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
134+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
135+
=======
136+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
137+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
138+
=======
139+
- [`ExtensionContext.secrets`](/api/references/vscode-api#ExtensionContext.secrets): A global storage for secrets (or any information that is sensitive) that will be encrypted. These are not synced across machines. For VS Code desktop, this leverages Electron's [safeStorage API](https://www.electronjs.org/docs/latest/api/safe-storage). For VS Code for the Web, this uses a Double Key Encryption (DKE) implementation.
140+
>>>>>>> 27e6951b86c69326ee8ff76ba46694a60b72ec65
45141
46142
The extension context is available to the `activate` function in the [Extension Entry File](/api/get-started/extension-anatomy#extension-entry-file).
47143

0 commit comments

Comments
 (0)