Skip to content

Commit 3bd17a5

Browse files
TyriarTyriar
authored
Merge branch 'main' into tyriar/measure_latency
2 parents e3a3693 + 0ccdfca commit 3bd17a5

File tree

383 files changed

+15634
-11570
lines changed

Some content is hidden

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

383 files changed

+15634
-11570
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ contact_links:
33
- name: Question
44
url: https://stackoverflow.com/questions/tagged/visual-studio-code
55
about: Please ask and answer questions here.
6+
- name: Extension Development
7+
url: https://github.com/microsoft/vscode-discussions/discussions/5
8+
about: Please use this for extension development questions and ideas.

‎.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\n\n$MILESTONE=milestone:\"September 2022\""
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\r\n\r\n$MILESTONE=milestone:\"October 2022\""
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\n\n$MILESTONE=milestone:\"September 2022\"\n\n$MINE=assignee:@me"
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\r\n\r\n$MILESTONE=milestone:\"October 2022\"\r\n\r\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/settings.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"[rust]": {
9292
"editor.defaultFormatter": "rust-lang.rust-analyzer",
9393
"editor.formatOnSave": true,
94-
"editor.insertSpaces": true
9594
},
9695
"typescript.tsc.autoDetect": "off",
9796
"testing.autoRun.mode": "rerun",

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
parameters:
2+
- name: VSCODE_CLI_TARGET
3+
type: string
4+
- name: VSCODE_CLI_ARTIFACT
5+
type: string
6+
- name: VSCODE_CLI_ENV
7+
type: object
8+
default: {}
9+
10+
steps:
11+
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code-tunnel
12+
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
13+
workingDirectory: $(Build.SourcesDirectory)/cli
14+
env:
15+
VSCODE_CLI_VERSION: $(VSCODE_CLI_VERSION)
16+
VSCODE_CLI_REMOTE_LICENSE_TEXT: $(VSCODE_CLI_REMOTE_LICENSE_TEXT)
17+
VSCODE_CLI_REMOTE_LICENSE_PROMPT: $(VSCODE_CLI_REMOTE_LICENSE_PROMPT)
18+
VSCODE_CLI_ASSET_NAME: ${{ parameters.VSCODE_CLI_ARTIFACT }}
19+
VSCODE_CLI_AI_KEY: $(VSCODE_CLI_AI_KEY)
20+
VSCODE_CLI_AI_ENDPOINT: $(VSCODE_CLI_AI_ENDPOINT)
21+
${{ each pair in parameters.VSCODE_CLI_ENV }}:
22+
${{ pair.key }}: ${{ pair.value }}
23+
24+
- ${{ if or(contains(parameters.VSCODE_CLI_TARGET, '-windows-'), contains(parameters.VSCODE_CLI_TARGET, '-darwin')) }}:
25+
- task: ArchiveFiles@2
26+
inputs:
27+
${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
28+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel.exe
29+
${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}:
30+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel
31+
includeRootFolder: false
32+
archiveType: zip
33+
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
34+
35+
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip
36+
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
37+
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact
38+
39+
- ${{ else }}:
40+
- task: ArchiveFiles@2
41+
inputs:
42+
rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code-tunnel
43+
includeRootFolder: false
44+
archiveType: tar
45+
tarCompression: gz
46+
archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
47+
48+
- publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz
49+
artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }}
50+
displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact

‎build/azure-pipelines/cli/cli-darwin-sign.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
parameters:
2+
- name: VSCODE_CLI_ARTIFACTS
3+
type: object
4+
default: []
5+
6+
steps:
7+
- task: UseDotNet@2
8+
inputs:
9+
version: 2.x
10+
11+
- task: EsrpClientTool@1
12+
displayName: Download ESRPClient
13+
14+
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
15+
- task: DownloadPipelineArtifact@2
16+
displayName: Download ${{ target }}
17+
inputs:
18+
artifact: ${{ target }}
19+
path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
20+
21+
- script: |
22+
set -e
23+
node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip"
24+
displayName: Codesign
25+
26+
- script: |
27+
set -e
28+
node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip"
29+
displayName: Notarize
30+
31+
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
32+
- script: |
33+
set -e
34+
ASSET_ID=$(echo "${{ target }}" | sed "s/unsigned_//")
35+
mv $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/${{ target }}.zip $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/$ASSET_ID.zip
36+
echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
37+
displayName: Set asset id variable
38+
39+
- publish: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/$(ASSET_ID).zip
40+
artifact: $(ASSET_ID)

