From bcbf08122ff2536b36a7a0befbc14f2c1831b992 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 23 Jun 2020 09:31:51 -0700 Subject: [PATCH] Fix extension gallery query to use correct version (#11040) * Fix extension gallery query to use correct version * Only require one engine of either type --- .../common/extensionGalleryService.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts index 5307763f42..9008f5c977 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts @@ -847,11 +847,16 @@ export class ExtensionGalleryService implements IExtensionGalleryService { private getLastValidExtensionVersionFromProperties(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise | null { for (const version of versions) { - const engine = getEngine(version); - if (!engine) { + // {{SQL CARBON EDIT}} + const vsCodeEngine = getEngine(version); + const azDataEngine = getAzureDataStudioEngine(version); + // Require at least one engine version + if (!vsCodeEngine && !azDataEngine) { return null; } - if (isEngineValid(engine, this.productService.version)) { + const vsCodeEngineValid = !vsCodeEngine || (vsCodeEngine && isEngineValid(vsCodeEngine, this.productService.vscodeVersion)); + const azDataEngineValid = !azDataEngine || (azDataEngine && isEngineValid(azDataEngine, this.productService.version)); + if (vsCodeEngineValid && azDataEngineValid) { return Promise.resolve(version); } }