Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove version from environment service

Browse Source
This commit is contained in:
Joao Moreno
2016-05-02 16:23:23 +02:00
parent c330ac2a36
commit 7410fdf685
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/code/electron-main/env.ts
View File

@@ -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');

3
src/vs/code/electron-main/sharedProcess.ts
View File

@@ -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;

3
src/vs/code/electron-main/windows.ts
View File

@@ -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;