‎build/azure-pipelines/cli/cli-win32-sign.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
parameters:
2+
- name: VSCODE_CLI_ARTIFACTS
3+
type: object
4+
default: []
5+
6+
steps:
7+
- task: AzureKeyVault@1
8+
displayName: "Azure Key Vault: Get Secrets"
9+
inputs:
10+
azureSubscription: "vscode-builds-subscription"
11+
KeyVaultName: vscode
12+
SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
13+
14+
- task: UseDotNet@2
15+
displayName: "Use .NET"
16+
inputs:
17+
version: 3.x
18+
19+
- task: EsrpClientTool@1
20+
displayName: "Use ESRP client"
21+
22+
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
23+
- task: DownloadPipelineArtifact@2
24+
displayName: Download artifacts
25+
inputs:
26+
artifact: ${{ target }}
27+
path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
28+
29+
- task: ExtractFiles@1
30+
inputs:
31+
archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
32+
destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
33+
34+
- powershell: |
35+
. build/azure-pipelines/win32/exec.ps1
36+
$ErrorActionPreference = "Stop"
37+
$EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName
38+
$EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName
39+
mkdir -p $(Agent.TempDirectory)\esrpcli
40+
Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli
41+
$EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName
42+
echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath"
43+
displayName: Find ESRP CLI
44+
45+
- powershell: |
46+
. build/azure-pipelines/win32/exec.ps1
47+
$ErrorActionPreference = "Stop"
48+
exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/sign "*.exe" }
49+
displayName: "Code sign"
50+
51+
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
52+
- powershell: |
53+
$ASSET_ID = "${{ target }}".replace("unsigned_", "");
54+
echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
55+
displayName: Set asset id variable
56+
57+
- task: ArchiveFiles@2
58+
inputs:
59+
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code-tunnel.exe
60+
includeRootFolder: false
61+
archiveType: zip
62+
archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
63+
64+
- publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
65+
artifact: $(ASSET_ID)

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
parameters:
2+
- name: channel
3+
type: string
4+
default: stable
5+
- name: targets
6+
default: []
7+
type: object
8+
9+
# Todo: use 1ES pipeline once extension is installed in ADO
10+
11+
steps:
12+
- script: |
13+
set -e
14+
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain $RUSTUP_TOOLCHAIN
15+
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
16+
env:
17+
RUSTUP_TOOLCHAIN: ${{ parameters.channel }}
18+
displayName: "Install Rust"
19+
20+
- script: |
21+
set -e
22+
rustup default $RUSTUP_TOOLCHAIN
23+
rustup update $RUSTUP_TOOLCHAIN
24+
env:
25+
RUSTUP_TOOLCHAIN: ${{ parameters.channel }}
26+
displayName: "Set Rust version"
27+
28+
- ${{ each target in parameters.targets }}:
29+
- script: rustup target add ${{ target }}
30+
displayName: "Adding Rust target '${{ target }}'"
31+
32+
- script: |
33+
set -e
34+
rustc --version
35+
cargo --version
36+
rustup --version
37+
displayName: "Check Rust versions"

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
parameters:
2+
- name: channel
3+
type: string
4+
default: stable
5+
- name: targets
6+
default: []
7+
type: object
8+
9+
# Todo: use 1ES pipeline once extension is installed in ADO
10+
11+
steps:
12+
- powershell: |
13+
. build/azure-pipelines/win32/exec.ps1
14+
exec { curl -sSf -o rustup-init.exe https://win.rustup.rs }
15+
exec { rustup-init.exe -y --profile minimal --default-toolchain %RUSTUP_TOOLCHAIN% --default-host x86_64-pc-windows-msvc }
16+
echo "##vso[task.prependpath]$env:USERPROFILE\.cargo\bin"
17+
env:
18+
RUSTUP_TOOLCHAIN: ${{ parameters.channel }}
19+
displayName: "Install Rust"
20+
21+
- powershell: |
22+
. build/azure-pipelines/win32/exec.ps1
23+
exec { rustup default $RUSTUP_TOOLCHAIN }
24+
exec { rustup update $RUSTUP_TOOLCHAIN }
25+
env:
26+
RUSTUP_TOOLCHAIN: ${{ parameters.channel }}
27+
displayName: "Set Rust version"
28+
29+
- ${{ each target in parameters.targets }}:
30+
- script: rustup target add ${{ target }}
31+
displayName: "Adding Rust target '${{ target }}'"
32+
33+
- powershell: |
34+
. build/azure-pipelines/win32/exec.ps1
35+
exec { rustc --version }
36+
exec { cargo --version }
37+
exec { rustup --version }
38+
displayName: "Check Rust versions"

‎build/azure-pipelines/cli/prepare.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
"use strict";
2+
/*---------------------------------------------------------------------------------------------
3+
* Copyright (c) Microsoft Corporation. All rights reserved.
4+
* Licensed under the MIT License. See License.txt in the project root for license information.
5+
*--------------------------------------------------------------------------------------------*/
6+
Object.defineProperty(exports, "__esModule", { value: true });
7+
const getVersion_1 = require("../../lib/getVersion");
8+
const fs = require("fs");
9+
const path = require("path");
10+
const packageJson = require("../../../package.json");
11+
const root = path.dirname(path.dirname(path.dirname(__dirname)));
12+
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
13+
const commit = (0, getVersion_1.getVersion)(root);
14+
/**
15+
* Sets build environment variables for the CLI for current contextual info.
16+
*/
17+
const setLauncherEnvironmentVars = () => {
18+
const vars = new Map([
19+
['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense],
20+
['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt],
21+
['VSCODE_CLI_VERSION', packageJson.version],
22+
['VSCODE_CLI_COMMIT', commit],
23+
]);
24+
for (const [key, value] of vars) {
25+
if (value) {
26+
console.log(`##vso[task.setvariable variable=${key}]${value}`);
27+
}
28+
}
29+
};
30+
if (require.main === module) {
31+
setLauncherEnvironmentVars();
32+
}

0 commit comments

Comments
 (0)