@codingame/monaco-vscode-extension-gallery-service-override 17.2.0 → 18.0.0

package/index.js

@@ -2,25 +2,25 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IAllowedExtensionsService, IExtensionTipsService, IGlobalExtensionEnablementService, IExtensionGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
-import { GlobalExtensionEnablementService } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
+import { GlobalExtensionEnablementService } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { getLocale } from '@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/platform/languagePacks/common/languagePacks';
-import { ExtensionsWorkbenchService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js';
+import { getLocale } from '@codingame/monaco-vscode-93784a59-b4cf-520c-8339-f8104d3a4f3e-common/vscode/vs/platform/languagePacks/common/languagePacks';
+import { ExtensionsWorkbenchService } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService, IExtensionManagementServerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ExtensionManagementServerService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.js';
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
-import { ExtensionRecommendationsService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.js';
+import { ExtensionRecommendationsService } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensionRecommendationsService';
 import { WebExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js';
 import { IExtensionRecommendationNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations.service';
 import { IgnoredExtensionsManagementService } from './vscode/src/vs/platform/userDataSync/common/ignoredExtensions.js';
 import { IIgnoredExtensionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/ignoredExtensions.service';
-import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
 import { IExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { IBuiltinExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service';
 import { ExtensionIgnoredRecommendationsService } from './vscode/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
-import { WorkspaceExtensionsConfigService } from '@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
+import { WorkspaceExtensionsConfigService } from '@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
 import { IWorkspaceExtensionsConfigService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.service';
-import { ExtensionRecommendationNotificationService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js';
+import { ExtensionRecommendationNotificationService } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService';
 import { ExtensionTipsService } from './vscode/src/vs/platform/extensionManagement/common/extensionTipsService.js';
 import { ExtensionManagementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.js';
 import { RemoteUserDataProfilesService } from './vscode/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.js';
@@ -45,11 +45,10 @@ import { unsupported } from '@codingame/monaco-vscode-api/tools';
 import { IExtensionGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service';
 import { WebExtensionGalleryManifestService } from './vscode/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.js';
 import { WorkbenchExtensionGalleryService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.js';
-import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.js';
+import '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
 import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js';
 
 registerAssets({
-    'vs/workbench/services/extensionManagement/common/media/defaultIcon.png': new URL('./vscode/src/vs/workbench/services/extensionManagement/common/media/defaultIcon.png', import.meta.url).toString(),
     'vs/workbench/contrib/extensions/browser/media/theme-icon.png': new URL('./vscode/src/vs/workbench/contrib/extensions/browser/media/theme-icon.png', import.meta.url).href,
     'vs/workbench/contrib/extensions/browser/media/language-icon.svg': new URL('./vscode/src/vs/workbench/contrib/extensions/browser/media/theme-icon.png', import.meta.url).href
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "17.2.0",
+  "version": "18.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extension-gallery service-override",
   "keywords": [],
@@ -15,22 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "17.2.0",
-    "@codingame/monaco-vscode-10418ae3-ee63-5700-a757-89cbe6564ee4-common": "17.2.0",
-    "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common": "17.2.0",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.2.0",
-    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "17.2.0",
-    "@codingame/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common": "17.2.0",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "17.2.0",
-    "@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common": "17.2.0",
-    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "17.2.0",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "17.2.0",
-    "@codingame/monaco-vscode-api": "17.2.0",
-    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "17.2.0",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.2.0",
-    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "17.2.0",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.2.0",
-    "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common": "17.2.0"
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "18.0.0",
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "18.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "18.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "18.0.0",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "18.0.0",
+    "@codingame/monaco-vscode-93784a59-b4cf-520c-8339-f8104d3a4f3e-common": "18.0.0",
+    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "18.0.0",
+    "@codingame/monaco-vscode-api": "18.0.0",
+    "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common": "18.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.d.ts

@@ -123,7 +123,9 @@ export declare abstract class AbstractExtensionManagementService extends Commont
     protected abstract createInstallExtensionTask(manifest: IExtensionManifest, extension: URI | IGalleryExtension, options: InstallExtensionTaskOptions): IInstallExtensionTask;
     protected abstract createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask;
     protected abstract copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata?: Partial<Metadata>): Promise<ILocalExtension>;
-    protected abstract removeExtension(extension: ILocalExtension): Promise<void>;
+    protected abstract moveExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata?: Partial<Metadata>): Promise<ILocalExtension>;
+    protected abstract removeExtension(extension: ILocalExtension, fromProfileLocation: URI): Promise<void>;
+    protected abstract deleteExtension(extension: ILocalExtension): Promise<void>;
 }
 export declare function toExtensionManagementError(error: Error, code?: ExtensionManagementErrorCode): ExtensionManagementError;
 export declare abstract class AbstractExtensionTask<T> {

package/vscode/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.js

@@ -33,7 +33,7 @@ let CommontExtensionManagementService = class CommontExtensionManagementService
         const allowedToInstall = this.allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName });
         if (allowedToInstall !== true) {
             return (new MarkdownString(localize(
-                1748,
+                1753,
                 "This extension cannot be installed because {0}",
                 allowedToInstall.value
             )));
@@ -41,12 +41,12 @@ let CommontExtensionManagementService = class CommontExtensionManagementService
         if (!(await this.isExtensionPlatformCompatible(extension))) {
             const learnLink = isWeb ? 'https://aka.ms/vscode-web-extensions-guide' : 'https://aka.ms/vscode-platform-specific-extensions';
             return (new MarkdownString(`${( localize(
-                1749,
+                1754,
                 "The '{0}' extension is not available in {1} for the {2}.",
                 extension.displayName ?? extension.identifier.id,
                 this.productService.nameLong,
                 TargetPlatformToString(await this.getTargetPlatform())
-            ))} [${( localize(1750, "Learn Why"))}](${learnLink})`));
+            ))} [${( localize(1755, "Learn Why"))}](${learnLink})`));
         }
         return true;
     }
@@ -111,7 +111,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw ( new ExtensionManagementError(( localize(1751, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
+            throw ( new ExtensionManagementError(( localize(1756, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
         }
         const results = [];
         const installableExtensions = [];
@@ -256,8 +256,8 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                         else if (!URI.isUri(task.source) && task.source.hasPreReleaseVersion) {
                             preferPreRelease = false;
                         }
-                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, preferPreRelease, task.options.productVersion);
                         const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
+                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, preferPreRelease, task.options.productVersion, installed);
                         const options = { ...task.options, pinned: false, installGivenVersion: false, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
                         for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
                             const existing = installed.find(e => areSameExtensions(e.identifier, gallery.identifier));
@@ -479,7 +479,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         throw error;
     }
-    async getAllDepsAndPackExtensions(extensionIdentifier, manifest, preferPreRelease, productVersion) {
+    async getAllDepsAndPackExtensions(extensionIdentifier, manifest, preferPreRelease, productVersion, installed) {
         if (!this.galleryService.isEnabled()) {
             return [];
         }
@@ -490,9 +490,12 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             const dependecies = manifest.extensionDependencies || [];
             const dependenciesAndPackExtensions = [...dependecies];
             if (manifest.extensionPack) {
+                const existing = installed.find(e => areSameExtensions(e.identifier, extensionIdentifier));
                 for (const extension of manifest.extensionPack) {
-                    if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
-                        dependenciesAndPackExtensions.push(extension);
+                    if (!(existing && existing.manifest.extensionPack && ( existing.manifest.extensionPack.some(old => areSameExtensions({ id: old }, { id: extension }))))) {
+                        if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
+                            dependenciesAndPackExtensions.push(extension);
+                        }
                     }
                 }
             }
@@ -532,7 +535,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (isMalicious(extension.identifier, extensionsControlManifest.malicious)) {
             throw ( new ExtensionManagementError(( localize(
-                1752,
+                1757,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
             )), ExtensionManagementErrorCode.Malicious));
@@ -543,7 +546,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             compatibleExtension = (await this.galleryService.getExtensions([{ id: deprecationInfo.extension.id, preRelease: deprecationInfo.extension.preRelease }], { targetPlatform: await this.getTargetPlatform(), compatible: true, productVersion }, CancellationToken.None))[0];
             if (!compatibleExtension) {
                 throw ( new ExtensionManagementError(( localize(
-                    1753,
+                    1758,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
@@ -554,7 +557,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if ((await this.canInstall(extension)) !== true) {
                 const targetPlatform = await this.getTargetPlatform();
                 throw ( new ExtensionManagementError(( localize(
-                    1749,
+                    1754,
                     "The '{0}' extension is not available in {1} for the {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -566,7 +569,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( new ExtensionManagementError(( localize(
-                        1754,
+                        1759,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
@@ -574,13 +577,13 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 if (!installPreRelease && extension.hasPreReleaseVersion && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
                     throw ( new ExtensionManagementError(( localize(
-                        1755,
+                        1760,
                         "Can't install release version of '{0}' extension because it has no release version.",
                         extension.displayName ?? extension.identifier.id
                     )), ExtensionManagementErrorCode.ReleaseVersionNotFound));
                 }
                 throw ( new ExtensionManagementError(( localize(
-                    1756,
+                    1761,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -667,8 +670,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             else {
                 allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
             }
-            if (uninstallOptions.remove) {
-                extensionsToRemove.push(extension);
+            if (uninstallOptions.remove || extension.isApplicationScoped) {
+                if (uninstallOptions.remove) {
+                    extensionsToRemove.push(extension);
+                }
                 for (const profile of this.userDataProfilesService.profiles) {
                     if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
                         continue;
@@ -742,7 +747,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 postUninstallExtension(task.extension, task.options);
             }
             if (extensionsToRemove.length) {
-                await this.joinAllSettled(( extensionsToRemove.map(extension => this.removeExtension(extension))));
+                await this.joinAllSettled(( extensionsToRemove.map(extension => this.deleteExtension(extension))));
             }
         }
         catch (e) {
@@ -783,7 +788,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
                 return localize(
-                    1757,
+                    1762,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -791,7 +796,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             if (dependents.length === 2) {
                 return localize(
-                    1758,
+                    1763,
                     "Cannot uninstall '{0}' extension. '{1}' and '{2}' extensions depend on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -799,7 +804,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 );
             }
             return localize(
-                1759,
+                1764,
                 "Cannot uninstall '{0}' extension. '{1}', '{2}' and other extension depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -808,7 +813,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 1) {
             return localize(
-                1760,
+                1765,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -818,7 +823,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 2) {
             return localize(
-                1761,
+                1766,
                 "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}' and '{3}' extensions depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -828,7 +833,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             );
         }
         return localize(
-            1762,
+            1767,
             "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}', '{3}' and other extensions depend on this.",
             extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
             dependingExtension.manifest.displayName

package/vscode/src/vs/platform/extensionManagement/common/allowedExtensionsService.js

@@ -80,14 +80,14 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
             `command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify({ query: `@id:${AllowedExtensionsConfigKey}` }))}`
         )).toString());
         const extensionValue = this._allowedExtensionsConfigValue[id];
-        const extensionReason = ( new MarkdownString(( localize(1763, "it is not in the [allowed list]({0})", settingsCommandLink))));
+        const extensionReason = ( new MarkdownString(( localize(1768, "it is not in the [allowed list]({0})", settingsCommandLink))));
         if (!isUndefined(extensionValue)) {
             if (isBoolean(extensionValue)) {
                 return extensionValue ? true : extensionReason;
             }
             if (extensionValue === 'stable' && prerelease) {
                 return (new MarkdownString(localize(
-                    1764,
+                    1769,
                     "the pre-release versions of this extension are not in the [allowed list]({0})",
                     settingsCommandLink
                 )));
@@ -107,7 +107,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
                 return false;
             }))) {
                 return (new MarkdownString(localize(
-                    1765,
+                    1770,
                     "the version {0} of this extension is not in the [allowed list]({1})",
                     version,
                     settingsCommandLink
@@ -120,7 +120,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
         if (!isUndefined(publisherValue)) {
             if (isBoolean(publisherValue)) {
                 return publisherValue ? true : ( new MarkdownString(( localize(
-                    1766,
+                    1771,
                     "the extensions from this publisher are not in the [allowed list]({1})",
                     publisherKey,
                     settingsCommandLink
@@ -128,7 +128,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
             }
             if (publisherValue === 'stable' && prerelease) {
                 return (new MarkdownString(localize(
-                    1767,
+                    1772,
                     "the pre-release versions from this publisher are not in the [allowed list]({1})",
                     publisherKey,
                     settingsCommandLink

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IExtensionGalleryManifest } from "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
+import { IExtensionGalleryManifest } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
 import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
 export declare class ExtensionGalleryManifestService extends Disposable implements IExtensionGalleryManifestService {
     protected readonly productService: IProductService;

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { ExtensionGalleryResourceType, Flag } from '@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
+import { ExtensionGalleryResourceType, Flag } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
 import { FilterType, SortBy } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 
 let ExtensionGalleryManifestService = class ExtensionGalleryManifestService extends Disposable {

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.d.ts

@@ -1,5 +1,5 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IPager } from "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/base/common/paging";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -77,7 +77,9 @@ export declare abstract class AbstractExtensionGalleryService implements IExtens
     getManifest(extension: IGalleryExtension, token: CancellationToken): Promise<IExtensionManifest | null>;
     getCoreTranslation(extension: IGalleryExtension, languageId: string): Promise<ITranslation | null>;
     getChangelog(extension: IGalleryExtension, token: CancellationToken): Promise<string>;
+    getAllVersions(extensionIdentifier: IExtensionIdentifier): Promise<IGalleryExtensionVersion[]>;
     getAllCompatibleVersions(extensionIdentifier: IExtensionIdentifier, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]>;
+    private getVersions;
     private getAsset;
     getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.js

@@ -8,10 +8,10 @@ import { isWeb, platform } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { arch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/process';
 import { isString, isBoolean } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { isOfflineError } from '@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/base/parts/request/common/request';
+import { isOfflineError } from '@codingame/monaco-vscode-93784a59-b4cf-520c-8339-f8104d3a4f3e-common/vscode/vs/base/parts/request/common/request';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
-import { getTargetPlatform, SortOrder, SortBy, FilterType, toTargetPlatform, WEB_EXTENSION_TAG, UseUnpkgResourceApiConfigKey, EXTENSION_IDENTIFIER_REGEX, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, StatisticType, InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { getTargetPlatform, SortOrder, SortBy, FilterType, toTargetPlatform, WEB_EXTENSION_TAG, EXTENSION_IDENTIFIER_REGEX, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ExtensionGalleryErrorCode, ExtensionGalleryError, StatisticType, InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IAllowedExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { adoptToGalleryExtensionId, getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { TargetPlatform } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
@@ -26,7 +26,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { format2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { getExtensionGalleryManifestResourceUri, ExtensionGalleryResourceType, Flag } from '@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
+import { getExtensionGalleryManifestResourceUri, ExtensionGalleryResourceType, Flag } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
 import { IExtensionGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service';
 import { TelemetryTrustedValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 
@@ -35,6 +35,7 @@ const SEARCH_ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
 const ACTIVITY_HEADER_NAME = 'Activityid';
 const SERVER_HEADER_NAME = 'Server';
 const END_END_ID_HEADER_NAME = 'X-Vss-E2eid';
+const REQUEST_TIME_OUT = 10_000;
 const AssetType = {
     Icon: 'Microsoft.VisualStudio.Services.Icons.Default',
     Details: 'Microsoft.VisualStudio.Services.Content.Details',
@@ -329,7 +330,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1;
         const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2;
-        const resourceApi = (options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false)) ? await this.getResourceApi(extensionGalleryManifest) : undefined;
+        const resourceApi = await this.getResourceApi(extensionGalleryManifest, !!options.updateCheck);
         const result = resourceApi
             ? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, extensionGalleryManifest, token)
             : await this.getExtensionsUsingQueryApi(extensionInfos, options, extensionGalleryManifest, token);
@@ -349,7 +350,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return result;
     }
-    async getResourceApi(extensionGalleryManifest) {
+    async getResourceApi(extensionGalleryManifest, updateCheck) {
         const latestVersionResource = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
         if (!latestVersionResource) {
             return undefined;
@@ -360,7 +361,9 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 fallback: this.unpkgResourceApi
             };
         }
-        const value = (await this.assignmentService?.getTreatment('extensions.gallery.useResourceApi')) ?? 'unpkg';
+        const value = updateCheck
+            ? (await this.assignmentService?.getTreatment('extensions.gallery.useResourceApi')) ?? 'marketplace'
+            : (await this.assignmentService?.getTreatment('extensions.gallery.useLatestApi')) ?? 'unpkg';
         if (value === 'marketplace') {
             return {
                 uri: latestVersionResource,
@@ -494,7 +497,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 version: this.productService.version,
                 date: this.productService.date
             },
-            version: extensionInfo.preRelease ? VersionKind.Prerelease : VersionKind.Release
+            version: extensionInfo.preRelease ? VersionKind.Latest : VersionKind.Release
         }, allTargetPlatforms);
         if (rawGalleryExtensionVersion) {
             return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, this.productService);
@@ -960,7 +963,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 type: 'GET',
                 url: ( uri.toString(true)),
                 headers,
-                timeout: 10000
+                timeout: REQUEST_TIME_OUT
             }, token);
             if (context.res.statusCode === 404) {
                 errorCode = 'NotFound';
@@ -980,13 +983,14 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             if (isCancellationError(error)) {
                 errorCode = ExtensionGalleryErrorCode.Cancelled;
             }
-            else {
-                const errorMessage = getErrorMessage(error);
-                errorCode = isOfflineError(error)
-                    ? ExtensionGalleryErrorCode.Offline
-                    : errorMessage.startsWith('XHR timeout')
-                        ? ExtensionGalleryErrorCode.Timeout
-                        : ExtensionGalleryErrorCode.Failed;
+            else if (isOfflineError(error)) {
+                errorCode = ExtensionGalleryErrorCode.Offline;
+            }
+            else if (getErrorMessage(error).startsWith('XHR timeout')) {
+                errorCode = ExtensionGalleryErrorCode.Timeout;
+            }
+            else if (!errorCode) {
+                errorCode = ExtensionGalleryErrorCode.Failed;
             }
             throw error;
         }
@@ -1111,7 +1115,13 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return '';
     }
+    async getAllVersions(extensionIdentifier) {
+        return this.getVersions(extensionIdentifier);
+    }
     async getAllCompatibleVersions(extensionIdentifier, includePreRelease, targetPlatform) {
+        return this.getVersions(extensionIdentifier, { version: includePreRelease ? VersionKind.Latest : VersionKind.Release, targetPlatform });
+    }
+    async getVersions(extensionIdentifier, onlyCompatible) {
         const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
         if (!extensionGalleryManifest) {
             throw ( new Error('No extension gallery service configured.'));
@@ -1130,10 +1140,10 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             return [];
         }
         const allTargetPlatforms = getAllTargetPlatforms(galleryExtensions[0]);
-        if (isNotWebExtensionInWebTargetPlatform(allTargetPlatforms, targetPlatform)) {
+        if (onlyCompatible && isNotWebExtensionInWebTargetPlatform(allTargetPlatforms, onlyCompatible.targetPlatform)) {
             return [];
         }
-        const compatibleVersions = [];
+        const versions = [];
         const productVersion = { version: this.productService.version, date: this.productService.date };
         await Promise.all(( galleryExtensions[0].versions.map(async (version) => {
             try {
@@ -1146,19 +1156,19 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                     manifestAsset: getVersionAsset(version, AssetType.Manifest),
                     enabledApiProposals: getEnabledApiProposals(version)
                 }, {
-                    compatible: true,
+                    compatible: !!onlyCompatible,
                     productVersion,
-                    targetPlatform,
-                    version: includePreRelease ? VersionKind.Latest : VersionKind.Release
+                    targetPlatform: onlyCompatible?.targetPlatform ?? CURRENT_TARGET_PLATFORM,
+                    version: onlyCompatible?.version ?? version.version
                 }, galleryExtensions[0].publisher.displayName, allTargetPlatforms))) {
-                    compatibleVersions.push(version);
+                    versions.push(version);
                 }
             }
             catch (error) {  }
         })));
         const result = [];
         const seen = ( new Set());
-        for (const version of sortExtensionVersions(compatibleVersions, targetPlatform)) {
+        for (const version of sortExtensionVersions(versions, onlyCompatible?.targetPlatform ?? CURRENT_TARGET_PLATFORM)) {
             if (!( seen.has(version.version))) {
                 seen.add(version.version);
                 result.push({ version: version.version, date: version.lastUpdated, isPreReleaseVersion: isPreReleaseVersion(version) });
@@ -1173,7 +1183,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         options = { ...options, ...baseOptions, headers };
         const url = asset.uri;
         const fallbackUrl = asset.fallbackUri;
-        const firstOptions = { ...options, url };
+        const firstOptions = { ...options, url, timeout: REQUEST_TIME_OUT };
         let context;
         try {
             context = await this.requestService.request(firstOptions, token);
@@ -1197,7 +1207,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 activityId: this.getHeaderValue(context?.res.headers, ACTIVITY_HEADER_NAME),
                 endToEndId: this.getHeaderValue(context?.res.headers, END_END_ID_HEADER_NAME),
             });
-            const fallbackOptions = { ...options, url: fallbackUrl };
+            const fallbackOptions = { ...options, url: fallbackUrl, timeout: REQUEST_TIME_OUT };
             return this.requestService.request(fallbackOptions, token);
         }
     }
@@ -1211,7 +1221,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         const context = await this.requestService.request({
             type: 'GET',
             url: this.extensionsControlUrl,
-            timeout: 10000
+            timeout: REQUEST_TIME_OUT
         }, CancellationToken.None);
         if (context.res.statusCode !== 200) {
             throw ( new Error('Could not get extensions report.'));

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementIpc.js

@@ -1,5 +1,6 @@
 
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { DefaultURITransformer, transformAndReviveIncomingURIs } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uriIpc';
 import { CommontExtensionManagementService } from './abstractExtensionManagementService.js';

package/vscode/src/vs/platform/extensionManagement/common/extensionTipsService.js

@@ -15,11 +15,12 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/process';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
-import '../../extensionRecommendations/common/extensionRecommendations.js';
+import '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 
 let ExtensionTipsService = class ExtensionTipsService extends Disposable {

package/vscode/src/vs/platform/externalServices/common/marketplace.d.ts

@@ -1,4 +1,4 @@
-import { IHeaders } from "@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/base/parts/request/common/request";
+import { IHeaders } from "@codingame/monaco-vscode-93784a59-b4cf-520c-8339-f8104d3a4f3e-common/vscode/vs/base/parts/request/common/request";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";

package/vscode/src/vs/platform/externalServices/common/marketplace.js

@@ -1,5 +1,5 @@
 
-import { getServiceMachineId } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/externalServices/common/serviceMachineId';
+import { getServiceMachineId } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/externalServices/common/serviceMachineId';
 import { TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { supportsTelemetry, getTelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileIpc.js

@@ -2,6 +2,7 @@
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { reviveProfile } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';