From daf81cc9e7698de5547e8fde68153b66b24d2427 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Fri, 21 Oct 2022 14:07:22 -0700 Subject: [PATCH] Fix extension load issues on insider build (#20920) --- extensions/azurecore/package.json | 1 + .../extensions/common/extensionValidator.ts | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index 10c693c013..9bf6c58ef0 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -351,6 +351,7 @@ "axios": "^0.27.2", "node-fetch": "^2.6.7", "qs": "^6.9.1", + "universalify": "^0.1.2", "vscode-nls": "^4.0.0", "ws": "^7.4.6" }, diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts index 88a46a6658..ca81da3e08 100644 --- a/src/vs/platform/extensions/common/extensionValidator.ts +++ b/src/vs/platform/extensions/common/extensionValidator.ts @@ -359,19 +359,20 @@ function isVersionValid(currentVersion: string, date: ProductDate, requestedVers // enforce that a breaking API version is specified. // for 0.X.Y, that means up to 0.X must be specified // otherwise for Z.X.Y, that means Z must be specified - if (desiredVersion.majorBase === 0) { - // force that major and minor must be specific - if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) { - notices.push(nls.localize('versionSpecificity1', "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.", requestedVersion)); - return false; - } - } else { - // force that major must be specific - if (!desiredVersion.majorMustEqual) { - notices.push(nls.localize('versionSpecificity2', "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.", requestedVersion)); - return false; - } - } + // {{SQL CARBON EDIT}} - turn off this more specific check, which we don't currently use or need (i.e. ADS allows '*' for vscode) + // if (desiredVersion.majorBase === 0) { + // // force that major and minor must be specific + // if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) { + // notices.push(nls.localize('versionSpecificity1', "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.", requestedVersion)); + // return false; + // } + // } else { + // // force that major must be specific + // if (!desiredVersion.majorMustEqual) { + // notices.push(nls.localize('versionSpecificity2', "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.", requestedVersion)); + // return false; + // } + // } if (!isValidVersion(currentVersion, date, desiredVersion)) { notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion));