Skip to content

Commit aa3d78e

Browse files
authored
1 parent e95380d commit aa3d78e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { CancellationToken } from '../../../base/common/cancellation.js';
7-
import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
7+
import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
88
import { areSameExtensions, getExtensionId } from './extensionManagementUtil.js';
99
import { IExtensionStorageService } from './extensionStorage.js';
1010
import { ExtensionType } from '../../extensions/common/extensions.js';
@@ -53,7 +53,7 @@ export async function migrateUnsupportedExtensions(extensionManagementService: I
5353

5454
let preReleaseExtension = installed.find(i => areSameExtensions(i.identifier, { id: preReleaseExtensionId }));
5555
if (!preReleaseExtension || (!preReleaseExtension.isPreReleaseVersion && isUnsupportedExtensionEnabled)) {
56-
preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate });
56+
preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate, context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true } });
5757
logService.info(`Installed the pre-release extension '${preReleaseExtension.identifier.id}'`);
5858
if (!isUnsupportedExtensionEnabled) {
5959
await extensionEnablementService.disableExtension(preReleaseExtension.identifier);

src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { CancellationToken } from '../../../../base/common/cancellation.js';
77
import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
8-
import { IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
8+
import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
99
import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
1010
import { IFileService } from '../../../../platform/files/common/files.js';
1111
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -181,7 +181,7 @@ class RemoteExtensionsInitializer extends AbstractExtensionsInitializer {
181181
const manifest = await this.extensionGalleryService.getManifest(e, CancellationToken.None);
182182
if (manifest && this.extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)) {
183183
const syncedExtension = remoteExtensions.find(e => areSameExtensions(e.identifier, e.identifier));
184-
await this.extensionManagementService.installFromGallery(e, { installPreReleaseVersion: syncedExtension?.preRelease, donotIncludePackAndDependencies: true });
184+
await this.extensionManagementService.installFromGallery(e, { installPreReleaseVersion: syncedExtension?.preRelease, donotIncludePackAndDependencies: true, context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true } });
185185
}
186186
}));
187187
}

src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from '
2020
import { getSyncAreaLabel } from '../common/userDataSync.js';
2121
import { isWeb } from '../../../../base/common/platform.js';
2222
import { Barrier, Promises } from '../../../../base/common/async.js';
23-
import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
23+
import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
2424
import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
2525
import { IExtensionService, toExtensionDescription } from '../../extensions/common/extensions.js';
2626
import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -384,10 +384,10 @@ class NewExtensionsInitializer implements IUserDataSyncResourceInitializer {
384384
}
385385
this.logService.trace(`Installing extension...`, galleryExtension.identifier.id);
386386
const local = await this.extensionManagementService.installFromGallery(galleryExtension, {
387-
isMachineScoped: false, /* set isMachineScoped to prevent install and sync dialog in web */
388387
donotIncludePackAndDependencies: true,
389388
installGivenVersion: !!extensionToSync.version,
390-
installPreReleaseVersion: extensionToSync.preRelease
389+
installPreReleaseVersion: extensionToSync.preRelease,
390+
context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.SETTINGS_SYNC }
391391
});
392392
if (!preview.disabledExtensions.some(identifier => areSameExtensions(identifier, galleryExtension.identifier))) {
393393
newlyEnabledExtensions.push(local);

0 commit comments

Comments
 (0)