mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-20 03:51:40 -04:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
17
src/vs/platform/product/common/product.ts
Normal file
17
src/vs/platform/product/common/product.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
|
||||
|
||||
export const IProductService = createDecorator<IProductService>('productService');
|
||||
|
||||
export interface IProductService {
|
||||
_serviceBrand: any;
|
||||
|
||||
version?: string;
|
||||
commit?: string;
|
||||
|
||||
enableTelemetry: boolean;
|
||||
}
|
||||
16
src/vs/platform/product/node/package.ts
Normal file
16
src/vs/platform/product/node/package.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as path from 'vs/base/common/path';
|
||||
import { getPathFromAmdModule } from 'vs/base/common/amd';
|
||||
|
||||
export interface IPackageConfiguration {
|
||||
name: string;
|
||||
version: string;
|
||||
}
|
||||
|
||||
const rootPath = path.dirname(getPathFromAmdModule(require, ''));
|
||||
const packageJsonPath = path.join(rootPath, 'package.json');
|
||||
export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
|
||||
110
src/vs/platform/product/node/product.ts
Normal file
110
src/vs/platform/product/node/product.ts
Normal file
@@ -0,0 +1,110 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as path from 'vs/base/common/path';
|
||||
import { getPathFromAmdModule } from 'vs/base/common/amd';
|
||||
|
||||
export interface IProductConfiguration {
|
||||
nameShort: string;
|
||||
nameLong: string;
|
||||
applicationName: string;
|
||||
win32AppId: string;
|
||||
win32x64AppId: string;
|
||||
win32UserAppId: string;
|
||||
win32x64UserAppId: string;
|
||||
win32AppUserModelId: string;
|
||||
win32MutexName: string;
|
||||
darwinBundleIdentifier: string;
|
||||
urlProtocol: string;
|
||||
dataFolderName: string;
|
||||
downloadUrl: string;
|
||||
updateUrl?: string;
|
||||
quality?: string;
|
||||
target?: string;
|
||||
commit?: string;
|
||||
settingsSearchBuildId?: number;
|
||||
settingsSearchUrl?: string;
|
||||
experimentsUrl?: string;
|
||||
date: string;
|
||||
extensionsGallery: {
|
||||
serviceUrl: string;
|
||||
itemUrl: string;
|
||||
controlUrl: string;
|
||||
recommendationsUrl: string;
|
||||
};
|
||||
extensionTips: { [id: string]: string; };
|
||||
// {{SQL CARBON EDIT}}
|
||||
recommendedExtensions: string[];
|
||||
extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };
|
||||
exeBasedExtensionTips: { [id: string]: { friendlyName: string, windowsPath?: string, recommendations: string[] }; };
|
||||
extensionKeywords: { [extension: string]: string[]; };
|
||||
extensionAllowedBadgeProviders: string[];
|
||||
extensionAllowedProposedApi: string[];
|
||||
keymapExtensionTips: string[];
|
||||
crashReporter: {
|
||||
companyName: string;
|
||||
productName: string;
|
||||
};
|
||||
welcomePage: string;
|
||||
enableTelemetry: boolean;
|
||||
aiConfig: {
|
||||
asimovKey: string;
|
||||
};
|
||||
sendASmile: {
|
||||
reportIssueUrl: string,
|
||||
requestFeatureUrl: string
|
||||
};
|
||||
documentationUrl: string;
|
||||
releaseNotesUrl: string;
|
||||
// {SQL CARBON EDIT}
|
||||
gettingStartedUrl: string;
|
||||
// {SQL CARBON EDIT}
|
||||
vscodeVersion: string;
|
||||
keyboardShortcutsUrlMac: string;
|
||||
keyboardShortcutsUrlLinux: string;
|
||||
keyboardShortcutsUrlWin: string;
|
||||
introductoryVideosUrl: string;
|
||||
tipsAndTricksUrl: string;
|
||||
twitterUrl: string;
|
||||
requestFeatureUrl: string;
|
||||
reportIssueUrl: string;
|
||||
licenseUrl: string;
|
||||
privacyStatementUrl: string;
|
||||
telemetryOptOutUrl: string;
|
||||
npsSurveyUrl: string;
|
||||
surveys: ISurveyData[];
|
||||
checksums: { [path: string]: string; };
|
||||
checksumFailMoreInfoUrl: string;
|
||||
hockeyApp: {
|
||||
'win32-ia32': string;
|
||||
'win32-x64': string;
|
||||
'linux-ia32': string;
|
||||
'linux-x64': string;
|
||||
'darwin': string;
|
||||
};
|
||||
logUploaderUrl: string;
|
||||
portable?: string;
|
||||
uiExtensions?: string[];
|
||||
}
|
||||
|
||||
export interface ISurveyData {
|
||||
surveyId: string;
|
||||
surveyUrl: string;
|
||||
languageId: string;
|
||||
editCount: number;
|
||||
userProbability: number;
|
||||
}
|
||||
|
||||
const rootPath = path.dirname(getPathFromAmdModule(require, ''));
|
||||
const productJsonPath = path.join(rootPath, 'product.json');
|
||||
const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
|
||||
|
||||
if (process.env['VSCODE_DEV']) {
|
||||
product.nameShort += ' Dev';
|
||||
product.nameLong += ' Dev';
|
||||
product.dataFolderName += '-dev';
|
||||
}
|
||||
|
||||
export default product;
|
||||
19
src/vs/platform/product/node/productService.ts
Normal file
19
src/vs/platform/product/node/productService.ts
Normal file
@@ -0,0 +1,19 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { IProductService } from 'vs/platform/product/common/product';
|
||||
import product from 'vs/platform/product/node/product';
|
||||
import pkg from 'vs/platform/product/node/package';
|
||||
|
||||
export class ProductService implements IProductService {
|
||||
|
||||
_serviceBrand: any;
|
||||
|
||||
get version(): string | undefined { return pkg.version; }
|
||||
|
||||
get commit(): string | undefined { return product.commit; }
|
||||
|
||||
get enableTelemetry(): boolean { return product.enableTelemetry; }
|
||||
}
|
||||
Reference in New Issue
Block a user