@codingame/monaco-vscode-extension-gallery-service-override 14.0.5 → 15.0.0

package/index.js

@@ -5,7 +5,7 @@ import { IAllowedExtensionsService, IExtensionTipsService, IGlobalExtensionEnabl
 import { ExtensionGalleryService } from './vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.js';
 import { GlobalExtensionEnablementService } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-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-4ee1e7cc-aa3e-55cb-9689-c49cb8629493-common/vscode/vs/platform/languagePacks/common/languagePacks';
+import { getLocale } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/platform/languagePacks/common/languagePacks';
 import { ExtensionsWorkbenchService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js';
 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';
@@ -19,7 +19,7 @@ import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-d7f
 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-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-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 { ExtensionTipsService } from './vscode/src/vs/platform/extensionManagement/common/extensionTipsService.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "14.0.5",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extension-gallery service-override",
   "keywords": [],
@@ -15,26 +15,25 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "14.0.5",
-    "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "14.0.5",
-    "@codingame/monaco-vscode-10418ae3-ee63-5700-a757-89cbe6564ee4-common": "14.0.5",
-    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.5",
-    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "14.0.5",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.5",
-    "@codingame/monaco-vscode-4ee1e7cc-aa3e-55cb-9689-c49cb8629493-common": "14.0.5",
-    "@codingame/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common": "14.0.5",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.5",
-    "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common": "14.0.5",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "14.0.5",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.5",
-    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "14.0.5",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "14.0.5",
-    "@codingame/monaco-vscode-api": "14.0.5",
-    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "14.0.5",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "14.0.5",
-    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "14.0.5",
-    "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common": "14.0.5",
-    "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.5"
+    "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common": "15.0.0",
+    "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "15.0.0",
+    "@codingame/monaco-vscode-10418ae3-ee63-5700-a757-89cbe6564ee4-common": "15.0.0",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.0",
+    "@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common": "15.0.0",
+    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "15.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.0",
+    "@codingame/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common": "15.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.0",
+    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "15.0.0",
+    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.0",
+    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "15.0.0",
+    "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.0",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "15.0.0",
+    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "15.0.0",
+    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "15.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -44,12 +43,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js",
-      "types": "./vscode/src/*.d.ts"
+      "types": "./vscode/src/*.d.ts",
+      "default": "./vscode/src/*.js"
     },
     "./*": {
-      "default": "./*.js",
-      "types": "./*.d.ts"
+      "types": "./*.d.ts",
+      "default": "./*.js"
     }
   },
   "typesVersions": {

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

@@ -32,7 +32,7 @@ let CommontExtensionManagementService = class CommontExtensionManagementService
         const allowedToInstall = this.allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName });
         if (allowedToInstall !== true) {
             return (new MarkdownString(localize(
-                1695,
+                1700,
                 "This extension cannot be installed because {0}",
                 allowedToInstall.value
             )));
@@ -40,12 +40,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(
-                1696,
+                1701,
                 "The '{0}' extension is not available in {1} for the {2}.",
                 extension.displayName ?? extension.identifier.id,
                 this.productService.nameLong,
                 TargetPlatformToString(await this.getTargetPlatform())
-            ))} [${( localize(1697, "Learn Why"))}](${learnLink})`));
+            ))} [${( localize(1702, "Learn Why"))}](${learnLink})`));
         }
         return true;
     }
