diff --git a/src/vs/code/electron-main/env.ts b/src/vs/code/electron-main/env.ts index 94e7da8666d..687629a1181 100644 --- a/src/vs/code/electron-main/env.ts +++ b/src/vs/code/electron-main/env.ts @@ -59,7 +59,6 @@ export interface IEnvironmentService { userHome: string; appRoot: string; currentWorkingDirectory: string; - version: string; appHome: string; appSettingsHome: string; appSettingsPath: string; @@ -110,9 +109,6 @@ export class EnvService implements IEnvironmentService { private _currentWorkingDirectory: string; get currentWorkingDirectory(): string { return this._currentWorkingDirectory; } - private _version: string; - get version(): string { return this._version; } - private _appHome: string; get appHome(): string { return this._appHome; } @@ -134,7 +130,6 @@ export class EnvService implements IEnvironmentService { constructor() { this._appRoot = path.dirname(URI.parse(require.toUrl('')).fsPath); this._currentWorkingDirectory = process.env['VSCODE_CWD'] || process.cwd(); - this._version = app.getVersion(); this._appHome = app.getPath('userData'); this._appSettingsHome = path.join(this._appHome, 'User'); diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index 1b751863c7a..399fd414b63 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -5,6 +5,7 @@ import * as cp from 'child_process'; import URI from 'vs/base/common/uri'; +import pkg from 'vs/code/node/package'; import { IDisposable } from 'vs/base/common/lifecycle'; import { assign } from 'vs/base/common/objects'; import { IEnvironment } from 'vs/platform/workspace/common/workspace'; @@ -20,7 +21,7 @@ function getEnvironment(envService: IEnvironmentService, updateManager: IUpdateS configuration.execPath = process.execPath; configuration.appName = envService.product.nameLong; configuration.appRoot = envService.appRoot; - configuration.version = envService.version; + configuration.version = pkg.version; configuration.commitHash = envService.product.commit; configuration.appSettingsHome = envService.appSettingsHome; configuration.appSettingsPath = envService.appSettingsPath; diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index a8a8fdbe99a..dea62c92247 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -12,6 +12,7 @@ import * as nls from 'vs/nls'; import * as paths from 'vs/base/common/paths'; import * as arrays from 'vs/base/common/arrays'; import * as objects from 'vs/base/common/objects'; +import pkg from 'vs/code/node/package'; import { EventEmitter } from 'events'; import { IStorageService } from 'vs/code/electron-main/storage'; import { IPath, VSCodeWindow, ReadyState, IWindowConfiguration, IWindowState as ISingleWindowState, defaultWindowState } from 'vs/code/electron-main/window'; @@ -730,7 +731,7 @@ export class WindowsManager implements IWindowsService { configuration.applicationName = this.envService.product.applicationName; configuration.darwinBundleIdentifier = this.envService.product.darwinBundleIdentifier; configuration.appRoot = this.envService.appRoot; - configuration.version = this.envService.version; + configuration.version = pkg.version; configuration.commitHash = this.envService.product.commit; configuration.appSettingsHome = this.envService.appSettingsHome; configuration.appSettingsPath = this.envService.appSettingsPath;