Add padded version

Oren Novotny · Oren Novotny · commit 7d325a96553c · 2015-10-20T13:41:26.000-04:00
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -7,6 +7,7 @@ minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
 legacy-semver-padding: 4
 build-metadata-padding: 4
+commits-since-lastversion-padding: 4
 commit-message-incrementing: Enabled
 branches:
   master:
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs b/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs
@@ -21,12 +21,13 @@ public TestEffectiveConfiguration(
             string patchMessage = null,
             CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
             int legacySemVerPadding = 4,
-            int buildMetaDataPadding = 4) : 
+            int buildMetaDataPadding = 4,
+            int commitsSinceLastVersionPadding = 4) : 
                 base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage,
-                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding)
+                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceLastVersionPadding)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/TestableVersionVariables.cs b/src/GitVersionCore.Tests/TestableVersionVariables.cs
@@ -4,7 +4,7 @@
 
     class TestableVersionVariables : VersionVariables
     {
-        public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceLastVersion = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceLastVersion)
+        public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceLastVersion = "", string commitsSinceLastVersionPadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceLastVersion, commitsSinceLastVersionPadded)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3-unstable00004",
   "NuGetVersion":"1.2.3-unstable00004",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3-unstable0005",
   "NuGetVersion":"1.2.3-unstable0005",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3-ci0005",
   "NuGetVersion":"1.2.3-ci0005",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -19,5 +19,6 @@
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
   "CommitsSinceLastVersion":5,
+  "CommitsSinceLastVersionPadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -41,6 +41,9 @@ public class Config
         [YamlMember(Alias = "build-metadata-padding")]
         public int? BuildMetaDataPadding { get; set; }
 
+        [YamlMember(Alias = "commits-since-lastversion-padding")]
+        public int? CommitsSinceLastVersionPadding { get; set; }
+
         [YamlMember(Alias = "commit-message-incrementing")]
         public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
 
diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -34,6 +34,7 @@ public static void ApplyDefaultsTo(Config config)
             config.CommitMessageIncrementing = config.CommitMessageIncrementing ?? CommitMessageIncrementMode.Enabled;
             config.LegacySemVerPadding = config.LegacySemVerPadding ?? 4;
             config.BuildMetaDataPadding = config.BuildMetaDataPadding ?? 4;
+            config.CommitsSinceLastVersionPadding = config.CommitsSinceLastVersionPadding ?? 4;
 
             var configBranches = config.Branches.ToList();
 
diff --git a/src/GitVersionCore/EffectiveConfiguration.cs b/src/GitVersionCore/EffectiveConfiguration.cs
@@ -20,7 +20,8 @@ public EffectiveConfiguration(
             string patchVersionBumpMessage,
             CommitMessageIncrementMode commitMessageIncrementing,
             int legacySemVerPaddding,
-            int buildMetaDataPadding
+            int buildMetaDataPadding,
+            int commitsSinceLastVersionPadding
             )
         {
             AssemblyVersioningScheme = assemblyVersioningScheme;
@@ -41,6 +42,7 @@ int buildMetaDataPadding
             CommitMessageIncrementing = commitMessageIncrementing;
             LegacySemVerPadding = legacySemVerPaddding;
             BuildMetaDataPadding = buildMetaDataPadding;
+            CommitsSinceLastVersionPadding = commitsSinceLastVersionPadding;
         }
 
         public VersioningMode VersioningMode { get; private set; }
@@ -81,6 +83,8 @@ int buildMetaDataPadding
         public int LegacySemVerPadding { get; private set; }
         public  int BuildMetaDataPadding { get; private set; }
 
+        public int CommitsSinceLastVersionPadding { get; private set; }
+
         public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
     }
 }
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -120,7 +120,8 @@ void CalculateEffectiveConfiguration()
                 majorMessage, minorMessage, patchMessage,
                 commitMessageVersionBump,
                 configuration.LegacySemVerPadding.Value,
-                configuration.BuildMetaDataPadding.Value);
+                configuration.BuildMetaDataPadding.Value,
+                configuration.CommitsSinceLastVersionPadding.Value);
         }
     }
 }
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -62,7 +62,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 semverFormatValues.CommitDate,
                 semverFormatValues.NuGetVersion,
                 semverFormatValues.NuGetVersionV2,
