Skip to content

Commit debc1fc

Browse files
hayhay27asbjornu
hayhay27
authored and
asbjornu
committed
Add VersionSourceSha to output (#1618)
* Add VersionSourceSha to output VersionSourceSha is sha of baseVersionSource commit in MetadataCalculator * Add some tests for VersionSourceSha
1 parent 6452a63 commit debc1fc

File tree

36 files changed

+171
-55
lines changed

36 files changed

+171
-55
lines changed

‎docs/more-info/variables.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
3030
"NuGetVersion":"3.0.0-beta0001",
3131
"NuGetPreReleaseTagV2":"beta0001",
3232
"NuGetPreReleaseTag":"beta0001",
33+
"VersionSourceSha":"950d2f830f5a2af12a6779a48d20dcbb02351f25",
3334
"CommitsSinceVersionSource":1,
3435
"CommitsSinceVersionSourcePadded":"0001",
3536
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.0-unstable0004",
2626
"NuGetPreReleaseTagV2":"unstable0004",
2727
"NuGetPreReleaseTag":"unstable0004",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3-unstable0004",
2626
"NuGetPreReleaseTagV2":"unstable0004",
2727
"NuGetPreReleaseTag":"unstable0004",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3-unstable00004",
2626
"NuGetPreReleaseTagV2":"unstable0004",
2727
"NuGetPreReleaseTag":"unstable0004",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3",
2626
"NuGetPreReleaseTagV2":"",
2727
"NuGetPreReleaseTag":"",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3-unstable0005",
2626
"NuGetPreReleaseTagV2":"unstable0005",
2727
"NuGetPreReleaseTag":"unstable0005",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3-ci0005",
2626
"NuGetPreReleaseTagV2":"ci0005",
2727
"NuGetPreReleaseTag":"ci0005",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"NuGetVersion":"1.2.3",
2626
"NuGetPreReleaseTagV2":"",
2727
"NuGetPreReleaseTag":"",
28+
"VersionSourceSha":"versionSourceSha",
2829
"CommitsSinceVersionSource":5,
2930
"CommitsSinceVersionSourcePadded":"0005",
3031
"CommitDate":"2014-03-06"

‎src/GitVersionCore.Tests/Approved/WixFileTests.UpdateWixVersionFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
<?define SemVer="1.2.3"?>
2929
<?define Sha="commitSha"?>
3030
<?define ShortSha="commitShortSha"?>
31+
<?define VersionSourceSha="versionSourceSha"?>
3132
<?define WeightedPreReleaseNumber=""?>
3233
</Include>

‎src/GitVersionCore.Tests/Approved/cs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ static class GitVersionInformation
3737
public static string NuGetVersion = "1.2.3-unstable0004";
3838
public static string NuGetPreReleaseTagV2 = "unstable0004";
3939
public static string NuGetPreReleaseTag = "unstable0004";
40+
public static string VersionSourceSha = "versionSourceSha";
4041
public static string CommitsSinceVersionSource = "5";
4142
public static string CommitsSinceVersionSourcePadded = "0005";
4243
public static string CommitDate = "2014-03-06";

‎src/GitVersionCore.Tests/Approved/fs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ module GitVersionInformation
3737
let NuGetVersion = "1.2.3-unstable0004"
3838
let NuGetPreReleaseTagV2 = "unstable0004"
3939
let NuGetPreReleaseTag = "unstable0004"
40+
let VersionSourceSha = "versionSourceSha"
4041
let CommitsSinceVersionSource = "5"
4142
let CommitsSinceVersionSourcePadded = "0005"
4243
let CommitDate = "2014-03-06"

‎src/GitVersionCore.Tests/Approved/vb/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ NotInheritable Class GitVersionInformation
3838
Public Shared NuGetVersion As String = "1.2.3-unstable0004"
3939
Public Shared NuGetPreReleaseTagV2 As String = "unstable0004"
4040
Public Shared NuGetPreReleaseTag As String = "unstable0004"
41+
Public Shared VersionSourceSha As String = "versionSourceSha"
4142
Public Shared CommitsSinceVersionSource As String = "5"
4243
Public Shared CommitsSinceVersionSourcePadded As String = "0005"
4344
Public Shared CommitDate As String = "2014-03-06"

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ private static void VerifyAssemblyInfoFile(
486486
var fileSystem = Substitute.For<IFileSystem>();
487487
var version = new SemanticVersion
488488
{
489-
BuildMetaData = new SemanticVersionBuildMetaData(3, "foo", "hash", "shortHash", DateTimeOffset.Now),
489+
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now),
490490
Major = 2,
491491
Minor = 3,
492492
Patch = 1

‎src/GitVersionCore.Tests/CommitDateTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void CommitDateFormatTest(string format, string expectedOutcome)
2121
var formatValues = new SemanticVersionFormatValues(
2222
new SemanticVersion
2323
{
24-
BuildMetaData = new SemanticVersionBuildMetaData(0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero)), // assume time zone is UTC
24+
BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero)), // assume time zone is UTC
2525

2626
},
2727
new EffectiveConfiguration(

‎src/GitVersionCore.Tests/ExecuteCoreTests.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void CacheKeySameAfterReNormalizing()
3636
var cacheKey2 = GitVersionCacheKeyFactory.Create(fileSystem, gitPreparer, null);
3737

3838
cacheKey2.Value.ShouldBe(cacheKey1.Value);
39-
});
39+
});
4040
}
4141

4242
[Test]
@@ -51,8 +51,8 @@ public void CacheFileExistsOnDisk()
5151
PreReleaseLabel: test
5252
PreReleaseNumber: 19
5353
WeightedPreReleaseNumber: 19
54-
BuildMetaData:
55-
BuildMetaDataPadded:
54+
BuildMetaData:
55+
BuildMetaDataPadded:
5656
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
5757
MajorMinorPatch: 4.10.3
5858
SemVer: 4.10.3-test.19
@@ -69,6 +69,7 @@ public void CacheFileExistsOnDisk()
6969
NuGetVersion: 4.10.3-test0019
7070
NuGetPreReleaseTagV2: test0019
7171
NuGetPreReleaseTag: test0019
72+
VersionSourceSha: 4.10.2
7273
CommitsSinceVersionSource: 19
7374
CommitsSinceVersionSourcePadded: 0019
7475
CommitDate: 2015-11-10
@@ -98,8 +99,8 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
9899
PreReleaseTagWithDash: -test.19
99100
PreReleaseLabel: test
100101
PreReleaseNumber: 19
101-
BuildMetaData:
102-
BuildMetaDataPadded:
102+
BuildMetaData:
103+
BuildMetaDataPadded:
103104
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
104105
MajorMinorPatch: 4.10.3
105106
SemVer: 4.10.3-test.19
@@ -163,8 +164,8 @@ public void ConfigChangeInvalidatesCache()
163164
PreReleaseLabel: test
164165
PreReleaseNumber: 19
165166
WeightedPreReleaseNumber: 19
166-
BuildMetaData:
167-
BuildMetaDataPadded:
167+
BuildMetaData:
168+
BuildMetaDataPadded:
168169
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
169170
MajorMinorPatch: 4.10.3
170171
SemVer: 4.10.3-test.19
@@ -181,6 +182,7 @@ public void ConfigChangeInvalidatesCache()
181182
NuGetVersion: 4.10.3-test0019
182183
NuGetPreReleaseTagV2: test0019
183184
NuGetPreReleaseTag: test0019
185+
VersionSourceSha: 4.10.2
184186
CommitsSinceVersionSource: 19
185187
CommitsSinceVersionSourcePadded: 0019
186188
CommitDate: 2015-11-10
@@ -214,8 +216,8 @@ public void NoCacheBypassesCache()
214216
PreReleaseLabel: test
215217
PreReleaseNumber: 19
216218
WeightedPreReleaseNumber: 19
217-
BuildMetaData:
218-
BuildMetaDataPadded:
219+
BuildMetaData:
220+
BuildMetaDataPadded:
219221
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
220222
MajorMinorPatch: 4.10.3
221223
SemVer: 4.10.3-test.19
@@ -232,6 +234,7 @@ public void NoCacheBypassesCache()
232234
NuGetVersion: 4.10.3-test0019
233235
NuGetPreReleaseTagV2: test0019
234236
NuGetPreReleaseTag: test0019
237+
VersionSourceSha: 4.10.2
235238
CommitsSinceVersionSource: 19
236239
CommitsSinceVersionSourcePadded: 0019
237240
CommitDate: 2015-11-10

‎src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void ShouldCreateFile(string fileExtension)
3434
Minor = 2,
3535
Patch = 3,
3636
PreReleaseTag = "unstable4",
37-
BuildMetaData = new SemanticVersionBuildMetaData(5,
37+
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5,
3838
"feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
3939
};
4040

‎src/GitVersionCore.Tests/InformationalVersionBuilderTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
[TestFixture]
77
public class InformationalVersionBuilderTests : TestBase
88
{
9-
[TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
10-
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
11-
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable645", null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
12-
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
13-
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
14-
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
15-
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
16-
[TestCase("master", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, "1.2.3+Branch.master.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
17-
[TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
18-
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
19-
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
9+
[TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable", "1c6609bcf", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
10+
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
11+
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable645", null, null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
12+
[TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
13+
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
14+
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
15+
[TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
16+
[TestCase("master", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch.master.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
17+
[TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
18+
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
19+
[TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
2020
public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
21-
string tag, int? suffix, string versionString)
21+
string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
2222
{
2323
var semanticVersion = new SemanticVersion
2424
{
2525
Major = major,
2626
Minor = minor,
2727
Patch = patch,
2828
PreReleaseTag = tag,
29-
BuildMetaData = new SemanticVersionBuildMetaData(suffix, branchName, sha, shortSha, DateTimeOffset.MinValue),
29+
BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue),
3030
};
3131
var informationalVersion = semanticVersion.ToString("i");
3232

3333
Assert.AreEqual(versionString, informationalVersion);
3434
}
3535

36-
}
36+
}

‎src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,13 +394,13 @@ public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount
394394

395395
// Make new commit on develop
396396
fixture.Checkout("develop");
397-
// Checkout to release (no new commits)
397+
// Checkout to release (no new commits)
398398
fixture.Checkout("release-2.0.0");
399399
fixture.AssertFullSemver(config, "2.0.0-beta.3");
400400
fixture.Checkout("develop");
401401
fixture.Repository.MakeACommit("develop after merge");
402402

403-
// Checkout to release (no new commits)
403+
// Checkout to release (no new commits)
404404
fixture.Checkout("release-2.0.0");
405405
fixture.AssertFullSemver(config, "2.0.0-beta.3");
406406

@@ -413,7 +413,7 @@ public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount
413413
fixture.Checkout("develop");
414414
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
415415

416-
// Checkout to release (no new commits)
416+
// Checkout to release (no new commits)
417417
fixture.Checkout("release-2.0.0");
418418
fixture.AssertFullSemver(config, "2.0.0-beta.5");
419419
}
@@ -538,7 +538,7 @@ public void FeatureFromReleaseBranch_ShouldNotResetCount()
538538
Commands.Checkout(fixture.Repository, "feature/xxx");
539539
fixture.Repository.MakeACommit("feature 3");
540540

541-
// Checkout to release (no new commits)
541+
// Checkout to release (no new commits)
542542
Commands.Checkout(fixture.Repository, "release-2.0.0");
543543
fixture.AssertFullSemver(config, "2.0.0-beta.11");
544544

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void Json()
2424
Minor = 2,
2525
Patch = 0,
2626
PreReleaseTag = "unstable4",
27-
BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
27+
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
2828
};
2929

3030
var config = new TestEffectiveConfiguration();

‎src/GitVersionCore.Tests/TestableVersionVariables.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionCore.Tests
1+
namespace GitVersionCore.Tests
22
{
33
using GitVersion;
44

@@ -13,13 +13,13 @@ public TestableVersionVariables(
1313
string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "",
1414
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
1515
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
16-
string nugetPreReleaseTagV2 = "", string commitsSinceVersionSource = "",
16+
string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
1717
string commitsSinceVersionSourcePadded = "") : base(
1818
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
1919
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
2020
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
2121
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
22-
nugetPreReleaseTag, nugetPreReleaseTagV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
22+
nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
2323
{
2424
}
2525
}

‎src/GitVersionCore.Tests/VariableProviderTests.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[TestFixture]
88
public class VariableProviderTests : TestBase
9-
{
9+
{
1010

1111
[SetUp]
1212
public void Setup()
@@ -28,6 +28,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
2828
BuildMetaData = "5.Branch.develop"
2929
};
3030

31+
semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
3132
semVer.BuildMetaData.Sha = "commitSha";
3233
semVer.BuildMetaData.ShortSha = "commitShortSha";
3334
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
@@ -54,6 +55,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
5455
BuildMetaData = "5.Branch.develop"
5556
};
5657

58+
semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
5759
semVer.BuildMetaData.Sha = "commitSha";
5860
semVer.BuildMetaData.ShortSha = "commitShortSha";
5961
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
@@ -80,6 +82,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
8082
BuildMetaData = "5.Branch.develop"
8183
};
8284

85+
semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
8386
semVer.BuildMetaData.Sha = "commitSha";
8487
semVer.BuildMetaData.ShortSha = "commitShortSha";
8588
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
@@ -104,6 +107,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
104107
BuildMetaData = "5.Branch.develop"
105108
};
106109

110+
semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
107111
semVer.BuildMetaData.Sha = "commitSha";
108112
semVer.BuildMetaData.ShortSha = "commitShortSha";
109113
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
@@ -128,6 +132,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
128132
BuildMetaData = "5.Branch.develop"
129133
};
130134

135+
semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
131136
semVer.BuildMetaData.Sha = "commitSha";
132137
semVer.BuildMetaData.ShortSha = "commitShortSha";
133138
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
@@ -151,6 +156,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommi
151156
Patch = 3,
152157
BuildMetaData =
153158
{
159+
VersionSourceSha = "versionSourceSha",
154160
CommitsSinceTag = 5,
155161
CommitsSinceVersionSource = 5,
156162
Sha = "commitSha",
@@ -210,4 +216,4 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName
210216

211217
vars.FullSemVer.ShouldBe("1.2.3-feature.5");
212218
}
213-
}
219+
}

0 commit comments

Comments
 (0)