ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix extension gallery query to use correct version (#11040)

Browse Source 
* Fix extension gallery query to use correct version

* Only require one engine of either type
This commit is contained in:
Charles Gagnon
2020-06-23 09:31:51 -07:00
committed by GitHub
parent 0a61898303
commit bcbf08122f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
View File

@@ -847,11 +847,16 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
private getLastValidExtensionVersionFromProperties(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> | null { private getLastValidExtensionVersionFromProperties(extension: IRawGalleryExtension, versions: IRawGalleryExtensionVersion[]): Promise<IRawGalleryExtensionVersion> | null {
for (const version of versions) { for (const version of versions) {
const engine = getEngine(version); // {{SQL CARBON EDIT}}
if (!engine) { const vsCodeEngine = getEngine(version);
const azDataEngine = getAzureDataStudioEngine(version);
// Require at least one engine version
if (!vsCodeEngine && !azDataEngine) {
return null; 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); return Promise.resolve(version);
} }
} }