-                semverFormatValues.CommitsSinceLastVersion);
+                semverFormatValues.CommitsSinceLastVersion,
+                semverFormatValues.CommitsSinceLastVersionPadded);
 
             return variables;
         }
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
@@ -7,7 +7,7 @@
     public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
     {
         public VersionVariables(string major, string minor, string patch, string buildMetaData, string buildMetaDataPadded, string fullBuildMetaData, string branchName, string sha, string majorMinorPatch, string semVer, string legacySemVer, string legacySemVerPadded, string fullSemVer, string assemblySemVer, string preReleaseTag, string preReleaseTagWithDash, string informationalVersion,
-            string commitDate, string nugetVersion, string nugetVersionV2, string commitsSinceLastVersion)
+            string commitDate, string nugetVersion, string nugetVersionV2, string commitsSinceLastVersion, string commitsSinceLastVersionPadded)
         {
             Major = major;
             Minor = minor;
@@ -30,6 +30,7 @@ public VersionVariables(string major, string minor, string patch, string buildMe
             NuGetVersion = nugetVersion;
             NuGetVersionV2 = nugetVersionV2;
             CommitsSinceLastVersion = commitsSinceLastVersion;
+            CommitsSinceLastVersionPadded = commitsSinceLastVersionPadded;
         }
 
         public string Major { get; private set; }
@@ -52,6 +53,7 @@ public VersionVariables(string major, string minor, string patch, string buildMe
         public string NuGetVersionV2 { get; private set; }
         public string NuGetVersion { get; private set; }
         public string CommitsSinceLastVersion { get; private set; }
+        public string CommitsSinceLastVersionPadded { get; private set; }
 
         public static IEnumerable<string> AvailableVariables
         {
diff --git a/src/GitVersionCore/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersionFormatValues.cs
@@ -119,5 +119,10 @@ public string CommitsSinceLastVersion
         {
             get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture); }
         }
-}
+
+        public string CommitsSinceLastVersionPadded
+        {
+            get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture).PadLeft(_config.CommitsSinceLastVersionPadding, '0'); }
+        }
+    }
 }
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "2.3.4-beta0005";
         public static string NuGetVersion = "2.3.4-beta0005";
         public static string CommitsSinceLastVersion = "6";
+        public static string CommitsSinceLastVersionPadded = "0006";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -41,6 +41,7 @@ namespace Fake
         public static string NuGetVersionV2 = "1.2.3-unstable0004";
         public static string NuGetVersion = "1.2.3-unstable0004";
         public static string CommitsSinceLastVersion = "5";
+        public static string CommitsSinceLastVersionPadded = "0005";
         public static string CommitDate = "2014-03-06";
     }
 
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
@@ -77,6 +77,9 @@ public class GetVersion : Task
         [Output]
         public string CommitsSinceLastVersion { get; set; }
 
+        [Output]
+        public string CommitsSinceLastVersionPadded { get; set; }
+
         TaskLogger logger;
         IFileSystem fileSystem;
 
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
@@ -60,6 +60,7 @@
       <Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
       <Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
       <Output TaskParameter="CommitsSinceLastVersion" PropertyName="GitVersion_CommitsSinceLastVersion" />
+      <Output TaskParameter="CommitsSinceLastVersionPadded" PropertyName="GitVersion_CommitsSinceLastVersionPadded" />
     </GetVersion>
 
   </Target>

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@`
`19`	`19`	`"NuGetVersionV2":"1.2.3-unstable0004",`
`20`	`20`	`"NuGetVersion":"1.2.3-unstable0004",`
`21`	`21`	`"CommitsSinceLastVersion":5,`
	`22`	`+ "CommitsSinceLastVersionPadded":"0005",`
`22`	`23`	`"CommitDate":"2014-03-06"`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,13 @@ public TestEffectiveConfiguration(`
`21`	`21`	`string patchMessage = null,`
`22`	`22`	`CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,`
`23`	`23`	`int legacySemVerPadding = 4,`
`24`		`- int buildMetaDataPadding = 4) :`
	`24`	`+ int buildMetaDataPadding = 4,`
	`25`	`+ int commitsSinceLastVersionPadding = 4) :`
`25`	`26`	`base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,`
`26`	`27`	`branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,`
`27`	`28`	`trackMergeTarget,`
`28`	`29`	`majorMessage, minorMessage, patchMessage,`
`29`		`- commitMessageMode, legacySemVerPadding, buildMetaDataPadding)`
	`30`	`+ commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceLastVersionPadding)`
