Build VSCode using TS 2.4.1

Fixes microsoft#28643 a
mjbvz · Jul 12, 2017 · 0d7701c · 0d7701c
1 parent 0373d29
commit 0d7701c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/build/monaco/package.json b/build/monaco/package.json
@@ -48,7 +48,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.3.2",
+    "typescript": "2.4.1",
     "typescript-formatter": "4.0.1",
     "underscore": "^1.8.2",
     "vinyl": "^0.4.5",

diff --git a/build/package.json b/build/package.json
@@ -13,7 +13,7 @@
     "documentdb": "^1.11.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.3.4",
+    "typescript": "2.4.1",
     "xml2js": "^0.4.17"
   },
   "scripts": {

diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts
@@ -131,9 +131,11 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 }
 
 async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
-	const blobOptions = {
-		contentType: mime.lookup(file),
-		cacheControl: 'max-age=31536000, public'
+	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
+		contentSettings: {
+			contentType: mime.lookup(file),
+			cacheControl: 'max-age=31536000, public'
+		}
 	};
 
 	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));

diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.5.2",
     "gulp-sourcemaps": "^1.11.0",
-    "gulp-tsb": "^2.0.3",
+    "gulp-tsb": "^2.0.4",
     "gulp-tslint": "^7.0.1",
     "gulp-uglify": "^3.0.0",
     "gulp-util": "^3.0.6",
@@ -107,7 +107,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.3.3",
+    "typescript": "2.4.1",
     "typescript-formatter": "4.0.1",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",

diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -678,8 +678,8 @@ suite('TelemetryService', () => {
 				_serviceBrand: undefined,
 				getConfiguration() {
 					return {
-						enableTelemetry
-					};
+						enableTelemetry: enableTelemetry
+					} as any;
 				},
 				getConfigurationData(): any {
 					return null;

diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -253,7 +253,7 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 				if (checkDirty && this.textFileService.isDirty(operation.resource)) {
 					return this.wrapError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY, target);
 				}
-				return reference;
+				return TPromise.wrap(reference);
 			});
 	}