Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

build/azure-pipelines/common/extract-telemetry.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+cd $BUILD_STAGINGDIRECTORY
+git clone https://github.com/microsoft/vscode-telemetry-extractor.git
+cd vscode-telemetry-extractor
+git checkout 4e64f3de30f8fccb58ebdc0d85c4861a135d46cf
+npm i
+npm run compile
+cd src
+mkdir telemetry-sources
+cd telemetry-sources
+git clone --depth 1 https://github.com/Microsoft/vscode-extension-telemetry.git
+git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug-core.git
+git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug.git
+git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
+git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
+git clone --depth 1 https://github.com/Microsoft/vscode-docker.git
+git clone --depth 1 https://github.com/Microsoft/vscode-go.git
+git clone --depth 1 https://github.com/Microsoft/vscode-azure-account.git
+git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
+git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
+git clone --depth 1 https://github.com/Microsoft/vscode-mono-debug.git
+git clone --depth 1 https://github.com/Microsoft/TypeScript.git
+cd ../../
+node ./out/cli-extract.js --sourceDir $BUILD_SOURCESDIRECTORY --excludedDirPattern extensions  --outputDir . --applyEndpoints --includeIsMeasurement
+node ./out/cli-extract-extensions.js --sourceDir ./src/telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement
+mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
+mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
+mv declarations-extensions-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json

build/azure-pipelines/common/installDistro.ts

@@ -1,20 +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 cp from 'child_process';
-import * as path from 'path';
-
-function yarnInstall(packageName: string): void {
-	cp.execSync(`yarn add --no-lockfile ${packageName}`);
-	cp.execSync(`yarn add --no-lockfile ${packageName}`, { cwd: path.join( process.cwd(), 'remote') });
-}
-
-const product = require('../../../product.json');
-const dependencies = product.dependencies || {} as { [name: string]: string; };
-
-Object.keys(dependencies).forEach(name => {
-	const url = dependencies[name];
-	yarnInstall(url);
-});

build/azure-pipelines/common/publish.ts

@@ -152,13 +152,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	const queuedBy = process.env['BUILD_QUEUEDBY']!;
 	const sourceBranch = process.env['BUILD_SOURCEBRANCH']!;
-	const isReleased = (
-		// Insiders: nightly build from master
-		(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch) && /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)) ||
-
-		// Exploration: any build from electron-4.0.x branch
-		(quality === 'exploration' && /^electron-4.0.x$|^refs\/heads\/electron-4.0.x$/.test(sourceBranch))
-	);
 
 	console.log('Publishing...');
 	console.log('Quality:', quality);
@@ -168,7 +161,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Version:', version);
 	console.log('Commit:', commit);
 	console.log('Is Update:', isUpdate);
-	console.log('Is Released:', isReleased);
 	console.log('File:', file);
 
 	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
@@ -227,7 +219,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		id: commit,
 		timestamp: (new Date()).getTime(),
 		version,
-		isReleased: config.frozen ? false : isReleased,
+		isReleased: false,
 		sourceBranch,
 		queuedBy,
 		assets: [] as Array<Asset>,
