Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575)

src/vs/workbench/services/extensions/common/abstractExtensionService.ts

@@ -263,6 +263,11 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 		return 0;
 	}
 
+	public async setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void> {
+		await this._extensionHostProcessManagers
+			.map(manager => manager.setRemoteEnvironment(env));
+	}
+
 	//#endregion
 
 	// --- impl

src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts

@@ -290,6 +290,15 @@ export class ExtensionHostProcessManager extends Disposable {
 		}
 		return proxy.$deltaExtensions(toAdd, toRemove);
 	}
+
+	public async setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void> {
+		const proxy = await this._getExtensionHostProcessProxy();
+		if (!proxy) {
+			return;
+		}
+
+		return proxy.$setRemoteEnvironment(env);
+	}
 }
 
 const colorTables = [

src/vs/workbench/services/extensions/common/extensions.ts

@@ -229,6 +229,12 @@ export interface IExtensionService {
 	 */
 	stopExtensionHost(): void;
 
+	/**
+	 * Modify the environment of the remote extension host
+	 * @param env New properties for the remote extension host
+	 */
+	setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void>;
+
 	_logOrShowMessage(severity: Severity, msg: string): void;
 	_activateById(extensionId: ExtensionIdentifier, activationEvent: string): Promise<void>;
 	_onWillActivateExtension(extensionId: ExtensionIdentifier): void;
@@ -278,6 +284,7 @@ export class NullExtensionService implements IExtensionService {
 	restartExtensionHost(): void { }
 	startExtensionHost(): void { }
 	stopExtensionHost(): void { }
+	async setRemoteEnvironment(_env: { [key: string]: string | null }): Promise<void> { }
 	canAddExtension(): boolean { return false; }
 	canRemoveExtension(): boolean { return false; }
 	_logOrShowMessage(_severity: Severity, _msg: string): void { }

src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts

@@ -71,7 +71,6 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
 
 	public start(): Promise<IMessagePassingProtocol> {
 		const options: IConnectionOptions = {
-			isBuilt: this._environmentService.isBuilt,
 			commit: this._productService.commit,
 			socketFactory: this._socketFactory,
 			addressProvider: {