ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 10:38:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix/use sqlops engine version (#1011)

Browse Source 
* using sqlops as engine version instead of vscode
This commit is contained in:
Leila Lali
2018-03-28 11:30:44 -07:00
committed by GitHub
parent 2414f43757
commit b2a96bbe50
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/platform/extensions/node/extensionValidator.ts
View File

@@ -208,6 +208,8 @@ export interface IReducedExtensionDescription {
isBuiltin: boolean;
engines: {
vscode: string;
// {{SQL CARBON EDIT}}
sqlops?: string;
};
main?: string;
}
@@ -219,7 +221,8 @@ export function isValidExtensionVersion(version: string, extensionDesc: IReduced
return true;
}
return isVersionValid(version, extensionDesc.engines.vscode, notices);
// {{SQL CARBON EDIT}}
return (extensionDesc.engines.sqlops && extensionDesc.engines.sqlops === '*') || isVersionValid(version, extensionDesc.engines.sqlops, notices);
}
export function isVersionValid(currentVersion: string, requestedVersion: string, notices: string[] = []): boolean {
@@ -289,8 +292,8 @@ function baseIsValidExtensionDescription(extensionFolderPath: string, extensionD
notices.push(nls.localize('extensionDescription.engines', "property `{0}` is mandatory and must be of type `object`", 'engines'));
return false;
}
if (typeof extensionDescription.engines.vscode !== 'string') {
notices.push(nls.localize('extensionDescription.engines.vscode', "property `{0}` is mandatory and must be of type `string`", 'engines.vscode'));
if (typeof extensionDescription.engines.sqlops !== 'string') {
notices.push(nls.localize('extensionDescription.engines.sqlops', "property `{0}` is mandatory and must be of type `string`", 'engines.sqlops'));
return false;
}
if (typeof extensionDescription.extensionDependencies !== 'undefined') {