Fix #138271

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

@@ -268,8 +268,11 @@ export interface IGalleryMetadata {
 	id: string;
 	publisherId: string;
 	publisherDisplayName: string;
+	isPreReleaseVersion: boolean, 
 }
 
+export type Metadata = Partial<IGalleryMetadata & { isMachineScoped: boolean; isBuiltin: boolean; preRelease: boolean, installedTimestamp: number }>;
+
 export interface ILocalExtension extends IExtension {
 	isMachineScoped: boolean;
 	publisherId: string | null;
@@ -389,7 +392,6 @@ export class ExtensionManagementError extends Error {
 	}
 }
 
-export type Metadata = Partial<IGalleryMetadata & { isMachineScoped: boolean; isBuiltin: boolean; isPreReleaseVersion: boolean, preRelease: boolean, installedTimestamp: number }>;
 export type InstallOptions = { isBuiltin?: boolean, isMachineScoped?: boolean, donotIncludePackAndDependencies?: boolean, installGivenVersion?: boolean, installPreReleaseVersion?: boolean };
 export type InstallVSIXOptions = Omit<InstallOptions, 'installGivenVersion'> & { installOnlyNewlyAddedFromExtensionPack?: boolean };
 export type UninstallOptions = { donotIncludePack?: boolean, donotCheckDependents?: boolean };

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -148,7 +148,11 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 
 	async updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): Promise<ILocalExtension> {
 		this.logService.trace('ExtensionManagementService#updateMetadata', local.identifier.id);
-		local = await this.extensionsScanner.saveMetadataForLocalExtension(local, { ...((<ILocalExtensionManifest>local.manifest).__metadata || {}), ...metadata });
+		const localMetadata: Metadata = { ...((<ILocalExtensionManifest>local.manifest).__metadata || {}), ...metadata };
+		if (metadata.isPreReleaseVersion) {
+			localMetadata.preRelease = true;
+		}
+		local = await this.extensionsScanner.saveMetadataForLocalExtension(local, localMetadata);
 		this.manifestCache.invalidate();
 		return local;
 	}
@@ -354,7 +358,7 @@ class InstallVSIXTask extends AbstractInstallExtensionTask {
 		const identifierWithVersion = new ExtensionIdentifierWithVersion(this.identifier, this.manifest.version);
 		const installedExtensions = await this.extensionsScanner.scanExtensions(ExtensionType.User);
 		const existing = installedExtensions.find(i => areSameExtensions(this.identifier, i.identifier));
-		const metadata = await this.getMetadata(this.identifier.id, token);
+		const metadata = await this.getMetadata(this.identifier.id, this.manifest.version, token);
 		metadata.isMachineScoped = this.options.isMachineScoped || existing?.isMachineScoped;
 		metadata.isBuiltin = this.options.isBuiltin || existing?.isBuiltin;
 
@@ -385,11 +389,14 @@ class InstallVSIXTask extends AbstractInstallExtensionTask {
 		return this.installExtension({ zipPath: path.resolve(this.location.fsPath), identifierWithVersion, metadata }, token);
 	}
 
-	private async getMetadata(name: string, token: CancellationToken): Promise<Metadata> {
+	private async getMetadata(id: string, version: string, token: CancellationToken): Promise<Metadata> {
 		try {
-			const galleryExtension = (await this.galleryService.query({ names: [name], pageSize: 1 }, token)).firstPage[0];
+			let [galleryExtension] = await this.galleryService.getExtensions([{ id, version }], token);
+			if (!galleryExtension) {
+				[galleryExtension] = await this.galleryService.getExtensions([{ id }], token);
+			}
 			if (galleryExtension) {
-				return { id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId };
+				return { id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId, isPreReleaseVersion: galleryExtension.properties.isPreReleaseVersion, preRelease: galleryExtension.properties.isPreReleaseVersion };
 			}
 		} catch (error) {
 			/* Ignore Error */

src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts

@@ -437,14 +437,26 @@ class Extensions extends Disposable {
 			hasChanged = true;
 		}
 
-		const compatible = await this.getCompatibleExtension(gallery, !!extension.local?.isPreReleaseVersion);
+		const compatible = await this.getCompatibleExtension(gallery, extension.local.isPreReleaseVersion);
 		if (compatible) {
-			const local = extension.local.identifier.uuid ? extension.local : await this.server.extensionManagementService.updateMetadata(extension.local, { id: compatible.identifier.uuid, publisherDisplayName: compatible.publisherDisplayName, publisherId: compatible.publisherId });
-			extension.local = local;
 			extension.gallery = compatible;
 			hasChanged = true;
 		}
 
+		if (!extension.local.identifier.uuid) {
+			let galleryExtension = !extension.outdated ? extension.gallery : undefined;
+			if (!galleryExtension) {
+				[galleryExtension] = await this.galleryService.getExtensions([{ ...extension.local.identifier, version: extension.version }], CancellationToken.None);
+			}
+			if (!galleryExtension) {
+				[galleryExtension] = await this.galleryService.getExtensions([extension.local.identifier], CancellationToken.None);
+			}
+			if (galleryExtension) {
+				const local = await this.server.extensionManagementService.updateMetadata(extension.local, { id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId, isPreReleaseVersion: gallery.properties.isPreReleaseVersion });
+				extension.local = local;
+			}
+		}
+
 		const unsupportedPreRelease = extensionsControlManifest.unsupportedPreReleaseExtensions ? extensionsControlManifest.unsupportedPreReleaseExtensions[extension.identifier.id.toLowerCase()] : undefined;
 		if (unsupportedPreRelease) {
 			if (isBoolean(extension.isUnsupported) || !areSameExtensions({ id: extension.isUnsupported.preReleaseExtension.id }, { id: unsupportedPreRelease.id })) {