@codingame/monaco-vscode-extension-gallery-service-override 19.1.3 → 20.0.0

package/index.js

@@ -4,7 +4,7 @@ import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IAllowedExtensionsService, IExtensionTipsService, IGlobalExtensionEnablementService, IExtensionGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 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-516ccb00-d5b9-5317-baf0-fcc96e99669a-common/vscode/vs/platform/languagePacks/common/languagePacks';
+import { getLocale } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "19.1.3",
+  "version": "20.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extension-gallery service-override",
   "keywords": [],
@@ -15,16 +15,16 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "19.1.3",
-    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "19.1.3",
-    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "19.1.3",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.1.3",
-    "@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common": "19.1.3",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "19.1.3",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.1.3",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "19.1.3",
-    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "19.1.3",
-    "@codingame/monaco-vscode-api": "19.1.3"
+    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "20.0.0",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "20.0.0",
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "20.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "20.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.0.0",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "20.0.0",
+    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "20.0.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.0.0",
+    "@codingame/monaco-vscode-api": "20.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -113,6 +113,7 @@ export declare abstract class AbstractExtensionManagementService extends Commont
     private getAllDepsAndPackExtensions;
     private checkAndGetCompatibleVersion;
     protected getCompatibleVersion(extension: IGalleryExtension, sameVersion: boolean, includePreRelease: boolean, productVersion: IProductVersion): Promise<IGalleryExtension | null>;
+    private getUninstallExtensionTaskKey;
     uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void>;
     private checkForDependents;
     private getDependentsErrorMessage;

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(
-                1765,
+                1777,
                 "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(
-                1766,
+                1778,
                 "The '{0}' extension is not available in {1} for the {2}.",
                 extension.displayName ?? extension.identifier.id,
                 this.productService.nameLong,
                 TargetPlatformToString(await this.getTargetPlatform())
-            ))} [${( localize(1767, "Learn Why"))}](${learnLink})`));
+            ))} [${( localize(1779, "Learn Why"))}](${learnLink})`));
         }
         return true;
     }
