From 6cd2d6c942ff322c4d92077403347292815c6f68 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 17 Nov 2020 09:58:50 -0800 Subject: [PATCH] Fix extension install version check (#13436) --- .../extensionManagement/node/extensionManagementService.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index a895517c6f..4378de2cd6 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -161,8 +161,11 @@ export class ExtensionManagementService extends Disposable implements IExtension const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) }; // let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }} // {{ SQL CARBON EDIT }} - if (manifest.engines && ((manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) || (manifest.engines.azdata && !isEngineValid(manifest.engines.azdata, product.version)))) { - throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", identifier.id, product.version)); + if (manifest.engines?.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) { + throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with the current VS Code engine version '{1}'.", identifier.id, product.vscodeVersion)); + } + if (manifest.engines?.azdata && !isEngineValid(manifest.engines.azdata, product.version)) { + throw new Error(nls.localize('incompatibleAzdata', "Unable to install extension '{0}' as it is not compatible with Azure Data Studio '{1}'.", identifier.id, product.version)); } const identifierWithVersion = new ExtensionIdentifierWithVersion(identifier, manifest.version);