Build metadata commit count not cleared properly for continuous deployment.

JakeGinnivan · JakeGinnivan · commit d235b638ab17 · 2015-08-12T12:01:15.000+08:00
Fixes #559
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -1,21 +1,21 @@
-﻿{
-  "Major":1,
-  "Minor":2,
-  "Patch":3,
-  "PreReleaseTag":"unstable.4",
-  "PreReleaseTagWithDash":"-unstable.4",
-  "BuildMetaData":5,
-  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
-  "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3-unstable.4",
-  "LegacySemVer":"1.2.3-unstable4",
-  "LegacySemVerPadded":"1.2.3-unstable0004",
-  "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3-unstable.4+5",
-  "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
-  "BranchName":"develop",
-  "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3-unstable0004",
-  "NuGetVersion":"1.2.3-unstable0004",
-  "CommitDate":"2014-03-06"
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"unstable.4",
+  "PreReleaseTagWithDash":"-unstable.4",
+  "BuildMetaData":5,
+  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3-unstable.4",
+  "LegacySemVer":"1.2.3-unstable4",
+  "LegacySemVerPadded":"1.2.3-unstable0004",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3-unstable.4+5",
+  "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
+  "BranchName":"develop",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3-unstable0004",
+  "NuGetVersion":"1.2.3-unstable0004",
+  "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -1,21 +1,21 @@
-﻿{
-  "Major":1,
-  "Minor":2,
-  "Patch":3,
-  "PreReleaseTag":"",
-  "PreReleaseTagWithDash":"",
-  "BuildMetaData":5,
-  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
-  "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3",
-  "LegacySemVer":"1.2.3",
-  "LegacySemVerPadded":"1.2.3",
-  "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3+5",
-  "InformationalVersion":"1.2.3+5.Branch.develop.Sha.commitSha",
-  "BranchName":"develop",
-  "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3",
-  "NuGetVersion":"1.2.3",
-  "CommitDate":"2014-03-06"
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"",
+  "PreReleaseTagWithDash":"",
+  "BuildMetaData":5,
+  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3",
+  "LegacySemVer":"1.2.3",
+  "LegacySemVerPadded":"1.2.3",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3+5",
+  "InformationalVersion":"1.2.3+5.Branch.develop.Sha.commitSha",
+  "BranchName":"develop",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3",
+  "NuGetVersion":"1.2.3",
+  "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -1,21 +1,21 @@
-﻿{
-  "Major":1,
-  "Minor":2,
-  "Patch":3,
-  "PreReleaseTag":"unstable.5",
-  "PreReleaseTagWithDash":"-unstable.5",
-  "BuildMetaData":5,
-  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
-  "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3-unstable.5",
-  "LegacySemVer":"1.2.3-unstable5",
-  "LegacySemVerPadded":"1.2.3-unstable0005",
-  "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3-unstable.5",
-  "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
-  "BranchName":"develop",
-  "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3-unstable0005",
-  "NuGetVersion":"1.2.3-unstable0005",
-  "CommitDate":"2014-03-06"
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"unstable.5",
+  "PreReleaseTagWithDash":"-unstable.5",
+  "BuildMetaData":"",
+  "FullBuildMetaData":"Branch.develop.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3-unstable.5",
+  "LegacySemVer":"1.2.3-unstable5",
+  "LegacySemVerPadded":"1.2.3-unstable0005",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3-unstable.5",
+  "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
+  "BranchName":"develop",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3-unstable0005",
+  "NuGetVersion":"1.2.3-unstable0005",
+  "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -1,21 +1,21 @@
-﻿{
-  "Major":1,
-  "Minor":2,
-  "Patch":3,
-  "PreReleaseTag":"ci.5",
-  "PreReleaseTagWithDash":"-ci.5",
-  "BuildMetaData":5,
-  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
-  "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3-ci.5",
-  "LegacySemVer":"1.2.3-ci5",
-  "LegacySemVerPadded":"1.2.3-ci0005",
-  "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3-ci.5",
-  "InformationalVersion":"1.2.3-ci.5+Branch.develop.Sha.commitSha",
-  "BranchName":"develop",
-  "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3-ci0005",
-  "NuGetVersion":"1.2.3-ci0005",
-  "CommitDate":"2014-03-06"
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"ci.5",
+  "PreReleaseTagWithDash":"-ci.5",
+  "BuildMetaData":"",
+  "FullBuildMetaData":"Branch.develop.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3-ci.5",
+  "LegacySemVer":"1.2.3-ci5",
+  "LegacySemVerPadded":"1.2.3-ci0005",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3-ci.5",
+  "InformationalVersion":"1.2.3-ci.5+Branch.develop.Sha.commitSha",
+  "BranchName":"develop",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3-ci0005",
+  "NuGetVersion":"1.2.3-ci0005",
+  "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -1,21 +1,21 @@
-﻿{
-  "Major":1,
-  "Minor":2,
-  "Patch":3,
-  "PreReleaseTag":"",
-  "PreReleaseTagWithDash":"",
-  "BuildMetaData":5,
-  "FullBuildMetaData":"5.Sha.commitSha",
-  "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3",
-  "LegacySemVer":"1.2.3",
-  "LegacySemVerPadded":"1.2.3",
-  "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3+5",
-  "InformationalVersion":"1.2.3+5.Sha.commitSha",
-  "BranchName":"",
-  "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3",
-  "NuGetVersion":"1.2.3",
-  "CommitDate":"2014-03-06"
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"",
+  "PreReleaseTagWithDash":"",
+  "BuildMetaData":5,
+  "FullBuildMetaData":"5.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3",
+  "LegacySemVer":"1.2.3",
+  "LegacySemVerPadded":"1.2.3",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3+5",
+  "InformationalVersion":"1.2.3+5.Sha.commitSha",
+  "BranchName":"",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3",
+  "NuGetVersion":"1.2.3",
+  "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -7,7 +7,6 @@ public static VersionVariables GetVariablesFor(
             VersioningMode mode, string continuousDeploymentFallbackTag, 
             bool currentCommitIsTagged)
         {
-            var bmd = semanticVersion.BuildMetaData;
             if (mode == VersioningMode.ContinuousDeployment && !currentCommitIsTagged)
             {
                 semanticVersion = new SemanticVersion(semanticVersion);
@@ -28,18 +27,18 @@ public static VersionVariables GetVariablesFor(
                 patch: semanticVersion.Patch.ToString(),
                 preReleaseTag: semanticVersion.PreReleaseTag,
                 preReleaseTagWithDash: semanticVersion.PreReleaseTag.HasTag() ? "-" + semanticVersion.PreReleaseTag : null,
-                buildMetaData: bmd,
-                fullBuildMetaData: bmd.ToString("f"),
+                buildMetaData: semanticVersion.BuildMetaData,
+                fullBuildMetaData: semanticVersion.BuildMetaData.ToString("f"),
                 majorMinorPatch: string.Format("{0}.{1}.{2}", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch),
                 semVer: semanticVersion.ToString(),
                 legacySemVer: semanticVersion.ToString("l"),
                 legacySemVerPadded: semanticVersion.ToString("lp"),
                 assemblySemVer: semanticVersion.GetAssemblyVersion(assemblyVersioningScheme),
                 fullSemVer: semanticVersion.ToString("f"),
                 informationalVersion: semanticVersion.ToString("i"),
-                branchName: bmd.Branch,
-                sha: bmd.Sha,
-                commitDate: bmd.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"));
+                branchName: semanticVersion.BuildMetaData.Branch,
+                sha: semanticVersion.BuildMetaData.Sha,
+                commitDate: semanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"));
 
             return variables;
         }