@@ -110,7 +110,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw ( new ExtensionManagementError(( localize(1698, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
+            throw ( new ExtensionManagementError(( localize(1703, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
         }
         const results = [];
         const installableExtensions = [];
@@ -229,7 +229,6 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const isApplicationScoped = options.isApplicationScoped || options.isBuiltin || isApplicationScopedExtension(manifest);
                 const installExtensionTaskOptions = {
                     ...options,
-                    installOnlyNewlyAddedFromExtensionPack: options.installOnlyNewlyAddedFromExtensionPack ?? !URI.isUri(extension) ,
                     isApplicationScoped,
                     profileLocation: isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation(),
                     productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date }
@@ -249,11 +248,12 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 else {
                     try {
-                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, !!task.options.installOnlyNewlyAddedFromExtensionPack, !!task.options.installPreReleaseVersion, task.options.profileLocation, task.options.productVersion);
+                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, !!task.options.installPreReleaseVersion, task.options.productVersion);
                         const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
                         const options = { ...task.options, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
                         for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
-                            if (( installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier)))) {
+                            const existing = installed.find(e => areSameExtensions(e.identifier, gallery.identifier));
+                            if (existing && existing.isApplicationScoped === !!options.isApplicationScoped) {
                                 continue;
                             }
                             createInstallExtensionTask(manifest, gallery, options, task);
@@ -471,11 +471,10 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         throw error;
     }
-    async getAllDepsAndPackExtensions(extensionIdentifier, manifest, getOnlyNewlyAddedFromExtensionPack, installPreRelease, profile, productVersion) {
+    async getAllDepsAndPackExtensions(extensionIdentifier, manifest, installPreRelease, productVersion) {
         if (!this.galleryService.isEnabled()) {
             return [];
         }
-        const installed = await this.getInstalled(undefined, profile, productVersion);
         const knownIdentifiers = [];
         const allDependenciesAndPacks = [];
         const collectDependenciesAndPackExtensionsToInstall = async (extensionIdentifier, manifest) => {
@@ -483,12 +482,9 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             const dependecies = manifest.extensionDependencies || [];
             const dependenciesAndPackExtensions = [...dependecies];
             if (manifest.extensionPack) {
-                const existing = getOnlyNewlyAddedFromExtensionPack ? installed.find(e => areSameExtensions(e.identifier, extensionIdentifier)) : undefined;
                 for (const extension of manifest.extensionPack) {
-                    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);
-                        }
+                    if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
+                        dependenciesAndPackExtensions.push(extension);
                     }
                 }
             }
@@ -528,7 +524,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (isMalicious(extension.identifier, extensionsControlManifest)) {
             throw ( new ExtensionManagementError(( localize(
-                1699,
+                1704,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
             )), ExtensionManagementErrorCode.Malicious));
@@ -539,7 +535,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(
-                    1700,
+                    1705,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
@@ -550,7 +546,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if ((await this.canInstall(extension)) !== true) {
                 const targetPlatform = await this.getTargetPlatform();
                 throw ( new ExtensionManagementError(( localize(
-                    1696,
+                    1701,
                     "The '{0}' extension is not available in {1} for the {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -562,7 +558,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( new ExtensionManagementError(( localize(
-                        1701,
+                        1706,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
@@ -570,13 +566,13 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 if (!installPreRelease && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
                     throw ( new ExtensionManagementError(( localize(
-                        1702,
+                        1707,
                         "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(
-                    1703,
+                    1708,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -750,7 +746,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
                 return localize(
-                    1704,
+                    1709,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -758,7 +754,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             if (dependents.length === 2) {
                 return localize(
-                    1705,
+                    1710,
                     "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,
@@ -766,7 +762,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 );
             }
             return localize(
-                1706,
+                1711,
                 "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,
@@ -775,7 +771,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 1) {
             return localize(
-                1707,
+                1712,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -785,7 +781,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 2) {
             return localize(
-                1708,
+                1713,
                 "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
@@ -795,7 +791,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             );
         }
         return localize(
-            1709,
+            1714,
             "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(1710, "it is not in the [allowed list]({0})", settingsCommandLink))));
+        const extensionReason = ( new MarkdownString(( localize(1715, "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(
-                    1711,
+                    1716,
                     "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(
-                    1712,
+                    1717,
                     "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(
-                    1713,
+                    1718,
                     "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(
-                    1714,
+                    1719,
                     "the pre-release versions from this publisher are not in the [allowed list]({1})",
                     publisherKey,
                     settingsCommandLink

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

@@ -42,7 +42,6 @@ declare abstract class AbstractExtensionGalleryService implements IExtensionGall
     private readonly allowedExtensionsService;
     readonly _serviceBrand: undefined;
     private readonly extensionsGalleryUrl;
-    private readonly extensionsGallerySearchUrl;
     private readonly extensionsControlUrl;
     private readonly extensionUrlTemplate;
     private readonly commonHeadersPromise;

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

@@ -331,9 +331,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         this.configurationService = configurationService;
         this.allowedExtensionsService = allowedExtensionsService;
         const config = productService.extensionsGallery;
-        const isPPEEnabled = config?.servicePPEUrl && configurationService.getValue('_extensionsGallery.enablePPE');
-        this.extensionsGalleryUrl = isPPEEnabled ? config.servicePPEUrl : config?.serviceUrl;
-        this.extensionsGallerySearchUrl = isPPEEnabled ? undefined : config?.searchUrl;
+        this.extensionsGalleryUrl = config?.serviceUrl;
         this.extensionsControlUrl = config?.controlUrl;
         this.extensionUrlTemplate = config?.extensionUrlTemplate;
         this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
@@ -728,7 +726,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         try {
             context = await this.requestService.request({
                 type: 'POST',
-                url: this.extensionsGallerySearchUrl && ( query.criteria.some(c => c.filterType === FilterType.SearchText)) ? this.extensionsGallerySearchUrl : this.api('/extensionquery'),
+                url: this.api('/extensionquery'),
                 data,
                 headers
             }, token);
@@ -857,7 +855,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             fallbackUri: `${extension.assets.download.fallbackUri}${( URI.parse(extension.assets.download.fallbackUri)).query ? '&' : '?'}${operationParam}=true`
         } : extension.assets.download;
         const headers = extension.queryContext?.[ACTIVITY_HEADER_NAME] ? { [ACTIVITY_HEADER_NAME]: extension.queryContext[ACTIVITY_HEADER_NAME] } : undefined;
-        const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, headers ? { headers } : undefined);
+        const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, extension.version, headers ? { headers } : undefined);
         try {
             await this.fileService.writeFile(location, context.stream);
         }
@@ -877,7 +875,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             throw ( new Error('No signature asset found'));
         }
         this.logService.trace('ExtensionGalleryService#downloadSignatureArchive', extension.identifier.id);
-        const context = await this.getAsset(extension.identifier.id, extension.assets.signature, AssetType.Signature);
+        const context = await this.getAsset(extension.identifier.id, extension.assets.signature, AssetType.Signature, extension.version);
         try {
             await this.fileService.writeFile(location, context.stream);
         }
@@ -893,7 +891,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
     }
     async getReadme(extension, token) {
         if (extension.assets.readme) {
-            const context = await this.getAsset(extension.identifier.id, extension.assets.readme, AssetType.Details, {}, token);
+            const context = await this.getAsset(extension.identifier.id, extension.assets.readme, AssetType.Details, extension.version, {}, token);
             const content = await asTextOrError(context);
             return content || '';
         }
@@ -901,7 +899,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
     }
     async getManifest(extension, token) {
         if (extension.assets.manifest) {
-            const context = await this.getAsset(extension.identifier.id, extension.assets.manifest, AssetType.Manifest, {}, token);
+            const context = await this.getAsset(extension.identifier.id, extension.assets.manifest, AssetType.Manifest, extension.version, {}, token);
             const text = await asTextOrError(context);
             return text ? JSON.parse(text) : null;
         }
@@ -913,13 +911,13 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             throw ( new Error('Manifest was not found'));
         }
         const headers = { 'Accept-Encoding': 'gzip' };
-        const context = await this.getAsset(extension, manifestAsset, AssetType.Manifest, { headers });
+        const context = await this.getAsset(extension, manifestAsset, AssetType.Manifest, rawExtensionVersion.version, { headers });
         return await asJson(context);
     }
     async getCoreTranslation(extension, languageId) {
         const asset = extension.assets.coreTranslations.filter(t => t[0] === languageId.toUpperCase())[0];
         if (asset) {
-            const context = await this.getAsset(extension.identifier.id, asset[1], asset[0]);
+            const context = await this.getAsset(extension.identifier.id, asset[1], asset[0], extension.version);
             const text = await asTextOrError(context);
             return text ? JSON.parse(text) : null;
         }
@@ -927,7 +925,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
     }
     async getChangelog(extension, token) {
         if (extension.assets.changelog) {
-            const context = await this.getAsset(extension.identifier.id, extension.assets.changelog, AssetType.Changelog, {}, token);
+            const context = await this.getAsset(extension.identifier.id, extension.assets.changelog, AssetType.Changelog, extension.version, {}, token);
             const content = await asTextOrError(context);
             return content || '';
         }
@@ -977,7 +975,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return result;
     }
-    async getAsset(extension, asset, assetType, options = {}, token = CancellationToken.None) {
+    async getAsset(extension, asset, assetType, extensionVersion, options = {}, token = CancellationToken.None) {
         const commonHeaders = await this.commonHeadersPromise;
         const baseOptions = { type: 'GET' };
         const headers = { ...commonHeaders, ...(options.headers || {}) };
@@ -998,7 +996,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 throw err;
             }
             const message = getErrorMessage(err);
-            this.telemetryService.publicLog2('galleryService:cdnFallback', { extension, assetType, message });
+            this.telemetryService.publicLog2('galleryService:cdnFallback', { extension, assetType, message, extensionVersion });
             const fallbackOptions = { ...options, url: fallbackUrl };
             return this.requestService.request(fallbackOptions, token);
         }
@@ -1006,7 +1004,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
     async getEngine(extension, rawExtensionVersion) {
         let engine = getEngine(rawExtensionVersion);
         if (!engine) {
-            this.telemetryService.publicLog2('galleryService:engineFallback', { extension, version: rawExtensionVersion.version });
+            this.telemetryService.publicLog2('galleryService:engineFallback', { extension, extensionVersion: rawExtensionVersion.version });
             const manifest = await this.getManifestFromRawExtensionVersion(extension, rawExtensionVersion, CancellationToken.None);
             if (!manifest) {
                 throw ( new Error('Manifest was not found'));
@@ -1025,6 +1023,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         const context = await this.requestService.request({
             type: 'GET',
             url: this.extensionsControlUrl,
+            timeout: 10000
         }, CancellationToken.None);
         if (context.res.statusCode !== 200) {
             throw ( new Error('Could not get extensions report.'));

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

@@ -1,6 +1,6 @@
 
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
@@ -35,7 +35,7 @@ async function migrateUnsupportedExtensions(extensionManagementService, galleryS
                 logService.info(`Uninstalled the unsupported extension '${unsupportedExtension.identifier.id}'`);
                 let preReleaseExtension = installed.find(i => areSameExtensions(i.identifier, { id: preReleaseExtensionId }));
                 if (!preReleaseExtension || (!preReleaseExtension.isPreReleaseVersion && isUnsupportedExtensionEnabled)) {
-                    preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate });
+                    preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate, context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true } });
                     logService.info(`Installed the pre-release extension '${preReleaseExtension.identifier.id}'`);
                     if (!isUnsupportedExtensionEnabled) {
                         await extensionEnablementService.disableExtension(preReleaseExtension.identifier);

package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.d.ts

@@ -13,13 +13,13 @@ import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 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 { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IExtensionFeaturesManagementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures.service";
 import { IExtensionHostProfile, IExtensionsStatus } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IExtension } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions";
+import { IExtension } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/extensions/common/extensions";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 interface IExtensionProfileInformation {
     segments: number[];