remove some more small differences (microsoft#6791)

gulpfile.js

@@ -13,7 +13,7 @@ const util = require('./build/lib/util');
 const task = require('./build/lib/task');
 const path = require('path');
 const compilation = require('./build/lib/compilation');
-/*const { monacoTypecheckTask , monacoTypecheckWatchTask } = require('./build/gulpfile.editor');*/
+const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./build/gulpfile.editor');
 const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions');
 
 // Fast compile for development time
@@ -24,7 +24,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
 gulp.task(watchClientTask);
 
 // All
-const compileTask = task.define('compile', task.parallel(/*monacoTypecheckTask, */compileClientTask, compileExtensionsTask));
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
 gulp.task(compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));

src/vs/platform/telemetry/node/commonProperties.ts

@@ -17,13 +17,11 @@ export async function resolveCommonProperties(commit: string | undefined, versio
 
 	// {{SQL CARBON EDIT}}
 	// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
-	// result['common.machineId'] = machineId;
 	result['common.machineId'] = '';
-	// // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	// result['sessionID'] = uuid.generateUuid() + Date.now();
+	// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['sessionID'] = '';
 
-	// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 	result['commitHash'] = '';
 	// __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['version'] = version;

src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts

@@ -262,7 +262,7 @@ export class SettingsEditor2 extends BaseEditor {
 	}
 
 	private _setOptions(options: SettingsEditorOptions): void {
-		// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref
+		// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref @todo anthonydresser 8/17/19 investigate
 		if (!options) {
 			return;
 		}