diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts index d3ab651..8ad9cc6 100644 --- a/build/gulpfile.vscode.ts +++ b/build/gulpfile.vscode.ts @@ -41,3 +41,3 @@ const root = path.dirname(import.meta.dirname); const commit = getVersion(root); -const versionedResourcesFolder = (product as typeof product & { quality?: string })?.quality === 'insider' ? commit!.substring(0, 10) : ''; +const versionedResourcesFolder = ''; @@ -356,8 +356,2 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d ], { base: '.' })); - if (quality && quality === 'insider') { - customElectronConfig = { - createVersionedResources: true, - productVersionString: `${versionedResourcesFolder}`, - }; - } } else if (platform === 'linux') { diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts index a7b01f0..cc60676 100644 --- a/build/gulpfile.vscode.win32.ts +++ b/build/gulpfile.vscode.win32.ts @@ -74,8 +74,4 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask { const quality = (product as typeof product & { quality?: string }).quality || 'dev'; - let versionedResourcesFolder = ''; + const versionedResourcesFolder = ''; let issPath = path.join(import.meta.dirname, 'win32', 'code.iss'); - if (quality && quality === 'insider') { - versionedResourcesFolder = commit!.substring(0, 10); - issPath = path.join(import.meta.dirname, 'win32', 'code-insider.iss'); - } const originalProductJsonPath = path.join(sourcePath, versionedResourcesFolder, 'resources/app/product.json'); diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index ae4fd9c..2572548 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -94,10 +94,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun protected override async initialize(): Promise { - if (this.environmentMainService.isBuilt) { - const cachePath = await this.cachePath; - app.setPath('appUpdate', cachePath); - try { - await unlink(path.join(cachePath, 'session-ending.flag')); - } catch { } - } - if (this.productService.target === 'user' && await this.nativeHostMainService.isAdmin(undefined)) {