ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-13 17:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fail installing extensions not compatible with the engine (#990)

Browse Source
This commit is contained in:
Leila Lali
2018-03-26 14:00:30 -07:00
committed by Karl Burtram
parent 2f8f6064a1
commit 0de5d7a96a
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View File

@@ -154,7 +154,7 @@ export class ExtensionManagementService implements IExtensionManagementService {
.then(validated => {
if (validated) {
this._onInstallExtension.fire({ identifier, zipPath });
// {{SQL CARBON EDIT}}
// Until there's a gallery for SQL Ops Studio, skip retrieving the metadata from the gallery
return this.installExtension({ zipPath, id: identifier.id, metadata: null })
@@ -239,7 +239,8 @@ export class ExtensionManagementService implements IExtensionManagementService {
return this.galleryService.loadCompatibleVersion(extension)
.then(compatible => {
if (!compatible) {
return TPromise.wrapError<IGalleryExtension[]>(new InstallationError(nls.localize('notFoundCompatible', "Unable to install because, the extension '{0}' compatible with current version '{1}' of VS Code is not found.", extension.identifier.id, pkg.version), INSTALL_ERROR_INCOMPATIBLE));
// {{SQL CARBON EDIT}}
return TPromise.wrapError<IGalleryExtension[]>(new InstallationError(nls.localize('notFoundCompatible', "Unable to install because, the extension '{0}' compatible with current version '{1}' of SQL Operations Studio is not found.", extension.identifier.id, pkg.version), INSTALL_ERROR_INCOMPATIBLE));
}
return this.getDependenciesToInstall(compatible.properties.dependencies)
.then(

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

@@ -247,16 +247,11 @@ export function isVersionValid(currentVersion: string, requestedVersion: string,
}
}
// {{SQL CARBON EDIT}}
//TODO: Currently the validation happens with the vscode engine version.
// We will have to have sqlops engine version in package.json instead and compare
// with that
//if (!isValidVersion(currentVersion, desiredVersion)) {
// notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion));
// return false;
//}
if (!isValidVersion(currentVersion, desiredVersion)) {
notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion));
return false;
}
return true;
}