diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index cff41ae8..07ce2f89 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -56,7 +56,7 @@ export type ExtensionVirtualWorkspaceSupport = { export interface IProductConfiguration { readonly version: string; - readonly voidVersion?: string; // Void added this + readonly voidVersion: string; // Void added this readonly release: string; // VSCodium added this readonly date?: string; readonly quality?: string; diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts index d798533a..21e68232 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts @@ -105,7 +105,9 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau } const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2'); - const currentVersion = `${this.productService.version}+${this.productService.release}`; + const currentVersion = `${this.productService.voidVersion}+${this.productService.release}`; + // Void compares voidVersion, not VSCode version + // const currentVersion = `${this.productService.version}+${this.productService.release}`; if (semver.compareBuild(currentVersion, fetchedVersion) >= 0) { this.setState(State.Idle(UpdateType.Setup)); diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index 90030616..f097fd5b 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -144,7 +144,9 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun } const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2'); - const currentVersion = `${this.productService.version}+${this.productService.release}`; + const currentVersion = `${this.productService.voidVersion}+${this.productService.release}`; + // Void compares voidVersion, not VSCode version + // const currentVersion = `${this.productService.version}+${this.productService.release}`; if (semver.compareBuild(currentVersion, fetchedVersion) >= 0) { this.setState(State.Idle(updateType));