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 load issues on insider build (#20920)

Browse Source
This commit is contained in:
Karl Burtram
2022-10-21 14:07:22 -07:00
committed by GitHub
parent c42620d7d6
commit daf81cc9e7
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/azurecore/package.json
View File

@@ -351,6 +351,7 @@
"axios": "^0.27.2", "axios": "^0.27.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"qs": "^6.9.1", "qs": "^6.9.1",
"universalify": "^0.1.2",
"vscode-nls": "^4.0.0", "vscode-nls": "^4.0.0",
"ws": "^7.4.6" "ws": "^7.4.6"
}, },

27
src/vs/platform/extensions/common/extensionValidator.ts
View File

@@ -359,19 +359,20 @@ function isVersionValid(currentVersion: string, date: ProductDate, requestedVers
// enforce that a breaking API version is specified. // enforce that a breaking API version is specified.
// for 0.X.Y, that means up to 0.X must be 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 // otherwise for Z.X.Y, that means Z must be specified
if (desiredVersion.majorBase === 0) { // {{SQL CARBON EDIT}} - turn off this more specific check, which we don't currently use or need (i.e. ADS allows '*' for vscode)
// force that major and minor must be specific // if (desiredVersion.majorBase === 0) {
if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) { // // force that major and minor must be specific
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)); // if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
return false; // 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 // } else {
if (!desiredVersion.majorMustEqual) { // // force that major must be specific
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)); // if (!desiredVersion.majorMustEqual) {
return false; // 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)) { if (!isValidVersion(currentVersion, date, desiredVersion)) {
notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion)); notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion));