diff --git a/src/Cake.Common.Tests/Unit/Tools/GitVersion/GitVersionRunnerTests.cs b/src/Cake.Common.Tests/Unit/Tools/GitVersion/GitVersionRunnerTests.cs index bc31ab6428..a2e9f7acb0 100644 --- a/src/Cake.Common.Tests/Unit/Tools/GitVersion/GitVersionRunnerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/GitVersion/GitVersionRunnerTests.cs @@ -284,6 +284,7 @@ public void Should_Tolerate_Bad_Json_Set() InformationalVersion = "0.1.1+Branch.master.Sha.f2467748c78b3c8b37972ad0b30df2e15dfbf2cb", BranchName = "master", Sha = "f2467748c78b3c8b37972ad0b30df2e15dfbf2cb", + ShortSha = "f2467748", NuGetVersionV2 = "0.1.1", NuGetVersion = "0.1.1", CommitsSinceVersionSource = null, @@ -315,6 +316,7 @@ public void Should_Tolerate_Bad_Json_Set() " \"InformationalVersion\":\"0.1.1+Branch.master.Sha.f2467748c78b3c8b37972ad0b30df2e15dfbf2cb\",", " \"BranchName\":\"master\",", " \"Sha\":\"f2467748c78b3c8b37972ad0b30df2e15dfbf2cb\",", + " \"ShortSha\":\"f2467748\",", " \"NuGetVersionV2\":\"0.1.1\",", " \"NuGetVersion\":\"0.1.1\",", " \"CommitsSinceVersionSource\":\"\",", @@ -348,6 +350,7 @@ public void Should_Tolerate_Bad_Json_Set() Assert.Equal(expect.InformationalVersion, result.InformationalVersion); Assert.Equal(expect.BranchName, result.BranchName); Assert.Equal(expect.Sha, result.Sha); + Assert.Equal(expect.ShortSha, result.ShortSha); Assert.Equal(expect.NuGetVersionV2, result.NuGetVersionV2); Assert.Equal(expect.NuGetVersion, result.NuGetVersion); Assert.Equal(expect.CommitsSinceVersionSource, result.CommitsSinceVersionSource); diff --git a/src/Cake.Common/Tools/GitVersion/GitVersion.cs b/src/Cake.Common/Tools/GitVersion/GitVersion.cs index 9050d5a30e..0361694e63 100644 --- a/src/Cake.Common/Tools/GitVersion/GitVersion.cs +++ b/src/Cake.Common/Tools/GitVersion/GitVersion.cs @@ -109,6 +109,11 @@ public sealed class GitVersion /// public string Sha { get; set; } + /// + /// Gets or sets the shortened Git SHA. + /// + public string ShortSha { get; set; } + /// /// Gets or sets the NuGet version for v2. /// diff --git a/src/Cake.Common/Tools/GitVersion/GitVersionInternal.cs b/src/Cake.Common/Tools/GitVersion/GitVersionInternal.cs index 1334e0dfcd..3bf9dc300c 100644 --- a/src/Cake.Common/Tools/GitVersion/GitVersionInternal.cs +++ b/src/Cake.Common/Tools/GitVersion/GitVersionInternal.cs @@ -154,6 +154,13 @@ public string Sha set => GitVersion.Sha = value; } + [DataMember] + public string ShortSha + { + get => GitVersion.ShortSha; + set => GitVersion.ShortSha = value; + } + [DataMember] public string NuGetVersionV2 {