Merge branch 'rel/1.0.0' into new_shared_framework_versions

This commit is contained in:
Livar 2017-02-13 13:44:57 -08:00 committed by GitHub
commit 6ef4bdf4e2
16 changed files with 67 additions and 69 deletions

View file

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