@@ -111,7 +111,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw ( new ExtensionManagementError(( localize(1768, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
+            throw ( new ExtensionManagementError(( localize(1780, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
         }
         const results = [];
         const installableExtensions = [];
@@ -195,6 +195,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const alreadyRequestedInstallations = [];
         const getInstallExtensionTaskKey = (extension, profileLocation) => `${( ExtensionKey.create(extension).toString())}-${( profileLocation.toString())}`;
         const createInstallExtensionTask = (manifest, extension, options, root) => {
+            let uninstallTaskToWaitFor;
             if (!URI.isUri(extension)) {
                 if (( installingExtensionsMap.has(`${extension.identifier.id.toLowerCase()}-${( options.profileLocation.toString())}`))) {
                     return;
@@ -215,10 +216,11 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     }
                     return;
                 }
+                uninstallTaskToWaitFor = this.uninstallingExtensions.get(this.getUninstallExtensionTaskKey(extension.identifier, options.profileLocation));
             }
             const installExtensionTask = this.createInstallExtensionTask(manifest, extension, options);
             const key = `${getGalleryExtensionId(manifest.publisher, manifest.name)}-${( options.profileLocation.toString())}`;
-            installingExtensionsMap.set(key, { task: installExtensionTask, root });
+            installingExtensionsMap.set(key, { task: installExtensionTask, root, uninstallTaskToWaitFor });
             this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: options.profileLocation });
             this.logService.info('Installing extension:', installExtensionTask.identifier.id, options);
             if (!URI.isUri(extension)) {
@@ -287,10 +289,20 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             for (const [profileLocation, task] of otherProfilesToUpdate) {
                 createInstallExtensionTask(task.manifest, task.source, { ...task.options, profileLocation }, undefined);
             }
-            await this.joinAllSettled(( [...installingExtensionsMap.entries()].map(async ([key, { task }]) => {
+            await this.joinAllSettled(( [...installingExtensionsMap.entries()].map(async ([key, { task, uninstallTaskToWaitFor }]) => {
                 const startTime = ( new Date()).getTime();
                 let local;
                 try {
+                    if (uninstallTaskToWaitFor) {
+                        this.logService.info('Waiting for existing uninstall task to complete before installing', task.identifier.id);
+                        try {
+                            await uninstallTaskToWaitFor.waitUntilTaskIsFinished();
+                            this.logService.info('Finished waiting for uninstall task, proceeding with install', task.identifier.id);
+                        }
+                        catch (error) {
+                            this.logService.info('Uninstall task failed, proceeding with install anyway', task.identifier.id, getErrorMessage(error));
+                        }
+                    }
                     local = await task.run();
                     await this.joinAllSettled(( this.participants.map(
                         participant => participant.postInstall(local, task.source, task.options, CancellationToken.None)
@@ -535,7 +547,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (isMalicious(extension.identifier, extensionsControlManifest.malicious)) {
             throw ( new ExtensionManagementError(( localize(
-                1769,
+                1781,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
             )), ExtensionManagementErrorCode.Malicious));
@@ -546,7 +558,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(
-                    1770,
+                    1782,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
@@ -557,7 +569,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if ((await this.canInstall(extension)) !== true) {
                 const targetPlatform = await this.getTargetPlatform();
                 throw ( new ExtensionManagementError(( localize(
-                    1766,
+                    1778,
                     "The '{0}' extension is not available in {1} for the {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -569,7 +581,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( new ExtensionManagementError(( localize(
-                        1771,
+                        1783,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
@@ -577,13 +589,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(
-                        1772,
+                        1784,
                         "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(
-                    1773,
+                    1785,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -626,14 +638,24 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         return compatibleExtension;
     }
+    getUninstallExtensionTaskKey(identifier, profileLocation, version) {
+        return `${identifier.id.toLowerCase()}${version ? `-${version}` : ''}@${( profileLocation.toString())}`;
+    }
     async uninstallExtensions(extensions) {
-        const getUninstallExtensionTaskKey = (extension, uninstallOptions) => `${extension.identifier.id.toLowerCase()}${uninstallOptions.versionOnly ? `-${extension.manifest.version}` : ''}@${( uninstallOptions.profileLocation.toString())}`;
+        const getUninstallExtensionTaskKey = (extension, uninstallOptions) => this.getUninstallExtensionTaskKey(extension.identifier, uninstallOptions.profileLocation, uninstallOptions.versionOnly ? extension.manifest.version : undefined);
         const createUninstallExtensionTask = (extension, uninstallOptions) => {
-            const uninstallExtensionTask = this.createUninstallExtensionTask(extension, uninstallOptions);
-            this.uninstallingExtensions.set(getUninstallExtensionTaskKey(uninstallExtensionTask.extension, uninstallOptions), uninstallExtensionTask);
+            let installTaskToWaitFor;
+            for (const { task } of ( this.installingExtensions.values())) {
+                if (!(task.source instanceof URI) && areSameExtensions(task.identifier, extension.identifier) && this.uriIdentityService.extUri.isEqual(task.options.profileLocation, uninstallOptions.profileLocation)) {
+                    installTaskToWaitFor = task;
+                    break;
+                }
+            }
+            const task = this.createUninstallExtensionTask(extension, uninstallOptions);
+            this.uninstallingExtensions.set(getUninstallExtensionTaskKey(task.extension, uninstallOptions), task);
             this.logService.info('Uninstalling extension from the profile:', `${extension.identifier.id}@${extension.manifest.version}`, ( uninstallOptions.profileLocation.toString()));
             this._onUninstallExtension.fire({ identifier: extension.identifier, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
-            return uninstallExtensionTask;
+            allTasks.push({ task, installTaskToWaitFor });
         };
         const postUninstallExtension = (extension, uninstallOptions, error) => {
             if (error) {
@@ -668,7 +690,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
             }
             else {
-                allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
+                createUninstallExtensionTask(extension, uninstallOptions);
             }
             if (uninstallOptions.remove || extension.isApplicationScoped) {
                 if (uninstallOptions.remove) {
@@ -688,14 +710,14 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                             alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
                         }
                         else {
-                            allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
+                            createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile);
                         }
                     }
                 }
             }
         }
         try {
-            for (const task of allTasks.slice(0)) {
+            for (const { task } of allTasks.slice(0)) {
                 const installed = await getInstalledExtensions(task.options.profileLocation);
                 if (task.options.donotIncludePack) {
                     this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
@@ -707,7 +729,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                             this.logService.info('Extensions is already requested to uninstall', packedExtension.identifier.id);
                         }
                         else {
-                            allTasks.push(createUninstallExtensionTask(packedExtension, task.options));
+                            createUninstallExtensionTask(packedExtension, task.options);
                         }
                     }
                 }
@@ -715,11 +737,21 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                     this.logService.info('Uninstalling the extension without checking dependents', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
                 }
                 else {
-                    this.checkForDependents(( allTasks.map(task => task.extension)), installed, task.extension);
+                    this.checkForDependents(( allTasks.map(({ task }) => task.extension)), installed, task.extension);
                 }
             }
-            await this.joinAllSettled(( allTasks.map(async (task) => {
+            await this.joinAllSettled(( allTasks.map(async ({ task, installTaskToWaitFor }) => {
                 try {
+                    if (installTaskToWaitFor) {
+                        this.logService.info('Waiting for existing install task to complete before uninstalling', task.extension.identifier.id);
+                        try {
+                            await installTaskToWaitFor.waitUntilTaskIsFinished();
+                            this.logService.info('Finished waiting for install task, proceeding with uninstall', task.extension.identifier.id);
+                        }
+                        catch (error) {
+                            this.logService.info('Install task failed, proceeding with uninstall anyway', task.extension.identifier.id, getErrorMessage(error));
+                        }
+                    }
                     await task.run();
                     await this.joinAllSettled(( this.participants.map(
                         participant => participant.postUninstall(task.extension, task.options, CancellationToken.None)
@@ -743,7 +775,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if (alreadyRequestedUninstalls.length) {
                 await this.joinAllSettled(alreadyRequestedUninstalls);
             }
-            for (const task of allTasks) {
+            for (const { task } of allTasks) {
                 postUninstallExtension(task.extension, task.options);
             }
             if (extensionsToRemove.length) {
@@ -752,7 +784,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         catch (e) {
             const error = toExtensionManagementError(e);
-            for (const task of allTasks) {
+            for (const { task } of allTasks) {
                 try {
                     task.cancel();
                 }
@@ -764,7 +796,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             throw error;
         }
         finally {
-            for (const task of allTasks) {
+            for (const { task } of allTasks) {
                 if (!this.uninstallingExtensions.delete(getUninstallExtensionTaskKey(task.extension, task.options))) {
                     this.logService.warn('Uninstallation task is not found in the cache', task.extension.identifier.id);
                 }
@@ -788,7 +820,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
                 return localize(
-                    1774,
+                    1786,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -796,7 +828,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             if (dependents.length === 2) {
                 return localize(
-                    1775,
+                    1787,
                     "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,
@@ -804,7 +836,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 );
             }
             return localize(
-                1776,
+                1788,
                 "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,
@@ -813,7 +845,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 1) {
             return localize(
-                1777,
+                1789,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -823,7 +855,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 2) {
             return localize(
-                1778,
+                1790,
                 "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
@@ -833,7 +865,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             );
         }
         return localize(
-            1779,
+            1791,
             "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(1780, "it is not in the [allowed list]({0})", settingsCommandLink))));
+        const extensionReason = ( new MarkdownString(( localize(1792, "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(
-                    1781,
+                    1793,
                     "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(
-                    1782,
+                    1794,
                     "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(
-                    1783,
+                    1795,
                     "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(
-                    1784,
+                    1796,
                     "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,13 +1,14 @@
 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-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
+import { IExtensionGalleryManifest, ExtensionGalleryManifestStatus } from "@codingame/monaco-vscode-api/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;
     readonly _serviceBrand: undefined;
     readonly onDidChangeExtensionGalleryManifest: Event<any>;
+    readonly onDidChangeExtensionGalleryManifestStatus: Event<any>;
+    get extensionGalleryManifestStatus(): ExtensionGalleryManifestStatus;
     constructor(productService: IProductService);
-    isEnabled(): boolean;
     getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null>;
 }

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

@@ -3,17 +3,18 @@ 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-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
+import { ExtensionGalleryManifestStatus, ExtensionGalleryResourceType, Flag } from '@codingame/monaco-vscode-api/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 {
+    get extensionGalleryManifestStatus() {
+        return !!this.productService.extensionsGallery?.serviceUrl ? ExtensionGalleryManifestStatus.Available : ExtensionGalleryManifestStatus.Unavailable;
+    }
     constructor(productService) {
         super();
         this.productService = productService;
         this.onDidChangeExtensionGalleryManifest = Event.None;
-    }
-    isEnabled() {
-        return !!this.productService.extensionsGallery?.serviceUrl;
+        this.onDidChangeExtensionGalleryManifestStatus = Event.None;
     }
     async getExtensionGalleryManifest() {
         const extensionsGallery = this.productService.extensionsGallery;

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-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-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";
@@ -13,7 +13,7 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/assignment/common/assignment";
+import { IAssignmentService } from "@codingame/monaco-vscode-configuration-service-override/vscode/vs/platform/assignment/common/assignment";
 import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
 interface IRawGalleryExtensionFile {
     readonly assetType: string;

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

@@ -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-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
+import { getExtensionGalleryManifestResourceUri, ExtensionGalleryResourceType, ExtensionGalleryManifestStatus, Flag } from '@codingame/monaco-vscode-api/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';
 
@@ -321,7 +321,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         this.commonHeadersPromise = resolveMarketplaceHeaders(productService.version, productService, this.environmentService, this.configurationService, this.fileService, storageService, this.telemetryService);
     }
     isEnabled() {
-        return this.extensionGalleryManifestService.isEnabled();
+        return this.extensionGalleryManifestService.extensionGalleryManifestStatus === ExtensionGalleryManifestStatus.Available;
     }
     async getExtensions(extensionInfos, arg1, arg2) {
         const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
@@ -330,7 +330,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1;
         const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2;
-        const resourceApi = await this.getResourceApi(extensionGalleryManifest, !!options.updateCheck);
+        const resourceApi = await this.getResourceApi(extensionGalleryManifest);
         const result = resourceApi
             ? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, extensionGalleryManifest, token)
             : await this.getExtensionsUsingQueryApi(extensionInfos, options, extensionGalleryManifest, token);
@@ -350,29 +350,18 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return result;
     }
-    async getResourceApi(extensionGalleryManifest, updateCheck) {
-        const latestVersionResource = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
-        if (!latestVersionResource) {
-            return undefined;
-        }
-        if (this.productService.quality !== 'stable') {
-            return {
-                uri: latestVersionResource,
-                fallback: this.unpkgResourceApi
-            };
+    async getResourceApi(extensionGalleryManifest) {
+        const value = (await this.assignmentService?.getTreatment('extensions.gallery.useResourceApi')) ?? 'marketplace';
+        if (value === 'unpkg' && this.unpkgResourceApi) {
+            return { uri: this.unpkgResourceApi };
         }
-        const value = updateCheck
-            ? (await this.assignmentService?.getTreatment('extensions.gallery.useResourceApi')) ?? 'marketplace'
-            : (await this.assignmentService?.getTreatment('extensions.gallery.useLatestApi')) ?? 'unpkg';
-        if (value === 'marketplace') {
+        const latestVersionResource = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
+        if (latestVersionResource) {
             return {
                 uri: latestVersionResource,
                 fallback: this.unpkgResourceApi
             };
         }
-        if (value === 'unpkg' && this.unpkgResourceApi) {
-            return { uri: this.unpkgResourceApi };
-        }
         return undefined;
     }
     async getExtensionsUsingQueryApi(extensionInfos, options, extensionGalleryManifest, token) {
@@ -561,7 +550,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 return false;
             }
         }
-        if (!isTargetPlatformCompatible(extension.targetPlatform, allTargetPlatforms, targetPlatform)) {
+        if (targetPlatform && !isTargetPlatformCompatible(extension.targetPlatform, allTargetPlatforms, targetPlatform)) {
             return false;
         }
         if (compatible) {
@@ -1158,7 +1147,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 }, {
                     compatible: !!onlyCompatible,
                     productVersion,
-                    targetPlatform: onlyCompatible?.targetPlatform ?? CURRENT_TARGET_PLATFORM,
+                    targetPlatform: onlyCompatible?.targetPlatform,
                     version: onlyCompatible?.version ?? version.version
                 }, galleryExtensions[0].publisher.displayName, allTargetPlatforms))) {
                     versions.push(version);
@@ -1167,11 +1156,17 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             catch (error) {  }
         })));
         const result = [];
-        const seen = ( new Set());
+        const seen = ( new Map());
         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) });
+            const index = seen.get(version.version);
+            const existing = index !== undefined ? result[index] : undefined;
+            const targetPlatform = getTargetPlatformForExtensionVersion(version);
+            if (!existing) {
+                seen.set(version.version, result.length);
+                result.push({ version: version.version, date: version.lastUpdated, isPreReleaseVersion: isPreReleaseVersion(version), targetPlatforms: [targetPlatform] });
+            }
+            else {
+                existing.targetPlatforms.push(targetPlatform);
             }
         }
         return result;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js

@@ -7,4 +7,4 @@ import { RuntimeExtensionsEditor } from './browserRuntimeExtensionsEditor.js';
 import { RuntimeExtensionsInput } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(RuntimeExtensionsEditor, RuntimeExtensionsEditor.ID, ( localize(6732, "Running Extensions"))), [( new SyncDescriptor(RuntimeExtensionsInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(RuntimeExtensionsEditor, RuntimeExtensionsEditor.ID, ( localize(6851, "Running Extensions"))), [( new SyncDescriptor(RuntimeExtensionsInput))]);

package/vscode/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.js

@@ -8,7 +8,7 @@ var ReportExtensionIssueAction_1;
 let ReportExtensionIssueAction = class ReportExtensionIssueAction extends Action {
     static { ReportExtensionIssueAction_1 = this; }
     static { this._id = 'workbench.extensions.action.reportExtensionIssue'; }
-    static { this._label = ( localize(7092, "Report Issue")); }
+    static { this._label = ( localize(7217, "Report Issue")); }
     constructor(extension, issueService) {
         super(ReportExtensionIssueAction_1._id, ReportExtensionIssueAction_1._label, 'extension-action report-issue');
         this.extension = extension;

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.js

@@ -78,8 +78,8 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
         this._register(allowedExtensionsService.onDidChangeAllowedExtensionsConfigValue(() => this._onDidChangeExtensions([], [], false)));
         if (this.allUserExtensionsDisabled) {
             this.lifecycleService.when(LifecyclePhase.Eventually).then(() => {
-                this.notificationService.prompt(Severity.Info, ( localize(12784, "All installed extensions are temporarily disabled.")), [{
-                        label: ( localize(12785, "Reload and Enable Extensions")),
+                this.notificationService.prompt(Severity.Info, ( localize(13034, "All installed extensions are temporarily disabled.")), [{
+                        label: ( localize(13035, "Reload and Enable Extensions")),
                         run: () => hostService.reload({ disableExtensions: false })
                     }], {
                     sticky: true,
@@ -131,7 +131,7 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
     throwErrorIfCannotChangeEnablement(extension, donotCheckDependencies) {
         if (isLanguagePackExtension(extension.manifest)) {
             throw ( new Error(( localize(
-                12786,
+                13036,
                 "Cannot change enablement of {0} extension because it contributes language packs.",
                 extension.manifest.displayName || extension.identifier.id
             ))));
@@ -141,14 +141,14 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
             a => a.id === this.userDataSyncAccountService.account.authenticationProviderId
         ))) {
             throw ( new Error(( localize(
-                12787,
+                13037,
                 "Cannot change enablement {0} extension because Settings Sync depends on it.",
                 extension.manifest.displayName || extension.identifier.id
             ))));
         }
         if (this._isEnabledInEnv(extension)) {
             throw ( new Error(( localize(
-                12788,
+                13038,
                 "Cannot change enablement of {0} extension because it is enabled in environment",
                 extension.manifest.displayName || extension.identifier.id
             ))));
@@ -159,37 +159,37 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
         switch (enablementStateOfExtension) {
             case EnablementState.DisabledByEnvironment:
                 throw ( new Error(( localize(
-                    12789,
+                    13039,
                     "Cannot change enablement of {0} extension because it is disabled in environment",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
             case EnablementState.DisabledByMalicious:
                 throw ( new Error(( localize(
-                    12790,
+                    13040,
                     "Cannot change enablement of {0} extension because it is malicious",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
             case EnablementState.DisabledByVirtualWorkspace:
                 throw ( new Error(( localize(
-                    12791,
+                    13041,
                     "Cannot change enablement of {0} extension because it does not support virtual workspaces",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
             case EnablementState.DisabledByExtensionKind:
                 throw ( new Error(( localize(
-                    12792,
+                    13042,
                     "Cannot change enablement of {0} extension because of its extension kind",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
             case EnablementState.DisabledByAllowlist:
                 throw ( new Error(( localize(
-                    12793,
+                    13043,
                     "Cannot change enablement of {0} extension because it is disallowed",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
             case EnablementState.DisabledByInvalidExtension:
                 throw ( new Error(( localize(
-                    12794,
+                    13044,
                     "Cannot change enablement of {0} extension because of it is invalid",
                     extension.manifest.displayName || extension.identifier.id
                 ))));
@@ -202,7 +202,7 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
                         continue;
                     }
                     throw ( new Error(( localize(
-                        12795,
+                        13045,
                         "Cannot enable '{0}' extension because it depends on '{1}' extension that cannot be enabled",
                         extension.manifest.displayName || extension.identifier.id,
                         dependency.manifest.displayName || dependency.identifier.id
@@ -212,11 +212,11 @@ let ExtensionEnablementService = class ExtensionEnablementService extends Dispos
     }
     throwErrorIfCannotChangeWorkspaceEnablement(extension) {
         if (!this.hasWorkspace) {
-            throw ( new Error(( localize(12796, "No workspace."))));
+            throw ( new Error(( localize(13046, "No workspace."))));
         }
         if (isAuthenticationProviderExtension(extension.manifest)) {
             throw ( new Error(( localize(
-                12797,
+                13047,
                 "Cannot change enablement of {0} extension in workspace because it contributes authentication providers",
                 extension.manifest.displayName || extension.identifier.id
             ))));

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js

@@ -605,7 +605,7 @@ let WebExtensionsScannerService = class WebExtensionsScannerService extends Disp
         }
         if (!this.extensionManifestPropertiesService.canExecuteOnWeb(manifest)) {
             throw ( new Error(( localize(
-                12798,
+                13048,
                 "Cannot add '{0}' because this extension is not a web extension.",
                 manifest.displayName || manifest.name
             ))));
@@ -889,7 +889,7 @@ if (isWeb) {
         constructor() {
             super({
                 id: 'workbench.extensions.action.openInstalledWebExtensionsResource',
-                title: ( localize2(12799, 'Open Installed Web Extensions Resource')),
+                title: ( localize2(13049, 'Open Installed Web Extensions Resource')),
                 category: Categories.Developer,
                 f1: true,
                 precondition: IsWebContext

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.js

@@ -87,17 +87,17 @@ let ExtensionFeaturesManagementService = class ExtensionFeaturesManagementServic
             if (feature.access.requireUserConsent) {
                 const extensionDescription = this.extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));
                 const confirmationResult = await this.dialogService.confirm({
-                    title: ( localize(12800, "Access '{0}' Feature", feature.label)),
+                    title: ( localize(13050, "Access '{0}' Feature", feature.label)),
                     message: ( localize(
-                        12801,
+                        13051,
                         "'{0}' extension would like to access the '{1}' feature.",
                         extensionDescription?.displayName ?? extension._lower,
                         feature.label
                     )),
                     detail: justification ?? feature.description,
                     custom: true,
-                    primaryButton: ( localize(12802, "Allow")),
-                    cancelButton: ( localize(12803, "Don't Allow")),
+                    primaryButton: ( localize(13052, "Allow")),
+                    cancelButton: ( localize(13053, "Don't Allow")),
                 });
                 enabled = confirmationResult.confirmed;
             }

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementServerService.js

@@ -22,7 +22,7 @@ let ExtensionManagementServerService = class ExtensionManagementServerService {
             this.remoteExtensionManagementServer = {
                 id: 'remote',
                 extensionManagementService,
-                get label() { return labelService.getHostLabel(Schemas.vscodeRemote, remoteAgentConnection.remoteAuthority) || ( localize(12804, "Remote")); },
+                get label() { return labelService.getHostLabel(Schemas.vscodeRemote, remoteAgentConnection.remoteAuthority) || ( localize(13054, "Remote")); },
             };
         }
         if (isWeb) {
@@ -30,7 +30,7 @@ let ExtensionManagementServerService = class ExtensionManagementServerService {
             this.webExtensionManagementServer = {
                 id: 'web',
                 extensionManagementService,
-                label: ( localize(12805, "Browser")),
+                label: ( localize(13055, "Browser")),
             };
         }
     }

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.js

@@ -38,7 +38,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { verifiedPublisherIcon } from '@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common/vscode/vs/workbench/services/extensionManagement/common/extensionsIcons';
+import { verifiedPublisherIcon } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/workbench/services/extensionManagement/common/extensionsIcons';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { CommontExtensionManagementService } from '../../../../platform/extensionManagement/common/abstractExtensionManagementService.js';
 
@@ -222,7 +222,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
     getDependentsErrorMessage(extension, dependents) {
         if (dependents.length === 1) {
             return localize(
-                12806,
+                13056,
                 "Cannot uninstall extension '{0}'. Extension '{1}' depends on this.",
                 extension.manifest.displayName || extension.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -230,7 +230,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         if (dependents.length === 2) {
             return localize(
-                12807,
+                13057,
                 "Cannot uninstall extension '{0}'. Extensions '{1}' and '{2}' depend on this.",
                 extension.manifest.displayName || extension.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -238,7 +238,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             );
         }
         return localize(
-            12808,
+            13058,
             "Cannot uninstall extension '{0}'. Extensions '{1}', '{2}' and others depend on this.",
             extension.manifest.displayName || extension.manifest.name,
             dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -348,7 +348,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
         if (!manifest) {
-            return ( new MarkdownString()).appendText(( localize(12809, "Manifest is not found")));
+            return ( new MarkdownString()).appendText(( localize(13059, "Manifest is not found")));
         }
         if (this.extensionManagementServerService.remoteExtensionManagementServer
             && (await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.canInstall(gallery)) === true
@@ -361,7 +361,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             return true;
         }
         return ( new MarkdownString()).appendText(( localize(
-            12810,
+            13060,
             "Cannot install the '{0}' extension because it is not available in this setup.",
             gallery.displayName || gallery.name
         )));
@@ -377,7 +377,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             return true;
         }
         return ( new MarkdownString()).appendText(( localize(
-            12810,
+            13060,
             "Cannot install the '{0}' extension because it is not available in this setup.",
             extension.manifest.displayName ?? extension.identifier.id
         )));
@@ -406,7 +406,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             const manifest = await this.extensionGalleryService.getManifest(extension, CancellationToken.None);
             if (!manifest) {
                 throw ( new Error(( localize(
-                    12811,
+                    13061,
                     "Installing Extension {0} failed: Manifest is not found.",
                     extension.displayName || extension.name
                 ))));
@@ -425,7 +425,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 const manifest = await this.extensionGalleryService.getManifest(extension, CancellationToken.None);
                 if (!manifest) {
                     throw ( new Error(( localize(
-                        12811,
+                        13061,
                         "Installing Extension {0} failed: Manifest is not found.",
                         extension.displayName || extension.name
                     ))));
@@ -473,7 +473,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
         if (!manifest) {
             throw ( new Error(( localize(
-                12811,
+                13061,
                 "Installing Extension {0} failed: Manifest is not found.",
                 gallery.displayName || gallery.name
             ))));
@@ -577,7 +577,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
         if (!manifest) {
             return Promise.reject(( localize(
-                12811,
+                13061,
                 "Installing Extension {0} failed: Manifest is not found.",
                 gallery.displayName || gallery.name
             )));
@@ -627,7 +627,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         for (const server of servers) {
             if (!installableServers.includes(server)) {
                 const error = ( new Error(( localize(
-                    12812,
+                    13062,
                     "Cannot install the '{0}' extension because it is not available in the '{1}' setup.",
                     gallery.displayName || gallery.name,
                     server.label
@@ -651,7 +651,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         if (!servers.length) {
             const error = ( new Error(( localize(
-                12810,
+                13060,
                 "Cannot install the '{0}' extension because it is not available in this setup.",
                 gallery.displayName || gallery.name
             ))));
@@ -689,24 +689,24 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         if (this.isExtensionsSyncEnabled()) {
             const { result } = await this.dialogService.prompt({
                 type: Severity.Info,
-                message: extensions.length === 1 ? ( localize(12813, "Install Extension")) : ( localize(12814, "Install Extensions")),
+                message: extensions.length === 1 ? ( localize(13063, "Install Extension")) : ( localize(13064, "Install Extensions")),
                 detail: extensions.length === 1
                     ? ( localize(
-                    12815,
+                    13065,
                     "Would you like to install and synchronize '{0}' extension across your devices?",
                     extensions[0].displayName
                 ))
                     : ( localize(
-                    12816,
+                    13066,
                     "Would you like to install and synchronize extensions across your devices?"
                 )),
                 buttons: [
                     {
-                        label: ( localize(12817, "&&Install")),
+                        label: ( localize(13067, "&&Install")),
                         run: () => false
                     },
                     {
-                        label: ( localize(12818, "Install (Do &&not sync)")),
+                        label: ( localize(13068, "Install (Do &&not sync)")),
                         run: () => true
                     }
                 ],
@@ -755,7 +755,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             const manifest = await this.extensionGalleryService.getManifest(extension, CancellationToken.None);
             if (!manifest) {
                 throw ( new Error(( localize(
-                    12811,
+                    13061,
                     "Installing Extension {0} failed: Manifest is not found.",
                     extension.displayName || extension.name
                 ))));
@@ -787,7 +787,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         const unverfiiedPublishers = allPublishers.filter(p => !p.publisherDomain?.verified);
         const verifiedPublishers = allPublishers.filter(p => p.publisherDomain?.verified);
         const installButton = {
-            label: allPublishers.length > 1 ? ( localize(12819, "Trust Publishers & &&Install")) : ( localize(12820, "Trust Publisher & &&Install")),
+            label: allPublishers.length > 1 ? ( localize(13069, "Trust Publishers & &&Install")) : ( localize(13070, "Trust Publisher & &&Install")),
             run: () => {
                 this.telemetryService.publicLog2('extensions:trustPublisher', { action: 'trust', extensionId: ( untrustedExtensions.map(e => e.identifier.id)).join(',') });
                 this.trustPublishers(...( allPublishers.map(
@@ -796,7 +796,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             }
         };
         const learnMoreButton = {
-            label: ( localize(12821, "&&Learn More")),
+            label: ( localize(13071, "&&Learn More")),
             run: () => {
                 this.telemetryService.publicLog2('extensions:trustPublisher', { action: 'learn', extensionId: ( untrustedExtensions.map(e => e.identifier.id)).join(',') });
                 this.instantiationService.invokeFunction(accessor => accessor.get(ICommandService).executeCommand('vscode.open', ( URI.parse('https://aka.ms/vscode-extension-security'))));
@@ -809,19 +809,19 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         const unverifiedLink = 'https://aka.ms/vscode-verify-publisher';
         const title = allPublishers.length === 1
             ? ( localize(
-            12822,
+            13072,
             "Do you trust the publisher \"{0}\"?",
             allPublishers[0].publisherDisplayName
         ))
             : allPublishers.length === 2
                 ? ( localize(
-            12823,
+            13073,
             "Do you trust publishers \"{0}\" and \"{1}\"?",
             allPublishers[0].publisherDisplayName,
             allPublishers[1].publisherDisplayName
         ))
                 : ( localize(
-            12824,
+            13074,
             "Do you trust the publisher \"{0}\" and {1} others?",
             allPublishers[0].publisherDisplayName,
             allPublishers.length - 1
@@ -832,7 +832,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             const manifest = untrustedExtensionManifests[0];
             if (otherUntrustedPublishers.length) {
                 customMessage.appendMarkdown(( localize(
-                    12825,
+                    13075,
                     "The extension {0} is published by {1}.",
                     `[${extension.displayName}](${extension.detailsLink})`,
                     getPublisherLink(extension)
@@ -843,7 +843,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 )).toString());
                 if (otherUntrustedPublishers.length === 1) {
                     customMessage.appendMarkdown(( localize(
-                        12826,
+                        13076,
                         "Installing this extension will also install [extensions]({0}) published by {1}.",
                         commandUri,
                         getPublisherLink(otherUntrustedPublishers[0])
@@ -851,7 +851,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 }
                 else {
                     customMessage.appendMarkdown(( localize(
-                        12827,
+                        13077,
                         "Installing this extension will also install [extensions]({0}) published by {1} and {2}.",
                         commandUri,
                         ( otherUntrustedPublishers.slice(0, otherUntrustedPublishers.length - 1).map(p => getPublisherLink(p))).join(', '),
@@ -860,13 +860,13 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 }
                 customMessage.appendMarkdown(' ');
                 customMessage.appendMarkdown(( localize(
-                    12828,
+                    13078,
                     "This is the first time you're installing extensions from these publishers."
                 )));
             }
             else {
                 customMessage.appendMarkdown(( localize(
-                    12829,
+                    13079,
                     "The extension {0} is published by {1}. This is the first extension you're installing from this publisher.",
                     `[${extension.displayName}](${extension.detailsLink})`,
                     getPublisherLink(extension)
@@ -875,7 +875,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         else {
             customMessage.appendMarkdown(( localize(
-                12830,
+                13080,
                 "This is the first time you're installing extensions from publishers {0} and {1}.",
                 getPublisherLink(allPublishers[0]),
                 getPublisherLink(allPublishers[allPublishers.length - 1])
@@ -885,7 +885,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             for (const publisher of verifiedPublishers) {
                 customMessage.appendText('\n');
                 const publisherVerifiedMessage = ( localize(
-                    12831,
+                    13081,
                     "{0} has verified ownership of {1}.",
                     getPublisherLink(publisher),
                     `[$(link-external) ${( URI.parse(publisher.publisherDomain.link)).authority}](${publisher.publisherDomain.link})`
@@ -896,7 +896,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 customMessage.appendText('\n');
                 if (unverfiiedPublishers.length === 1) {
                     customMessage.appendMarkdown(`$(${Codicon.unverified.id}) ${( localize(
-                        12832,
+                        13082,
                         "{0} is [**not** verified]({1}).",
                         getPublisherLink(unverfiiedPublishers[0]),
                         unverifiedLink
@@ -904,7 +904,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 }
                 else {
                     customMessage.appendMarkdown(`$(${Codicon.unverified.id}) ${( localize(
-                        12833,
+                        13083,
                         "{0} and {1} are [**not** verified]({2}).",
                         ( unverfiiedPublishers.slice(0, unverfiiedPublishers.length - 1).map(p => getPublisherLink(p))).join(', '),
                         getPublisherLink(unverfiiedPublishers[unverfiiedPublishers.length - 1]),
@@ -915,19 +915,19 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         else {
             customMessage.appendText('\n');
-            customMessage.appendMarkdown(`$(${Codicon.unverified.id}) ${( localize(12834, "All publishers are [**not** verified]({0}).", unverifiedLink))}`);
+            customMessage.appendMarkdown(`$(${Codicon.unverified.id}) ${( localize(13084, "All publishers are [**not** verified]({0}).", unverifiedLink))}`);
         }
         customMessage.appendText('\n');
         if (allPublishers.length > 1) {
             customMessage.appendMarkdown(( localize(
-                12835,
+                13085,
                 "{0} has no control over the behavior of third-party extensions, including how they manage your personal data. Proceed only if you trust the publishers.",
                 this.productService.nameLong
             )));
         }
         else {
             customMessage.appendMarkdown(( localize(
-                12836,
+                13086,
                 "{0} has no control over the behavior of third-party extensions, including how they manage your personal data. Proceed only if you trust the publisher.",
                 this.productService.nameLong
             )));
@@ -1006,13 +1006,13 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
     async checkForWorkspaceTrust(manifest, requireTrust) {
         if (requireTrust || this.extensionManifestPropertiesService.getExtensionUntrustedWorkspaceSupportType(manifest) === false) {
             const buttons = [];
-            buttons.push({ label: ( localize(12837, "Trust Workspace & Install")), type: 'ContinueWithTrust' });
+            buttons.push({ label: ( localize(13087, "Trust Workspace & Install")), type: 'ContinueWithTrust' });
             if (!requireTrust) {
-                buttons.push({ label: ( localize(12838, "Install")), type: 'ContinueWithoutTrust' });
+                buttons.push({ label: ( localize(13088, "Install")), type: 'ContinueWithoutTrust' });
             }
-            buttons.push({ label: ( localize(12839, "Learn More")), type: 'Manage' });
+            buttons.push({ label: ( localize(13089, "Learn More")), type: 'Manage' });
             const trustState = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(12840, "Enabling this extension requires a trusted workspace.")),
+                message: ( localize(13090, "Enabling this extension requires a trusted workspace.")),
                 buttons
             });
             if (trustState === undefined) {
@@ -1036,7 +1036,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
                 throw ( new ExtensionManagementError('Not supported in Web', ExtensionManagementErrorCode.Unsupported));
             }
         }
-        const productName = ( localize(12841, "{0} for the Web", this.productService.nameLong));
+        const productName = ( localize(13091, "{0} for the Web", this.productService.nameLong));
         const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest);
         const virtualWorkspaceSupportReason = getWorkspaceSupportTypeMessage(manifest.capabilities?.virtualWorkspaces);
         const hasLimitedSupport = virtualWorkspaceSupport === 'limited' || !!virtualWorkspaceSupportReason;
@@ -1044,7 +1044,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
             return;
         }
         const limitedSupportMessage = ( localize(
-            12842,
+            13092,
             "'{0}' has limited functionality in {1}.",
             extension.displayName || extension.identifier.id,
             productName
@@ -1053,16 +1053,16 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         let buttons = [];
         let detail;
         const installAnywayButton = {
-            label: ( localize(12843, "&&Install Anyway")),
+            label: ( localize(13093, "&&Install Anyway")),
             run: () => { }
         };
         const showExtensionsButton = {
-            label: ( localize(12844, "&&Show Extensions")),
+            label: ( localize(13094, "&&Show Extensions")),
             run: () => this.instantiationService.invokeFunction(accessor => accessor.get(ICommandService).executeCommand('extension.open', extension.identifier.id, 'extensionPack'))
         };
         if (nonWebExtensions.length && hasLimitedSupport) {
             message = limitedSupportMessage;
-            detail = `${virtualWorkspaceSupportReason ? `${virtualWorkspaceSupportReason}\n` : ''}${( localize(12845, "Contains extensions which are not supported."))}`;
+            detail = `${virtualWorkspaceSupportReason ? `${virtualWorkspaceSupportReason}\n` : ''}${( localize(13095, "Contains extensions which are not supported."))}`;
             buttons = [
                 installAnywayButton,
                 showExtensionsButton
@@ -1075,7 +1075,7 @@ let ExtensionManagementService = class ExtensionManagementService extends Common
         }
         else {
             message = ( localize(
-                12846,
+                13096,
                 "'{0}' contains extensions which are not supported in {1}.",
                 extension.displayName || extension.identifier.id,
                 productName
@@ -1362,7 +1362,7 @@ let WorkspaceExtensionsManagementService = class WorkspaceExtensionsManagementSe
         if (extension.manifest.main) {
             if (!(await this.fileService.exists(this.uriIdentityService.extUri.joinPath(extension.location, extension.manifest.main)))) {
                 isValid = false;
-                validations.push([Severity.Error, ( localize(12847, "Cannot activate because {0} not found", extension.manifest.main))]);
+                validations.push([Severity.Error, ( localize(13097, "Cannot activate because {0} not found", extension.manifest.main))]);
             }
         }
         return {