Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

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

@@ -10,8 +10,121 @@ export const IProductService = createDecorator<IProductService>('productService'
 export interface IProductService {
 	_serviceBrand: any;
 
-	version?: string;
-	commit?: string;
+	readonly version: string;
+	readonly vscodeVersion: string; // {{SQL CARBON EDIT}} add vscode version
+	readonly commit?: string;
 
-	enableTelemetry: boolean;
+	readonly nameLong: string;
+	readonly urlProtocol: string;
+	readonly extensionAllowedProposedApi: readonly string[];
+	readonly uiExtensions?: readonly string[];
+
+	readonly enableTelemetry: boolean;
+	readonly extensionsGallery?: {
+		readonly serviceUrl: string;
+		readonly itemUrl: string;
+		readonly controlUrl: string;
+		readonly recommendationsUrl: string;
+	};
+
+	readonly sendASmile?: {
+		readonly reportIssueUrl: string;
+		readonly requestFeatureUrl: string;
+	};
+
+	readonly settingsSearchBuildId?: number;
+	readonly settingsSearchUrl?: string;
+
+	readonly experimentsUrl?: string;
+	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
+	readonly extensionAllowedBadgeProviders?: readonly string[];
+}
+
+export interface IProductConfiguration {
+	nameShort: string;
+	nameLong: string;
+	readonly applicationName: string;
+	readonly win32AppId: string;
+	readonly win32x64AppId: string;
+	readonly win32UserAppId: string;
+	readonly win32x64UserAppId: string;
+	readonly win32AppUserModelId: string;
+	readonly win32MutexName: string;
+	readonly darwinBundleIdentifier: string;
+	readonly urlProtocol: string;
+	dataFolderName: string;
+	readonly downloadUrl: string;
+	readonly updateUrl?: string;
+	readonly quality?: string;
+	readonly target?: string;
+	readonly commit?: string;
+	readonly settingsSearchBuildId?: number;
+	readonly settingsSearchUrl?: string;
+	readonly experimentsUrl?: string;
+	readonly date: string;
+	readonly extensionsGallery?: {
+		readonly serviceUrl: string;
+		readonly itemUrl: string;
+		readonly controlUrl: string;
+		readonly recommendationsUrl: string;
+	};
+	extensionTips: { [id: string]: string; };
+	// {{SQL CARBON EDIT}}
+	recommendedExtensions: string[];
+	extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };
+	readonly exeBasedExtensionTips: { [id: string]: { friendlyName: string, windowsPath?: string, recommendations: readonly string[] }; };
+	readonly extensionKeywords: { [extension: string]: readonly string[]; };
+	readonly extensionAllowedBadgeProviders: readonly string[];
+	readonly extensionAllowedProposedApi: readonly string[];
+	readonly keymapExtensionTips: readonly string[];
+	readonly crashReporter: {
+		readonly companyName: string;
+		readonly productName: string;
+	};
+	readonly welcomePage: string;
+	readonly enableTelemetry: boolean;
+	readonly aiConfig: {
+		readonly asimovKey: string;
+	};
+	readonly sendASmile: {
+		readonly reportIssueUrl: string,
+		readonly requestFeatureUrl: string
+	};
+	readonly documentationUrl: string;
+	readonly releaseNotesUrl: string;
+	readonly gettingStartedUrl: string; // {SQL CARBON EDIT}
+	readonly vscodeVersion: string; // {SQL CARBON EDIT}
+	readonly keyboardShortcutsUrlMac: string;
+	readonly keyboardShortcutsUrlLinux: string;
+	readonly keyboardShortcutsUrlWin: string;
+	readonly introductoryVideosUrl: string;
+	readonly tipsAndTricksUrl: string;
+	readonly newsletterSignupUrl: string;
+	readonly twitterUrl: string;
+	readonly requestFeatureUrl: string;
+	readonly reportIssueUrl: string;
+	readonly licenseUrl: string;
+	readonly privacyStatementUrl: string;
+	readonly telemetryOptOutUrl: string;
+	readonly npsSurveyUrl: string;
+	readonly surveys: readonly ISurveyData[];
+	readonly checksums: { [path: string]: string; };
+	readonly checksumFailMoreInfoUrl: string;
+	readonly hockeyApp: {
+		readonly 'win32-ia32': string;
+		readonly 'win32-x64': string;
+		readonly 'linux-x64': string;
+		readonly 'darwin': string;
+	};
+	readonly logUploaderUrl: string;
+	readonly portable?: string;
+	readonly uiExtensions?: readonly string[];
+}
+
+export interface ISurveyData {
+	surveyId: string;
+	surveyUrl: string;
+	languageId: string;
+	editCount: number;
+	userProbability: number;
 }