VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>

build/azure-pipelines/common/createAsset.js

@@ -160,7 +160,7 @@ async function main() {
     blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
     mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
     console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
-    await retry_1.retry(() => Promise.all([
+    await (0, retry_1.retry)(() => Promise.all([
         uploadBlob(blobService, quality, blobName, filePath, fileName),
         uploadBlob(mooncakeBlobService, quality, blobName, filePath, fileName)
     ]));
@@ -185,7 +185,7 @@ async function main() {
     console.log('Asset:', JSON.stringify(asset, null, '  '));
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
     const scripts = client.database('builds').container(quality).scripts;
-    await retry_1.retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+    await (0, retry_1.retry)(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
     console.log(`  Done ✔️`);
 }
 main().then(() => {

build/azure-pipelines/common/createBuild.js

@@ -40,7 +40,7 @@ async function main() {
     };
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
     const scripts = client.database('builds').container(quality).scripts;
-    await retry_1.retry(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
+    await (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
 }
 main().then(() => {
     console.log('Build successfully created');

build/azure-pipelines/common/installPlaywright.js

@@ -4,11 +4,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
 const retry_1 = require("./retry");
 const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');
-const playwrightPath = path.dirname(require.resolve('playwright'));
 async function install() {
-    await retry_1.retry(() => installBrowsersWithProgressBar(playwrightPath));
+    await (0, retry_1.retry)(() => installBrowsersWithProgressBar());
 }
 install();

build/azure-pipelines/common/publish-webview.js

@@ -1,71 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const azure = require("azure-storage");
-const mime = require("mime");
-const minimist = require("minimist");
-const path_1 = require("path");
-const fileNames = [
-    'fake.html',
-    'host.js',
-    'index.html',
-    'main.js',
-    'service-worker.js'
-];
-async function assertContainer(blobService, container) {
-    await new Promise((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
-}
-async function doesBlobExist(blobService, container, blobName) {
-    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(container, blobName, (err, r) => err ? e(err) : c(r)));
-    return existsResult.exists;
-}
-async function uploadBlob(blobService, container, blobName, file) {
-    const blobOptions = {
-        contentSettings: {
-            contentType: mime.lookup(file),
-            cacheControl: 'max-age=31536000, public'
-        }
-    };
-    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
-}
-async function publish(commit, files) {
-    console.log('Publishing...');
-    console.log('Commit:', commit);
-    const storageAccount = process.env['AZURE_WEBVIEW_STORAGE_ACCOUNT'];
-    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_WEBVIEW_STORAGE_ACCESS_KEY'])
-        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
-    await assertContainer(blobService, commit);
-    for (const file of files) {
-        const blobName = path_1.basename(file);
-        const blobExists = await doesBlobExist(blobService, commit, blobName);
-        if (blobExists) {
-            console.log(`Blob ${commit}, ${blobName} already exists, not publishing again.`);
-            continue;
-        }
-        console.log('Uploading blob to Azure storage...');
-        await uploadBlob(blobService, commit, blobName, file);
-    }
-    console.log('Blobs successfully uploaded.');
-}
-function main() {
-    const commit = process.env['BUILD_SOURCEVERSION'];
-    if (!commit) {
-        console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
-        return;
-    }
-    const opts = minimist(process.argv.slice(2));
-    const [directory] = opts._;
-    const files = fileNames.map(fileName => path_1.join(directory, fileName));
-    publish(commit, files).catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-if (process.argv.length < 3) {
-    console.error('Usage: node publish.js <directory>');
-    process.exit(-1);
-}
-main();

build/azure-pipelines/common/publish-webview.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -e
-REPO="$(pwd)"
-
-# Publish webview contents
-PACKAGEJSON="$REPO/package.json"
-VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-
-node build/azure-pipelines/common/publish-webview.js "$REPO/src/vs/workbench/contrib/webview/browser/pre/"

build/azure-pipelines/common/publish-webview.ts

@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as azure from 'azure-storage';
-import * as mime from 'mime';
-import * as minimist from 'minimist';
-import { basename, join } from 'path';
-
-const fileNames = [
-	'fake.html',
-	'host.js',
-	'index.html',
-	'main.js',
-	'service-worker.js'
-];
-
-async function assertContainer(blobService: azure.BlobService, container: string): Promise<void> {
-	await new Promise<void>((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
-}
-
-async function doesBlobExist(blobService: azure.BlobService, container: string, blobName: string): Promise<boolean | undefined> {
-	const existsResult = await new Promise<azure.BlobService.BlobResult>((c, e) => blobService.doesBlobExist(container, blobName, (err, r) => err ? e(err) : c(r)));
-	return existsResult.exists;
-}
-
-async function uploadBlob(blobService: azure.BlobService, container: string, blobName: string, file: string): Promise<void> {
-	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
-		contentSettings: {
-			contentType: mime.lookup(file),
-			cacheControl: 'max-age=31536000, public'
-		}
-	};
-
-	await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
-}
-
-async function publish(commit: string, files: readonly string[]): Promise<void> {
-
-	console.log('Publishing...');
-	console.log('Commit:', commit);
-	const storageAccount = process.env['AZURE_WEBVIEW_STORAGE_ACCOUNT']!;
-
-	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_WEBVIEW_STORAGE_ACCESS_KEY']!)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
-
-	await assertContainer(blobService, commit);
-
-	for (const file of files) {
-		const blobName = basename(file);
-		const blobExists = await doesBlobExist(blobService, commit, blobName);
-		if (blobExists) {
-			console.log(`Blob ${commit}, ${blobName} already exists, not publishing again.`);
-			continue;
-		}
-		console.log('Uploading blob to Azure storage...');
-		await uploadBlob(blobService, commit, blobName, file);
-	}
-
-	console.log('Blobs successfully uploaded.');
-}
-
-function main(): void {
-	const commit = process.env['BUILD_SOURCEVERSION'];
-
-	if (!commit) {
-		console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
-		return;
-	}
-
-	const opts = minimist(process.argv.slice(2));
-	const [directory] = opts._;
-
-	const files = fileNames.map(fileName => join(directory, fileName));
-
-	publish(commit, files).catch(err => {
-		console.error(err);
-		process.exit(1);
-	});
-}
-
-if (process.argv.length < 3) {
-	console.error('Usage: node publish.js <directory>');
-	process.exit(-1);
-}
-main();

build/azure-pipelines/common/releaseBuild.js

@@ -39,7 +39,7 @@ async function main() {
     }
     console.log(`Releasing build ${commit}...`);
     const scripts = client.database('builds').container(quality).scripts;
-    await retry_1.retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+    await (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
 main().then(() => {
     console.log('Build successfully released');

build/azure-pipelines/common/sign-win32.js

@@ -0,0 +1,17 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const sign_1 = require("./sign");
+const path = require("path");
+(0, sign_1.main)([
+    process.env['EsrpCliDllPath'],
+    'windows',
+    process.env['ESRPPKI'],
+    process.env['ESRPAADUsername'],
+    process.env['ESRPAADPassword'],
+    path.dirname(process.argv[2]),
+    path.basename(process.argv[2])
+]);

build/azure-pipelines/common/sign-win32.ts

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { main } from './sign';
+import * as path from 'path';
+
+main([
+	process.env['EsrpCliDllPath']!,
+	'windows',
+	process.env['ESRPPKI']!,
+	process.env['ESRPAADUsername']!,
+	process.env['ESRPAADPassword']!,
+	path.dirname(process.argv[2]),
+	path.basename(process.argv[2])
+]);

build/azure-pipelines/common/sign.js

@@ -0,0 +1,77 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = void 0;
+const cp = require("child_process");
+const fs = require("fs");
+const tmp = require("tmp");
+const crypto = require("crypto");
+function getParams(type) {
+    switch (type) {
+        case 'windows':
+            return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]';
+        case 'rpm':
+            return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]';
+        case 'darwin-sign':
+            return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]';
+        case 'darwin-notarize':
+            return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[{"parameterName":"BundleId","parameterValue":"$(BundleIdentifier)"}],"toolName":"sign","toolVersion":"1.0"}]';
+        default:
+            throw new Error(`Sign type ${type} not found`);
+    }
+}
+function main([esrpCliPath, type, cert, username, password, folderPath, pattern]) {
+    tmp.setGracefulCleanup();
+    const patternPath = tmp.tmpNameSync();
+    fs.writeFileSync(patternPath, pattern);
+    const paramsPath = tmp.tmpNameSync();
+    fs.writeFileSync(paramsPath, getParams(type));
+    const keyFile = tmp.tmpNameSync();
+    const key = crypto.randomBytes(32);
+    const iv = crypto.randomBytes(16);
+    fs.writeFileSync(keyFile, JSON.stringify({ key: key.toString('hex'), iv: iv.toString('hex') }));
+    const clientkeyPath = tmp.tmpNameSync();
+    const clientkeyCypher = crypto.createCipheriv('aes-256-cbc', key, iv);
+    let clientkey = clientkeyCypher.update(password, 'utf8', 'hex');
+    clientkey += clientkeyCypher.final('hex');
+    fs.writeFileSync(clientkeyPath, clientkey);
+    const clientcertPath = tmp.tmpNameSync();
+    const clientcertCypher = crypto.createCipheriv('aes-256-cbc', key, iv);
+    let clientcert = clientcertCypher.update(cert, 'utf8', 'hex');
+    clientcert += clientcertCypher.final('hex');
+    fs.writeFileSync(clientcertPath, clientcert);
+    const args = [
+        esrpCliPath,
+        'vsts.sign',
+        '-a', username,
+        '-k', clientkeyPath,
+        '-z', clientcertPath,
+        '-f', folderPath,
+        '-p', patternPath,
+        '-u', 'false',
+        '-x', 'regularSigning',
+        '-b', 'input.json',
+        '-l', 'AzSecPack_PublisherPolicyProd.xml',
+        '-y', 'inlineSignParams',
+        '-j', paramsPath,
+        '-c', '9997',
+        '-t', '120',
+        '-g', '10',
+        '-v', 'Tls12',
+        '-s', 'https://api.esrp.microsoft.com/api/v1',
+        '-m', '0',
+        '-o', 'Microsoft',
+        '-i', 'https://www.microsoft.com',
+        '-n', '5',
+        '-r', 'true',
+        '-e', keyFile,
+    ];
+    cp.spawnSync('dotnet', args, { stdio: 'inherit' });
+}
+exports.main = main;
+if (require.main === module) {
+    main(process.argv.slice(2));
+}

build/azure-pipelines/common/sign.ts

@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import * as tmp from 'tmp';
+import * as crypto from 'crypto';
+
+function getParams(type: string): string {
+	switch (type) {
+		case 'windows':
+			return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]';
+		case 'rpm':
+			return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]';
+		case 'darwin-sign':
+			return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]';
+		case 'darwin-notarize':
+			return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[{"parameterName":"BundleId","parameterValue":"$(BundleIdentifier)"}],"toolName":"sign","toolVersion":"1.0"}]';
+		default:
+			throw new Error(`Sign type ${type} not found`);
+	}
+}
+
+export function main([esrpCliPath, type, cert, username, password, folderPath, pattern]: string[]) {
+	tmp.setGracefulCleanup();
+
+	const patternPath = tmp.tmpNameSync();
+	fs.writeFileSync(patternPath, pattern);
+
+	const paramsPath = tmp.tmpNameSync();
+	fs.writeFileSync(paramsPath, getParams(type));
+
+	const keyFile = tmp.tmpNameSync();
+	const key = crypto.randomBytes(32);
+	const iv = crypto.randomBytes(16);
+	fs.writeFileSync(keyFile, JSON.stringify({ key: key.toString('hex'), iv: iv.toString('hex') }));
+
+	const clientkeyPath = tmp.tmpNameSync();
+	const clientkeyCypher = crypto.createCipheriv('aes-256-cbc', key, iv);
+	let clientkey = clientkeyCypher.update(password, 'utf8', 'hex');
+	clientkey += clientkeyCypher.final('hex');
+	fs.writeFileSync(clientkeyPath, clientkey);
+
+	const clientcertPath = tmp.tmpNameSync();
+	const clientcertCypher = crypto.createCipheriv('aes-256-cbc', key, iv);
+	let clientcert = clientcertCypher.update(cert, 'utf8', 'hex');
+	clientcert += clientcertCypher.final('hex');
+	fs.writeFileSync(clientcertPath, clientcert);
+
+	const args = [
+		esrpCliPath,
+		'vsts.sign',
+		'-a', username,
+		'-k', clientkeyPath,
+		'-z', clientcertPath,
+		'-f', folderPath,
+		'-p', patternPath,
+		'-u', 'false',
+		'-x', 'regularSigning',
+		'-b', 'input.json',
+		'-l', 'AzSecPack_PublisherPolicyProd.xml',
+		'-y', 'inlineSignParams',
+		'-j', paramsPath,
+		'-c', '9997',
+		'-t', '120',
+		'-g', '10',
+		'-v', 'Tls12',
+		'-s', 'https://api.esrp.microsoft.com/api/v1',
+		'-m', '0',
+		'-o', 'Microsoft',
+		'-i', 'https://www.microsoft.com',
+		'-n', '5',
+		'-r', 'true',
+		'-e', keyFile,
+	];
+
+	cp.spawnSync('dotnet', args, { stdio: 'inherit' });
+}
+
+if (require.main === module) {
+	main(process.argv.slice(2));
+}