diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts index a986f8771352c434334fb2f04cb2fcb9d6459285..da463d7114d331b3c4d536b6e15555426bef340e 100644 --- a/src/vs/platform/node/product.ts +++ b/src/vs/platform/node/product.ts @@ -19,6 +19,7 @@ export interface IProductConfiguration { updateUrl?: string; quality?: string; commit?: string; + settingsSearchBuildId?: number; date: string; extensionsGallery: { serviceUrl: string; diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts index abf377d3133e98a937b9b33b189ab9ae3f186101..2304834b4c338a3e12b72f53b0613f17292d4adb 100644 --- a/src/vs/workbench/services/configuration/node/configurationService.ts +++ b/src/vs/workbench/services/configuration/node/configurationService.ts @@ -33,7 +33,6 @@ import { IWindowConfiguration } from 'vs/platform/windows/common/windows'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { ICommandService } from 'vs/platform/commands/common/commands'; import product from 'vs/platform/node/product'; -import pkg from 'vs/platform/node/package'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService'; import { WorkspaceConfiguration, FolderConfiguration } from 'vs/workbench/services/configuration/node/configuration'; @@ -662,7 +661,7 @@ interface IConfigurationExport { settings: IExportedConfigurationNode[]; buildTime: number; commit: string; - version: number; + buildNumber: number; } export class DefaultConfigurationExportHelper { @@ -727,19 +726,9 @@ export class DefaultConfigurationExportHelper { settings: settings.sort((a, b) => a.name.localeCompare(b.name)), buildTime: Date.now(), commit: product.commit, - version: versionStringToNumber(pkg.version) + buildNumber: product.settingsSearchBuildId }; return result; } } - -function versionStringToNumber(versionStr: string): number { - const semverRegex = /(\d+)\.(\d+)\.(\d+)/; - const match = versionStr.match(semverRegex); - if (!match) { - return 0; - } - - return parseInt(match[1], 10) * 10000 + parseInt(match[2], 10) * 100 + parseInt(match[3], 10); -} \ No newline at end of file