@@ -246,11 +238,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 }
 
 function main(): void {
-	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
-		console.warn('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
-		return;
-	}
-
 	const commit = process.env['BUILD_SOURCEVERSION'];
 
 	if (!commit) {

build/azure-pipelines/common/release.ts

@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { DocumentClient } from 'documentdb';
+
+interface Config {
+	id: string;
+	frozen: boolean;
+}
+
+function createDefaultConfig(quality: string): Config {
+	return {
+		id: quality,
+		frozen: false
+	};
+}
+
+function getConfig(quality: string): Promise<Config> {
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const collection = 'dbs/builds/colls/config';
+	const query = {
+		query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
+		parameters: [
+			{ name: '@quality', value: quality }
+		]
+	};
+
+	return new Promise<Config>((c, e) => {
+		client.queryDocuments(collection, query).toArray((err, results) => {
+			if (err && err.code !== 409) { return e(err); }
+
+			c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0] as any as Config);
+		});
+	});
+}
+
+function doRelease(commit: string, quality: string): Promise<void> {
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const collection = 'dbs/builds/colls/' + quality;
+	const query = {
+		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
+		parameters: [{ name: '@id', value: commit }]
+	};
+
+	let updateTries = 0;
+
+	function update(): Promise<void> {
+		updateTries++;
+
+		return new Promise<void>((c, e) => {
+			client.queryDocuments(collection, query).toArray((err, results) => {
+				if (err) { return e(err); }
+				if (results.length !== 1) { return e(new Error('No documents')); }
+
+				const release = results[0];
+				release.isReleased = true;
+
+				client.replaceDocument(release._self, release, err => {
+					if (err && err.code === 409 && updateTries < 5) { return c(update()); }
+					if (err) { return e(err); }
+
+					console.log('Build successfully updated.');
+					c();
+				});
+			});
+		});
+	}
+
+	return update();
+}
+
+async function release(commit: string, quality: string): Promise<void> {
+	const config = await getConfig(quality);
+
+	console.log('Quality config:', config);
+
+	if (config.frozen) {
+		console.log(`Skipping release because quality ${quality} is frozen.`);
+		return;
+	}
+
+	await doRelease(commit, quality);
+}
+
+function env(name: string): string {
+	const result = process.env[name];
+
+	if (!result) {
+		throw new Error(`Skipping release due to missing env: ${name}`);
+	}
+
+	return result;
+}
+
+async function main(): Promise<void> {
+	const commit = env('BUILD_SOURCEVERSION');
+	const quality = env('VSCODE_QUALITY');
+
+	await release(commit, quality);
+}
+
+main().catch(err => {
+	console.error(err);
+	process.exit(1);
+});

build/azure-pipelines/common/symbols.ts

@@ -36,7 +36,6 @@ export interface IVersionAccessor extends IApplicationAccessor {
 enum Platform {
 	WIN_32 = 'win32-ia32',
 	WIN_64 = 'win32-x64',
-	LINUX_32 = 'linux-ia32',
 	LINUX_64 = 'linux-x64',
 	MAC_OS = 'darwin-x64'
 }
@@ -147,6 +146,10 @@ async function ensureVersionAndSymbols(options: IOptions) {
 	// Check version does not exist
 	console.log(`HockeyApp: checking for existing version ${options.versions.code} (${options.platform})`);
 	const versions = await getVersions({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId });
+	if (!Array.isArray(versions.app_versions)) {
+		throw new Error(`Unexpected response: ${JSON.stringify(versions)}`);
+	}
+
 	if (versions.app_versions.some(v => v.version === options.versions.code)) {
 		console.log(`HockeyApp: Returning without uploading symbols because version ${options.versions.code} (${options.platform}) was already found`);
 		return;
@@ -185,13 +188,17 @@ const hockeyAppToken = process.argv[3];
 const is64 = process.argv[4] === 'x64';
 const hockeyAppId = process.argv[5];
 
+if (process.argv.length !== 6) {
+	throw new Error(`HockeyApp: Unexpected number of arguments. Got ${process.argv}`);
+}
+
 let platform: Platform;
 if (process.platform === 'darwin') {
 	platform = Platform.MAC_OS;
 } else if (process.platform === 'win32') {
 	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
 } else {
-	platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
+	platform = Platform.LINUX_64;
 }
 
 // Create version and upload symbols in HockeyApp
@@ -212,7 +219,9 @@ if (repository && codeVersion && electronVersion && (product.quality === 'stable
 	}).then(() => {
 		console.log('HockeyApp: done');
 	}).catch(error => {
-		console.error(`HockeyApp: error (${error})`);
+		console.error(`HockeyApp: error ${error} (AppID: ${hockeyAppId})`);
+
+		return process.exit(1);
 	});
 } else {
 	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);

build/azure-pipelines/common/sync-mooncake.ts

@@ -153,11 +153,6 @@ async function sync(commit: string, quality: string): Promise<void> {
 }
 
 function main(): void {
-	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
-		error('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
-		return;
-	}
-
 	const commit = process.env['BUILD_SOURCEVERSION'];
 
 	if (!commit) {