Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

src/vs/platform/update/common/update.config.contribution.ts

@@ -6,7 +6,7 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { localize } from 'vs/nls';
-import { isWindows } from 'vs/base/common/platform';
+import { isWindows, isWeb } from 'vs/base/common/platform';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
@@ -42,7 +42,7 @@ configurationRegistry.registerConfiguration({
 			scope: ConfigurationScope.APPLICATION,
 			title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates on Windows"),
 			description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code Versions in the background on Windows"),
-			included: isWindows
+			included: isWindows && !isWeb
 		},
 		'update.showReleaseNotes': {
 			type: 'boolean',

src/vs/platform/update/common/update.ts

@@ -9,8 +9,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 export interface IUpdate {
 	version: string;
 	productVersion: string;
-	date?: Date;
-	releaseNotes?: string;
 	supportsFastUpdate?: boolean;
 	url?: string;
 	hash?: string;
@@ -83,7 +81,7 @@ export interface IAutoUpdater extends Event.NodeEventEmitter {
 export const IUpdateService = createDecorator<IUpdateService>('updateService');
 
 export interface IUpdateService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly onStateChange: Event<State>;
 	readonly state: State;

src/vs/platform/update/electron-browser/updateService.ts

@@ -7,11 +7,10 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IUpdateService, State } from 'vs/platform/update/common/update';
 import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
-import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export class UpdateService implements IUpdateService {
 
-	_serviceBrand!: ServiceIdentifier<any>;
+	_serviceBrand: undefined;
 
 	private _onStateChange = new Emitter<State>();
 	readonly onStateChange: Event<State> = this._onStateChange.event;

src/vs/platform/update/electron-main/abstractUpdateService.ts

@@ -24,7 +24,7 @@ export type UpdateNotAvailableClassification = {
 
 export abstract class AbstractUpdateService implements IUpdateService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	protected readonly url: string | undefined;
 

src/vs/platform/update/electron-main/updateService.darwin.ts

@@ -18,7 +18,7 @@ import { IRequestService } from 'vs/platform/request/common/request';
 
 export class DarwinUpdateService extends AbstractUpdateService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private disposables: IDisposable[] = [];
 

src/vs/platform/update/electron-main/updateService.linux.ts

@@ -17,7 +17,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class LinuxUpdateService extends AbstractUpdateService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		@ILifecycleService lifecycleService: ILifecycleService,

src/vs/platform/update/electron-main/updateService.snap.ts

@@ -17,7 +17,7 @@ import { UpdateNotAvailableClassification } from 'vs/platform/update/electron-ma
 
 abstract class AbstractUpdateService2 implements IUpdateService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _state: State = State.Uninitialized;
 
@@ -134,7 +134,7 @@ abstract class AbstractUpdateService2 implements IUpdateService {
 
 export class SnapUpdateService extends AbstractUpdateService2 {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		private snap: string,

src/vs/platform/update/electron-main/updateService.win32.ts

@@ -49,7 +49,7 @@ function getUpdateType(): UpdateType {
 
 export class Win32UpdateService extends AbstractUpdateService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private availableUpdate: IAvailableUpdate | undefined;