`30`	`31`	`{`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class TestableVersionVariables : VersionVariables`
`6`	`6`	`{`
`7`		- public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceLastVersion = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceLastVersion)
	`7`	+ public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string commitsSinceLastVersion = "", string commitsSinceLastVersionPadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceLastVersion, commitsSinceLastVersionPadded)
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ public EffectiveConfiguration(`
`20`	`20`	`string patchVersionBumpMessage,`
`21`	`21`	`CommitMessageIncrementMode commitMessageIncrementing,`
`22`	`22`	`int legacySemVerPaddding,`
`23`		`- int buildMetaDataPadding`
	`23`	`+ int buildMetaDataPadding,`
	`24`	`+ int commitsSinceLastVersionPadding`
`24`	`25`	`)`
`25`	`26`	`{`
`26`	`27`	`AssemblyVersioningScheme = assemblyVersioningScheme;`
`@@ -41,6 +42,7 @@ int buildMetaDataPadding`
`41`	`42`	`CommitMessageIncrementing = commitMessageIncrementing;`
`42`	`43`	`LegacySemVerPadding = legacySemVerPaddding;`
`43`	`44`	`BuildMetaDataPadding = buildMetaDataPadding;`
	`45`	`+ CommitsSinceLastVersionPadding = commitsSinceLastVersionPadding;`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`public VersioningMode VersioningMode { get; private set; }`
`@@ -81,6 +83,8 @@ int buildMetaDataPadding`
`81`	`83`	`public int LegacySemVerPadding { get; private set; }`
`82`	`84`	`public int BuildMetaDataPadding { get; private set; }`
`83`	`85`
	`86`	`+ public int CommitsSinceLastVersionPadding { get; private set; }`
	`87`	`+`
`84`	`88`	`public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }`
`85`	`89`	`}`
`86`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ void CalculateEffectiveConfiguration()`
`120`	`120`	`majorMessage, minorMessage, patchMessage,`
`121`	`121`	`commitMessageVersionBump,`
`122`	`122`	`configuration.LegacySemVerPadding.Value,`
`123`		`- configuration.BuildMetaDataPadding.Value);`
	`123`	`+ configuration.BuildMetaDataPadding.Value,`
	`124`	`+ configuration.CommitsSinceLastVersionPadding.Value);`
`124`	`125`	`}`
`125`	`126`	`}`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,`
`62`	`62`	`semverFormatValues.CommitDate,`
`63`	`63`	`semverFormatValues.NuGetVersion,`
`64`	`64`	`semverFormatValues.NuGetVersionV2,`
`65`		`- semverFormatValues.CommitsSinceLastVersion);`
	`65`	`+ semverFormatValues.CommitsSinceLastVersion,`
	`66`	`+ semverFormatValues.CommitsSinceLastVersionPadded);`
`66`	`67`
`67`	`68`	`return variables;`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`public class VersionVariables : IEnumerable<KeyValuePair<string, string>>`
`8`	`8`	`{`
`9`	`9`	`public VersionVariables(string major, string minor, string patch, string buildMetaData, string buildMetaDataPadded, string fullBuildMetaData, string branchName, string sha, string majorMinorPatch, string semVer, string legacySemVer, string legacySemVerPadded, string fullSemVer, string assemblySemVer, string preReleaseTag, string preReleaseTagWithDash, string informationalVersion,`
`10`		`- string commitDate, string nugetVersion, string nugetVersionV2, string commitsSinceLastVersion)`
	`10`	`+ string commitDate, string nugetVersion, string nugetVersionV2, string commitsSinceLastVersion, string commitsSinceLastVersionPadded)`
`11`	`11`	`{`
`12`	`12`	`Major = major;`
`13`	`13`	`Minor = minor;`
`@@ -30,6 +30,7 @@ public VersionVariables(string major, string minor, string patch, string buildMe`
`30`	`30`	`NuGetVersion = nugetVersion;`
`31`	`31`	`NuGetVersionV2 = nugetVersionV2;`
`32`	`32`	`CommitsSinceLastVersion = commitsSinceLastVersion;`
	`33`	`+ CommitsSinceLastVersionPadded = commitsSinceLastVersionPadded;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`public string Major { get; private set; }`
`@@ -52,6 +53,7 @@ public VersionVariables(string major, string minor, string patch, string buildMe`
`52`	`53`	`public string NuGetVersionV2 { get; private set; }`
`53`	`54`	`public string NuGetVersion { get; private set; }`
`54`	`55`	`public string CommitsSinceLastVersion { get; private set; }`
	`56`	`+ public string CommitsSinceLastVersionPadded { get; private set; }`
`55`	`57`
`56`	`58`	`public static IEnumerable<string> AvailableVariables`
`57`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,5 +119,10 @@ public string CommitsSinceLastVersion`
`119`	`119`	`{`
`120`	`120`	`get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture); }`
`121`	`121`	`}`
`122`		`-}`
	`122`	`+`
	`123`	`+ public string CommitsSinceLastVersionPadded`
	`124`	`+ {`
	`125`	`+ get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture).PadLeft(_config.CommitsSinceLastVersionPadding, '0'); }`
	`126`	`+ }`
	`127`	`+ }`
`123`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ namespace Fake`
`41`	`41`	`public static string NuGetVersionV2 = "2.3.4-beta0005";`
`42`	`42`	`public static string NuGetVersion = "2.3.4-beta0005";`
`43`	`43`	`public static string CommitsSinceLastVersion = "6";`
	`44`	`+ public static string CommitsSinceLastVersionPadded = "0006";`
`44`	`45`	`public static string CommitDate = "2014-03-06";`
`45`	`46`	`}`
`46`	`47`