minimize distro deltas

build/gulpfile.vscode.js

@@ -538,7 +538,7 @@ gulp.task('vscode-translations-import', function () {
 // Sourcemaps
 
 gulp.task('upload-vscode-sourcemaps', () => {
-	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' })
+	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' }) // client source-maps only
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
 			return f;

extensions/configuration-editing/schemas/devContainer.schema.json

@@ -5,6 +5,7 @@
 	"type": "object",
 	"definitions": {
 		"devContainerCommon": {
+			"type": "object",
 			"properties": {
 				"name": {
 					"type": "string",
@@ -18,11 +19,14 @@
 					}
 				},
 				"settings": {
-					"type": "object",
+					"$ref": "vscode://schemas/settings/machine",
 					"description": "Machine specific settings that should be copied into the container."
 				},
 				"postCreateCommand": {
-					"type": ["string", "array"],
+					"type": [
+						"string",
+						"array"
+					],
 					"description": "A command to run after creating the container. If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
 					"items": {
 						"type": "string"
@@ -35,12 +39,20 @@
 			}
 		},
 		"nonComposeBase": {
+			"type": "object",
 			"properties": {
 				"appPort": {
-					"type": ["integer", "string", "array"],
+					"type": [
+						"integer",
+						"string",
+						"array"
+					],
 					"description": "Application ports that are exposed by the container. This can be a single port or an array of ports. Each port can be a number or a string. A number is mapped to the same port on the host. A string is passed to Docker unchanged and can be used to map ports differently, e.g. \"8000:8010\".",
 					"items": {
-						"type": ["integer", "string"]
+						"type": [
+							"integer",
+							"string"
+						]
 					}
 				},
 				"runArgs": {
@@ -52,7 +64,10 @@
 				},
 				"shutdownAction": {
 					"type": "string",
-					"enum": ["none", "stopContainer"],
+					"enum": [
+						"none",
+						"stopContainer"
+					],
 					"description": "Action to take when VS Code is shutting down. The default is to stop the container."
 				},
 				"overrideCommand": {
@@ -70,6 +85,7 @@
 			}
 		},
 		"dockerFileContainer": {
+			"type": "object",
 			"properties": {
 				"dockerFile": {
 					"type": "string",
@@ -80,21 +96,30 @@
 					"description": "The location of the context folder for building the Docker image. The path is relative to the folder containing the `devcontainer.json` file."
 				}
 			},
-			"required": ["dockerFile"]
+			"required": [
+				"dockerFile"
+			]
 		},
 		"imageContainer": {
+			"type": "object",
 			"properties": {
 				"image": {
 					"type": "string",
 					"description": "The docker image that will be used to create the container."
 				}
 			},
-			"required": ["image"]
+			"required": [
+				"image"
+			]
 		},
 		"composeContainer": {
+			"type": "object",
 			"properties": {
 				"dockerComposeFile": {
-					"type": ["string", "array"],
+					"type": [
+						"string",
+						"array"
+					],
 					"description": "The name of the docker-compose file(s) used to start the services.",
 					"items": {
 						"type": "string"
@@ -110,11 +135,18 @@
 				},
 				"shutdownAction": {
 					"type": "string",
-					"enum": ["none", "stopCompose"],
+					"enum": [
+						"none",
+						"stopCompose"
+					],
 					"description": "Action to take when VS Code is shutting down. The default is to stop the containers."
 				}
 			},
-			"required": ["dockerComposeFile", "service", "workspaceFolder"]
+			"required": [
+				"dockerComposeFile",
+				"service",
+				"workspaceFolder"
+			]
 		}
 	},
 	"allOf": [

extensions/vscode-test-resolver/src/extension.ts

@@ -105,8 +105,8 @@ export function activate(context: vscode.ExtensionContext) {
 			}
 			extHostProcess.stdout.on('data', (data: Buffer) => processOutput(data.toString()));
 			extHostProcess.stderr.on('data', (data: Buffer) => processOutput(data.toString()));
-			extHostProcess.on('error', (error: Error) => processError(`remoteExtensionHostAgent failed with error:\n${error.message}`));
+			extHostProcess.on('error', (error: Error) => processError(`server failed with error:\n${error.message}`));
-			extHostProcess.on('close', (code: number) => processError(`remoteExtensionHostAgent closed unexpectedly.\nError code: ${code}`));
+			extHostProcess.on('close', (code: number) => processError(`server closed unexpectedly.\nError code: ${code}`));
 		});
 	}
 

tslint.json

@@ -547,14 +547,14 @@
 				]
 			},
 			{
-				"target": "**/vs/agent/**",
+				"target": "**/vs/server/**",
 				"restrictions": [
 					"vs/nls",
 					"**/vs/base/**/{common,node}/**",
 					"**/vs/base/parts/**/{common,node}/**",
 					"**/vs/platform/**/{common,node}/**",
 					"**/vs/workbench/**/{common,node}/**",
-					"**/vs/agent/**",
+					"**/vs/server/**",
 					"**/vs/code/**/{common,node}/**",
 					"*" // node modules
 				]