Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue

src/vs/platform/product/common/product.ts

@@ -10,8 +10,13 @@ export const IProductService = createDecorator<IProductService>('productService'
 export interface IProductService {
 	_serviceBrand: any;
 
-	version?: string;
+	version: string;
 	commit?: string;
 
+	nameLong: string;
+	urlProtocol: string;
+	extensionAllowedProposedApi: string[];
+	uiExtensions?: string[];
+
 	enableTelemetry: boolean;
 }

src/vs/platform/product/node/product.ts

@@ -81,7 +81,6 @@ export interface IProductConfiguration {
 	hockeyApp: {
 		'win32-ia32': string;
 		'win32-x64': string;
-		'linux-ia32': string;
 		'linux-x64': string;
 		'darwin': string;
 	};

src/vs/platform/product/node/productService.ts

@@ -11,9 +11,17 @@ export class ProductService implements IProductService {
 
 	_serviceBrand: any;
 
-	get version(): string | undefined { return pkg.version; }
+	get version(): string { return pkg.version; }
 
 	get commit(): string | undefined { return product.commit; }
 
+	get nameLong(): string { return product.nameLong; }
+
+	get urlProtocol(): string { return product.urlProtocol; }
+
+	get extensionAllowedProposedApi(): string[] { return product.extensionAllowedProposedApi; }
+
+	get uiExtensions(): string[] | undefined { return product.uiExtensions; }
+
 	get enableTelemetry(): boolean { return product.enableTelemetry; }
 }