Rename CommitsSinceLastVersion -> CommitsSinceVersionSource

Oren Novotny · Oren Novotny · commit bb8d13fdb8b8 · 2015-10-29T13:20:13.000-04:00
diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md
@@ -23,8 +23,8 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "Sha":"28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
   "NuGetVersionV2":"3.0.0-beta0001",
   "NuGetVersion":"3.0.0-beta0001",
-  "CommitsSinceLastVersion":1,
-  "CommitsSinceLastVersionPadded":"0001",
+  "CommitsSinceVersionSource":1,
+  "CommitsSinceVersionSourcePadded":"0001",
   "CommitDate":"2014-03-06"
 }
 ```
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -7,7 +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
+commits-since-version-source-padding: 4
 commit-message-incrementing: Enabled
 branches:
   master:
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs
@@ -391,9 +391,9 @@ public void GitHubFlowMajorRelease()
             fixture.ApplyTag("2.0.0-beta.1");
             fixture.AssertFullSemver("2.0.0-beta.1");
 
-            // test that the CommitsSinceLastVersion should still return commit count
+            // test that the CommitsSinceVersionSource should still return commit count
             var version = fixture.GetVersion();
-            version.CommitsSinceLastVersion.ShouldBe("2");
+            version.CommitsSinceVersionSource.ShouldBe("2");
 
             // Make a commit after a tag should bump up the beta
             fixture.MakeACommit();
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs b/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs
@@ -22,12 +22,12 @@ public TestEffectiveConfiguration(
             CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
             int legacySemVerPadding = 4,
             int buildMetaDataPadding = 4,
-            int commitsSinceLastVersionPadding = 4) : 
+            int commitsSinceVersionSourcePadding = 4) : 
                 base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage,
-                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceLastVersionPadding)
+                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding)
         {
         }
     }
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 = "", 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)
+        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 commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable00004",
   "NuGetVersion":"1.2.3-unstable00004",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0005",
   "NuGetVersion":"1.2.3-unstable0005",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-ci0005",
   "NuGetVersion":"1.2.3-ci0005",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -18,7 +18,7 @@
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
-  "CommitsSinceLastVersion":5,
-  "CommitsSinceLastVersionPadded":"0005",
+  "CommitsSinceVersionSource":5,
+  "CommitsSinceVersionSourcePadded":"0005",
   "CommitDate":"2014-03-06"
 }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.cs b/src/GitVersionCore.Tests/VariableProviderTests.cs
@@ -128,7 +128,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommi
             BuildMetaData =
             {
                 CommitsSinceTag = 5,
-                CommitsSinceLastVersion = 5,
+                CommitsSinceVersionSource = 5,
                 Sha = "commitSha",
                 CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
             }
diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -41,8 +41,8 @@ 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 = "commits-since-version-source-padding")]
+        public int? CommitsSinceVersionSourcePadding { 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,7 +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;
+            config.CommitsSinceVersionSourcePadding = config.CommitsSinceVersionSourcePadding ?? 4;
 
             var configBranches = config.Branches.ToList();
 
diff --git a/src/GitVersionCore/EffectiveConfiguration.cs b/src/GitVersionCore/EffectiveConfiguration.cs
@@ -21,7 +21,7 @@ public EffectiveConfiguration(
             CommitMessageIncrementMode commitMessageIncrementing,
             int legacySemVerPaddding,
             int buildMetaDataPadding,
-            int commitsSinceLastVersionPadding
+            int commitsSinceVersionSourcePadding
             )
         {
             AssemblyVersioningScheme = assemblyVersioningScheme;
@@ -42,7 +42,7 @@ int commitsSinceLastVersionPadding
             CommitMessageIncrementing = commitMessageIncrementing;
             LegacySemVerPadding = legacySemVerPaddding;
             BuildMetaDataPadding = buildMetaDataPadding;
-            CommitsSinceLastVersionPadding = commitsSinceLastVersionPadding;
+            CommitsSinceVersionSourcePadding = commitsSinceVersionSourcePadding;
         }
 
         public VersioningMode VersioningMode { get; private set; }
@@ -83,7 +83,7 @@ int commitsSinceLastVersionPadding
         public int LegacySemVerPadding { get; private set; }
         public  int BuildMetaDataPadding { get; private set; }
 
-        public int CommitsSinceLastVersionPadding { get; private set; }
+        public int CommitsSinceVersionSourcePadding { get; private set; }
 
         public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
     }
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -121,7 +121,7 @@ void CalculateEffectiveConfiguration()
                 commitMessageVersionBump,
                 configuration.LegacySemVerPadding.Value,
                 configuration.BuildMetaDataPadding.Value,
-                configuration.CommitsSinceLastVersionPadding.Value);
+                configuration.CommitsSinceVersionSourcePadding.Value);
         }
     }
 }
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -17,7 +17,7 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
 
                 // For continuous deployment the commits since tag gets promoted to the pre-release number
                 semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
-                semanticVersion.BuildMetaData.CommitsSinceLastVersion = semanticVersion.BuildMetaData.CommitsSinceTag ?? 0;
+                semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag ?? 0;
                 semanticVersion.BuildMetaData.CommitsSinceTag = null;
             }
 
@@ -62,8 +62,8 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 semverFormatValues.CommitDate,
                 semverFormatValues.NuGetVersion,
                 semverFormatValues.NuGetVersionV2,
-                semverFormatValues.CommitsSinceLastVersion,
-                semverFormatValues.CommitsSinceLastVersionPadded);
+                semverFormatValues.CommitsSinceVersionSource,
+                semverFormatValues.CommitsSinceVersionSourcePadded);
 
             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 commitsSinceLastVersionPadded)
+            string commitDate, string nugetVersion, string nugetVersionV2, string commitsSinceVersionSource, string commitsSinceVersionSourcePadded)
         {
             Major = major;
             Minor = minor;
@@ -29,8 +29,8 @@ public VersionVariables(string major, string minor, string patch, string buildMe
             CommitDate = commitDate;
             NuGetVersion = nugetVersion;
             NuGetVersionV2 = nugetVersionV2;
-            CommitsSinceLastVersion = commitsSinceLastVersion;
-            CommitsSinceLastVersionPadded = commitsSinceLastVersionPadded;
+            CommitsSinceVersionSource = commitsSinceVersionSource;
+            CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded;
         }
 
         public string Major { get; private set; }
@@ -52,8 +52,8 @@ public VersionVariables(string major, string minor, string patch, string buildMe
         public string Sha { get; private set; }
         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 string CommitsSinceVersionSource { get; private set; }
+        public string CommitsSinceVersionSourcePadded { get; private set; }
 
         public static IEnumerable<string> AvailableVariables
         {
diff --git a/src/GitVersionCore/SemanticVersionBuildMetaData.cs b/src/GitVersionCore/SemanticVersionBuildMetaData.cs
@@ -17,7 +17,7 @@ public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVer
         public string Sha;
         public string OtherMetaData;
         public DateTimeOffset CommitDate;
-        public int CommitsSinceLastVersion;
+        public int CommitsSinceVersionSource;
 
         public SemanticVersionBuildMetaData()
         {
@@ -30,7 +30,7 @@ public SemanticVersionBuildMetaData(int? commitsSinceTag, string branch, string
             Branch = branch;
             CommitDate = commitDate;
             OtherMetaData = otherMetadata;
-            CommitsSinceLastVersion = commitsSinceTag ?? 0;
+            CommitsSinceVersionSource = commitsSinceTag ?? 0;
         }
 
         public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData buildMetaData)
@@ -150,7 +150,7 @@ public static SemanticVersionBuildMetaData Parse(string buildMetaData)
             if (parsed.Groups["BuildNumber"].Success)
             {
                 semanticVersionBuildMetaData.CommitsSinceTag = int.Parse(parsed.Groups["BuildNumber"].Value);
-                semanticVersionBuildMetaData.CommitsSinceLastVersion = semanticVersionBuildMetaData.CommitsSinceTag ?? 0;
+                semanticVersionBuildMetaData.CommitsSinceVersionSource = semanticVersionBuildMetaData.CommitsSinceTag ?? 0;
             }
 
             if (parsed.Groups["BranchName"].Success)
diff --git a/src/GitVersionCore/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersionFormatValues.cs
@@ -115,14 +115,14 @@ public string DefaultInformationalVersion
             get { return _semver.ToString("i"); }
         }
 
-        public string CommitsSinceLastVersion
+        public string CommitsSinceVersionSource
         {
-            get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture); }
+            get { return _semver.BuildMetaData.CommitsSinceVersionSource.ToString(CultureInfo.InvariantCulture); }
         }
 
-        public string CommitsSinceLastVersionPadded
+        public string CommitsSinceVersionSourcePadded
         {
-            get { return _semver.BuildMetaData.CommitsSinceLastVersion.ToString(CultureInfo.InvariantCulture).PadLeft(_config.CommitsSinceLastVersionPadding, '0'); }
+            get { return _semver.BuildMetaData.CommitsSinceVersionSource.ToString(CultureInfo.InvariantCulture).PadLeft(_config.CommitsSinceVersionSourcePadding, '0'); }
         }
     }
 }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -60,7 +60,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             if (taggedSemanticVersion != null)
             {
                 // set the commit count on the tagged ver
-                taggedSemanticVersion.BuildMetaData.CommitsSinceLastVersion = semver.BuildMetaData.CommitsSinceLastVersion;
+                taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData.CommitsSinceVersionSource;
             }
 
             return taggedSemanticVersion ?? semver;
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
@@ -40,8 +40,8 @@ namespace Fake
         public static string Sha = "commitSha";
         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 CommitsSinceVersionSource = "6";
+        public static string CommitsSinceVersionSourcePadded = "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
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public TestEffectiveConfiguration(`
`22`	`22`	`CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,`
`23`	`23`	`int legacySemVerPadding = 4,`
`24`	`24`	`int buildMetaDataPadding = 4,`
`25`		`- int commitsSinceLastVersionPadding = 4) :`
	`25`	`+ int commitsSinceVersionSourcePadding = 4) :`
`26`	`26`	`base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,`
`27`	`27`	`branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,`
`28`	`28`	`trackMergeTarget,`
`29`	`29`	`majorMessage, minorMessage, patchMessage,`
`30`		`- commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceLastVersionPadding)`
	`30`	`+ commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding)`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`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 = "", 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)
	`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 commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`	`}`