Skip to content

Commit 4f5b42b

Browse files
author
Oren Novotny
committed
Add property to always expose commits since last version
1 parent 90b8744 commit 4f5b42b

File tree

28 files changed

+60
-6
lines changed

28 files changed

+60
-6
lines changed

src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ string GetParticipant(string branch)
148148
return branch;
149149
}
150150

151-
VersionVariables GetVersion(IRepository repository = null, string commitId = null)
151+
public VersionVariables GetVersion(IRepository repository = null, string commitId = null)
152152
{
153153
var gitVersionContext = new GitVersionContext(repository ?? Repository, configuration, IsForTrackedBranchOnly, commitId);
154154
var executeGitVersion = ExecuteGitVersion(gitVersionContext);

src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using GitVersion;
22
using NUnit.Framework;
3+
using Shouldly;
34

45
[TestFixture]
56
public class DocumentationSamples
@@ -390,6 +391,10 @@ public void GitHubFlowMajorRelease()
390391
fixture.ApplyTag("2.0.0-beta.1");
391392
fixture.AssertFullSemver("2.0.0-beta.1");
392393

394+
// test that the CommitsSinceLastVersion should still return commit count
395+
var version = fixture.GetVersion();
396+
version.CommitsSinceLastVersion.ShouldBe("2");
397+
393398
// Make a commit after a tag should bump up the beta
394399
fixture.MakeACommit();
395400
fixture.AssertFullSemver("2.0.0-beta.2+3");

src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3-unstable0004",
2020
"NuGetVersion":"1.2.3-unstable0004",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/TestableVersionVariables.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class TestableVersionVariables : VersionVariables
66
{
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 = null) : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, preReleaseTag, preReleaseTagWithDash, informationalVersion, commitDate, nugetVersion, nugetVersionV2)
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)
88
{
99
}
1010
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3-unstable0004",
2020
"NuGetVersion":"1.2.3-unstable0004",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3-unstable00004",
2020
"NuGetVersion":"1.2.3-unstable00004",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3",
2020
"NuGetVersion":"1.2.3",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3-unstable0005",
2020
"NuGetVersion":"1.2.3-unstable0005",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3-ci0005",
2020
"NuGetVersion":"1.2.3-ci0005",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"Sha":"commitSha",
1919
"NuGetVersionV2":"1.2.3",
2020
"NuGetVersion":"1.2.3",
21+
"CommitsSinceLastVersion":5,
2122
"CommitDate":"2014-03-06"
2223
}

0 commit comments

Comments
 (0)