|
|
@@ -1,212 +1,133 @@
|
|
|
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
|
|
|
-index 2abc3f3..a3cbf2d 100644
|
|
|
+index a07c552..e5546e0 100644
|
|
|
--- a/build/gulpfile.reh.js
|
|
|
+++ b/build/gulpfile.reh.js
|
|
|
-@@ -246,8 +246,9 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
|
|
- }
|
|
|
-
|
|
|
+@@ -250,4 +250,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
|
|
|
const name = product.nameShort;
|
|
|
+ const release = packageJson.release;
|
|
|
const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
|
|
|
- .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
|
|
|
+ .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
|
|
|
|
|
|
- const date = new Date().toISOString();
|
|
|
-
|
|
|
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
|
|
|
-index 28f8e52..f17962d 100644
|
|
|
+index 2c075a3..ff98402 100644
|
|
|
--- a/build/gulpfile.vscode.js
|
|
|
+++ b/build/gulpfile.vscode.js
|
|
|
-@@ -187,7 +187,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
- const sources = es.merge(src, extensions)
|
|
|
- .pipe(filter(['**', '!**/*.js.map'], { dot: true }));
|
|
|
+@@ -191,3 +191,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
|
|
|
- let version = packageJson.version;
|
|
|
+ let version = packageJson.version
|
|
|
const quality = product.quality;
|
|
|
-
|
|
|
- if (quality && quality !== 'stable') {
|
|
|
-@@ -195,7 +195,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
- }
|
|
|
-
|
|
|
+@@ -199,3 +199,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
|
|
|
const name = product.nameShort;
|
|
|
- const packageJsonUpdates = { name, version };
|
|
|
+ const release = packageJson.release;
|
|
|
+ const packageJsonUpdates = { name, version, release };
|
|
|
|
|
|
- // for linux url handling
|
|
|
- if (platform === 'linux') {
|
|
|
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
|
|
|
-index 489d9cc..e9f00f3 100644
|
|
|
+index 4a25ca5..ca33d2e 100644
|
|
|
--- a/build/gulpfile.vscode.linux.js
|
|
|
+++ b/build/gulpfile.vscode.linux.js
|
|
|
-@@ -83,7 +83,7 @@ function prepareDebPackage(arch) {
|
|
|
- const dependencies = debianDependenciesGenerator.getDependencies(binaryDir, product.applicationName, debArch, sysroot);
|
|
|
- gulp.src('resources/linux/debian/control.template', { base: '.' })
|
|
|
+@@ -24,4 +24,2 @@ const commit = util.getVersion(root);
|
|
|
+
|
|
|
+-const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
|
|
|
+-
|
|
|
+ /**
|
|
|
+@@ -87,3 +85,3 @@ function prepareDebPackage(arch) {
|
|
|
.pipe(replace('@@NAME@@', product.applicationName))
|
|
|
- .pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
|
|
|
+ .pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
|
|
|
.pipe(replace('@@ARCHITECTURE@@', debArch))
|
|
|
- .pipe(replace('@@DEPENDS@@', dependencies.join(', ')))
|
|
|
- .pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', ')))
|
|
|
-@@ -188,8 +188,7 @@ function prepareRpmPackage(arch) {
|
|
|
- .pipe(replace('@@NAME@@', product.applicationName))
|
|
|
- .pipe(replace('@@NAME_LONG@@', product.nameLong))
|
|
|
+@@ -192,4 +190,3 @@ function prepareRpmPackage(arch) {
|
|
|
.pipe(replace('@@ICON@@', product.linuxIconName))
|
|
|
- .pipe(replace('@@VERSION@@', packageJson.version))
|
|
|
- .pipe(replace('@@RELEASE@@', linuxPackageRevision))
|
|
|
+ .pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
|
|
|
.pipe(replace('@@ARCHITECTURE@@', rpmArch))
|
|
|
- .pipe(replace('@@LICENSE@@', product.licenseName))
|
|
|
- .pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
|
|
|
-@@ -262,7 +261,7 @@ function prepareSnapPackage(arch) {
|
|
|
-
|
|
|
- const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
|
|
|
+@@ -266,3 +263,3 @@ function prepareSnapPackage(arch) {
|
|
|
.pipe(replace('@@NAME@@', product.applicationName))
|
|
|
- .pipe(replace('@@VERSION@@', commit.substr(0, 8)))
|
|
|
+ .pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
|
|
|
// Possible run-on values https://snapcraft.io/docs/architectures
|
|
|
- .pipe(replace('@@ARCHITECTURE@@', arch === 'x64' ? 'amd64' : arch))
|
|
|
- .pipe(rename('snap/snapcraft.yaml'));
|
|
|
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
|
|
|
index 81ba509..43f5377 100644
|
|
|
--- a/build/gulpfile.vscode.win32.js
|
|
|
+++ b/build/gulpfile.vscode.win32.js
|
|
|
-@@ -91,8 +91,8 @@ function buildWin32Setup(arch, target) {
|
|
|
- NameLong: product.nameLong,
|
|
|
- NameShort: product.nameShort,
|
|
|
+@@ -93,4 +93,4 @@ function buildWin32Setup(arch, target) {
|
|
|
DirName: product.win32DirName,
|
|
|
- Version: pkg.version,
|
|
|
- RawVersion: pkg.version.replace(/-\w+$/, ''),
|
|
|
+ Version: `${pkg.version}.${pkg.release}`,
|
|
|
+ RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
|
|
|
NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
|
|
|
- ExeBasename: product.nameShort,
|
|
|
- RegValueName: product.win32RegValueName,
|
|
|
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
|
|
|
-index 00ddb6f..814c964 100644
|
|
|
+index 61659d2..5cafa06 100644
|
|
|
--- a/resources/linux/rpm/code.spec.template
|
|
|
+++ b/resources/linux/rpm/code.spec.template
|
|
|
-@@ -1,6 +1,6 @@
|
|
|
- Name: @@NAME@@
|
|
|
+@@ -2,3 +2,3 @@ Name: @@NAME@@
|
|
|
Version: @@VERSION@@
|
|
|
-Release: @@RELEASE@@.el7
|
|
|
+Release: el7
|
|
|
Summary: Code editing. Redefined.
|
|
|
- Group: Development/Tools
|
|
|
- Vendor: Microsoft Corporation
|
|
|
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
|
|
|
index 1ae8079..0dad6ac 100644
|
|
|
--- a/src/vs/base/common/product.ts
|
|
|
+++ b/src/vs/base/common/product.ts
|
|
|
-@@ -32,6 +32,7 @@ export type ExtensionVirtualWorkspaceSupport = {
|
|
|
-
|
|
|
- export interface IProductConfiguration {
|
|
|
+@@ -34,2 +34,3 @@ export interface IProductConfiguration {
|
|
|
readonly version: string;
|
|
|
+ readonly release: string;
|
|
|
readonly date?: string;
|
|
|
- readonly quality?: string;
|
|
|
- readonly commit?: string;
|
|
|
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
|
|
|
-index 046cb39..3271b6c 100644
|
|
|
---- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
|
|
|
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
|
|
|
-@@ -75,7 +75,7 @@ export class IssueReporter extends Disposable {
|
|
|
- this.issueReporterModel = new IssueReporterModel({
|
|
|
- issueType: configuration.data.issueType || IssueType.Bug,
|
|
|
- versionInfo: {
|
|
|
-- vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
|
|
|
-+ vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} ${configuration.product.release || 'Release unknown'} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
|
|
|
- os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${isLinuxSnap ? ' snap' : ''}`
|
|
|
- },
|
|
|
- extensionsDisabled: !!configuration.disableExtensions,
|
|
|
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
|
|
|
-index b0cc736..035c5cb 100644
|
|
|
---- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
|
|
|
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
|
|
|
-@@ -74,7 +74,7 @@ Type: <b>${this.getIssueTypeTitle()}</b>
|
|
|
-
|
|
|
- ${this._data.issueDescription}
|
|
|
- ${this.getExtensionVersion()}
|
|
|
--VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
|
|
|
-+VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
|
|
|
- OS version: ${this._data.versionInfo && this._data.versionInfo.os}
|
|
|
- Modes:${modes.length ? ' ' + modes.join(', ') : ''}
|
|
|
- ${this.getRemoteOSes()}
|
|
|
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
|
|
|
index e1c60a3..a12d52c 100644
|
|
|
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
|
|
|
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
|
|
|
-@@ -237,7 +237,7 @@ export class DiagnosticsService implements IDiagnosticsService {
|
|
|
-
|
|
|
- private formatEnvironment(info: IMainProcessInfo): string {
|
|
|
+@@ -239,3 +239,3 @@ export class DiagnosticsService implements IDiagnosticsService {
|
|
|
const output: string[] = [];
|
|
|
- output.push(`Version: ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
|
|
|
+ output.push(`Version: ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
|
|
|
output.push(`OS Version: ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
|
|
|
- const cpus = osLib.cpus();
|
|
|
- if (cpus && cpus.length > 0) {
|
|
|
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
|
|
|
index 7e63a16..74d1f26 100644
|
|
|
--- a/src/vs/platform/product/common/product.ts
|
|
|
+++ b/src/vs/platform/product/common/product.ts
|
|
|
-@@ -32,7 +32,7 @@ else if (typeof require?.__$__nodeRequire === 'function') {
|
|
|
- const rootPath = dirname(FileAccess.asFileUri('', require));
|
|
|
-
|
|
|
+@@ -34,3 +34,3 @@ else if (typeof require?.__$__nodeRequire === 'function') {
|
|
|
product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
|
|
|
- const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
|
|
|
+ const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string, release: string };
|
|
|
|
|
|
- // Running out of sources
|
|
|
- if (env['VSCODE_DEV']) {
|
|
|
-@@ -45,7 +45,8 @@ else if (typeof require?.__$__nodeRequire === 'function') {
|
|
|
- }
|
|
|
-
|
|
|
+@@ -47,3 +47,4 @@ else if (typeof require?.__$__nodeRequire === 'function') {
|
|
|
Object.assign(product, {
|
|
|
- version: pkg.version
|
|
|
+ version: pkg.version,
|
|
|
+ release: pkg.release
|
|
|
});
|
|
|
- }
|
|
|
-
|
|
|
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
|
|
|
-index ec4ff95..f721052 100644
|
|
|
+index ec4ff95..36e882f 100644
|
|
|
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
|
|
|
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
|
|
|
-@@ -144,7 +144,8 @@ export class BrowserDialogHandler implements IDialogHandler {
|
|
|
- async about(): Promise<void> {
|
|
|
- const detailString = (useAgo: boolean): string => {
|
|
|
+@@ -146,4 +146,5 @@ export class BrowserDialogHandler implements IDialogHandler {
|
|
|
return localize('aboutDetail',
|
|
|
- "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
|
|
|
+ "Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nBrowser: {4}",
|
|
|
-+ this.productService.release || 'Unknown',
|
|
|
this.productService.version || 'Unknown',
|
|
|
++ this.productService.release || 'Unknown',
|
|
|
this.productService.commit || 'Unknown',
|
|
|
- this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
|
|
|
diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
|
|
|
index dc7430b..23def01 100644
|
|
|
--- a/src/vs/workbench/contrib/issue/browser/issueService.ts
|
|
|
+++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
|
|
|
-@@ -65,6 +65,7 @@ export class WebIssueService implements IWorkbenchIssueService {
|
|
|
- return `ADD ISSUE DESCRIPTION HERE
|
|
|
-
|
|
|
+@@ -67,2 +67,3 @@ export class WebIssueService implements IWorkbenchIssueService {
|
|
|
Version: ${this.productService.version}
|
|
|
+Release: ${this.productService.release ?? 'unknown'}
|
|
|
Commit: ${this.productService.commit ?? 'unknown'}
|
|
|
- User Agent: ${userAgent ?? 'unknown'}
|
|
|
- Embedder: ${this.productService.embedderIdentifier ?? 'unknown'}
|
|
|
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
|
|
-index a4728e7..d1a8b94 100644
|
|
|
+index f63b75f..8e24c02 100644
|
|
|
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
|
|
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
|
|
|
-@@ -167,8 +167,9 @@ export class NativeDialogHandler implements IDialogHandler {
|
|
|
-
|
|
|
- const detailString = (useAgo: boolean): string => {
|
|
|
+@@ -169,4 +169,5 @@ export class NativeDialogHandler implements IDialogHandler {
|
|
|
return localize({ key: 'aboutDetail', comment: ['Electron, Chromium, Node.js and V8 are product names that need no translation'] },
|
|
|
-- "Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChromium: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}",
|
|
|
-+ "Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nElectron: {4}\nChromium: {5}\nNode.js: {6}\nV8: {7}\nOS: {8}",
|
|
|
+- "Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChromium: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}\nSandboxed: {8}",
|
|
|
++ "Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nElectron: {4}\nChromium: {5}\nNode.js: {6}\nV8: {7}\nOS: {8}\nSandboxed: {9}",
|
|
|
version,
|
|
|
+ this.productService.release || 'Unknown',
|
|
|
this.productService.commit || 'Unknown',
|
|
|
- this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
|
|
|
- process.versions['electron'],
|
Baptiste Augrain