Step one of introducing a flag to drop the suffix out of our build versions.
This commit is contained in:
parent
eebd77efe3
commit
35fc8c1d0e
10 changed files with 31 additions and 58 deletions
|
@ -27,15 +27,6 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
[Output]
|
||||
public string ReleaseSuffix { get; set; }
|
||||
|
||||
[Output]
|
||||
public string VersionSuffix { get; set; }
|
||||
|
||||
[Output]
|
||||
public string SimpleVersion { get; set; }
|
||||
|
||||
[Output]
|
||||
public string NugetVersion { get; set; }
|
||||
|
||||
[Output]
|
||||
public string MsiVersion { get; set; }
|
||||
|
||||
|
@ -56,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
|
||||
var branchInfo = new BranchInfo(RepoRoot);
|
||||
|
||||
var buildVersion = new BuildVersion()
|
||||
var buildVersion = new Version
|
||||
{
|
||||
Major = int.Parse(branchInfo.Entries["MAJOR_VERSION"]),
|
||||
Minor = int.Parse(branchInfo.Entries["MINOR_VERSION"]),
|
||||
|
@ -70,9 +61,6 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
VersionPatch = buildVersion.Patch;
|
||||
CommitCount = buildVersion.CommitCountString;
|
||||
ReleaseSuffix = buildVersion.ReleaseSuffix;
|
||||
VersionSuffix = buildVersion.VersionSuffix;
|
||||
SimpleVersion = buildVersion.SimpleVersion;
|
||||
NugetVersion = buildVersion.NuGetVersion;
|
||||
MsiVersion = buildVersion.GenerateMsiVersion();
|
||||
VersionBadgeMoniker = Monikers.GetBadgeMoniker();
|
||||
Channel = branchInfo.Entries["CHANNEL"];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue