Merge pull request #1405 from pmiossec/add_short_sha

asbjornu · web-flow · commit e4a557c109cd · 2018-10-11T15:42:08.000+02:00
Add "ShortSha" to the data provided by GitVersion
diff --git a/docs/more-info/variables.md b/docs/more-info/variables.md
@@ -24,6 +24,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "InformationalVersion":"3.0.0-beta.1+1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
   "BranchName":"release/3.0.0",
   "Sha":"28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
+  "ShortSha":"28c8531",
   "NuGetVersionV2":"3.0.0-beta0001",
   "NuGetVersion":"3.0.0-beta0001",
   "NuGetPreReleaseTagV2":"beta0001",
diff --git a/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt b/src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
   "BranchName":"feature1",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.0-unstable0004",
   "NuGetVersion":"1.2.0-unstable0004",
   "NuGetPreReleaseTagV2":"unstable0004",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
   "NuGetVersion":"1.2.3-unstable0004",
   "NuGetPreReleaseTagV2":"unstable0004",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3-unstable00004",
   "NuGetVersion":"1.2.3-unstable00004",
   "NuGetPreReleaseTagV2":"unstable0004",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
   "NuGetPreReleaseTagV2":"",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3-unstable0005",
   "NuGetVersion":"1.2.3-unstable0005",
   "NuGetPreReleaseTagV2":"unstable0005",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3-ci.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3-ci0005",
   "NuGetVersion":"1.2.3-ci0005",
   "NuGetPreReleaseTagV2":"ci0005",
diff --git a/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -19,6 +19,7 @@
   "InformationalVersion":"1.2.3+5.Sha.commitSha",
   "BranchName":"",
   "Sha":"commitSha",
+  "ShortSha":"commitShortSha",
   "NuGetVersionV2":"1.2.3",
   "NuGetVersion":"1.2.3",
   "NuGetPreReleaseTagV2":"",
diff --git a/src/GitVersionCore.Tests/Approved/cs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/Approved/cs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
@@ -31,6 +31,7 @@ static class GitVersionInformation
     public static string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
     public static string BranchName = "feature1";
     public static string Sha = "commitSha";
+    public static string ShortSha = "commitShortSha";
     public static string NuGetVersionV2 = "1.2.3-unstable0004";
     public static string NuGetVersion = "1.2.3-unstable0004";
     public static string NuGetPreReleaseTagV2 = "unstable0004";
diff --git a/src/GitVersionCore.Tests/Approved/fs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/Approved/fs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
@@ -31,6 +31,7 @@ module GitVersionInformation
     let InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
     let BranchName = "feature1"
     let Sha = "commitSha"
+    let ShortSha = "commitShortSha"
     let NuGetVersionV2 = "1.2.3-unstable0004"
     let NuGetVersion = "1.2.3-unstable0004"
     let NuGetPreReleaseTagV2 = "unstable0004"
diff --git a/src/GitVersionCore.Tests/Approved/vb/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersionCore.Tests/Approved/vb/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
@@ -32,6 +32,7 @@ NotInheritable Class GitVersionInformation
     Public Shared InformationalVersion As String = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
     Public Shared BranchName As String = "feature1"
     Public Shared Sha As String = "commitSha"
+    Public Shared ShortSha As String = "commitShortSha"
     Public Shared NuGetVersionV2 As String = "1.2.3-unstable0004"
     Public Shared NuGetVersion As String = "1.2.3-unstable0004"
     Public Shared NuGetPreReleaseTagV2 As String = "unstable0004"
diff --git a/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
@@ -463,7 +463,7 @@ private static void VerifyAssemblyInfoFile(
         var fileSystem = Substitute.For<IFileSystem>();
         var version = new SemanticVersion
         {
-            BuildMetaData = new SemanticVersionBuildMetaData(3, "foo", "hash", DateTimeOffset.Now),
+            BuildMetaData = new SemanticVersionBuildMetaData(3, "foo", "hash", "shortHash", DateTimeOffset.Now),
             Major = 2,
             Minor = 3,
             Patch = 1
diff --git a/src/GitVersionCore.Tests/CommitDateTests.cs b/src/GitVersionCore.Tests/CommitDateTests.cs
@@ -23,7 +23,7 @@ public void CommitDateFormatTest(string format, string expectedOutcome)
             var formatValues = new SemanticVersionFormatValues(
                                     new SemanticVersion
                                     {
-                                        BuildMetaData = new SemanticVersionBuildMetaData(0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", new DateTimeOffset(date, TimeSpan.Zero)), // assume time zone is UTC
+                                        BuildMetaData = new SemanticVersionBuildMetaData(0, "master", "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero)), // assume time zone is UTC
 
                                     },
                                     new EffectiveConfiguration(
diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs
@@ -62,6 +62,7 @@ public void CacheFileExistsOnDisk()
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+ShortSha: dd2a29af
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
 NuGetPreReleaseTagV2: test0019
@@ -108,6 +109,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+ShortSha: dd2a29af
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
 NuGetPreReleaseTagV2: test0019
@@ -171,6 +173,7 @@ public void ConfigChangeInvalidatesCache()
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+ShortSha: dd2a29af
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
 NuGetPreReleaseTagV2: test0019
@@ -220,6 +223,7 @@ public void NoCacheBypassesCache()
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
 Sha: dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
+ShortSha: dd2a29af
 NuGetVersionV2: 4.10.3-test0019
 NuGetVersion: 4.10.3-test0019
 NuGetPreReleaseTagV2: test0019
diff --git a/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs b/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs
@@ -38,7 +38,7 @@ public void ShouldCreateFile(string fileExtension)
                 Patch = 3,
                 PreReleaseTag = "unstable4",
                 BuildMetaData = new SemanticVersionBuildMetaData(5,
-                    "feature1", "commitSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
+                    "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
 
             var variables = VariableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
diff --git a/src/GitVersionCore.Tests/InformationalVersionBuilderTests.cs b/src/GitVersionCore.Tests/InformationalVersionBuilderTests.cs
@@ -6,18 +6,18 @@
 [TestFixture]
 public class InformationalVersionBuilderTests : TestBase
 {
-    [TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable645", null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("master", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3+Branch.master.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable3", null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "beta2", null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "alpha2", null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-    public void ValidateInformationalVersionBuilder(string branchName, string sha, int major, int minor, int patch,
+    [TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable645", null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("master", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, "1.2.3+Branch.master.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
         string tag, int? suffix, string versionString)
     {
         var semanticVersion = new SemanticVersion
@@ -26,7 +26,7 @@ public void ValidateInformationalVersionBuilder(string branchName, string sha, i
             Minor = minor,
             Patch = patch,
             PreReleaseTag = tag,
-            BuildMetaData = new SemanticVersionBuildMetaData(suffix, branchName,sha,DateTimeOffset.MinValue),
+            BuildMetaData = new SemanticVersionBuildMetaData(suffix, branchName, sha, shortSha, DateTimeOffset.MinValue),
         };
         var informationalVersion = semanticVersion.ToString("i");
 
diff --git a/src/GitVersionCore.Tests/JsonVersionBuilderTests.cs b/src/GitVersionCore.Tests/JsonVersionBuilderTests.cs
@@ -24,7 +24,7 @@ public void Json()
                 Minor = 2,
                 Patch = 0,
                 PreReleaseTag = "unstable4",
-                BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
+                BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
 
         var config = new TestEffectiveConfiguration();
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 assemblySemFileVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "", string nugetPreReleaseTagV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, assemblySemFileVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2, nugetPreReleaseTag, nugetPreReleaseTagV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
+        public TestableVersionVariables(string major = "", string minor = "", string patch = "", string buildMetaData = "", string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "", string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "", string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "", string informationalVersion = "", string commitDate = "", string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "", string nugetPreReleaseTagV2 = "", string commitsSinceVersionSource = "", string commitsSinceVersionSourcePadded = "") : base(major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer, assemblySemVer, assemblySemFileVer, preReleaseTag, preReleaseTagWithDash, preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2, nugetPreReleaseTag, nugetPreReleaseTagV2, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
         {
         }
     }
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.cs b/src/GitVersionCore.Tests/VariableProviderTests.cs
@@ -29,6 +29,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
         };
 
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
@@ -54,6 +55,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
         };
 
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
@@ -79,6 +81,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
         };
 
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
         var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
@@ -102,6 +105,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
         };
 
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
         var config = new TestEffectiveConfiguration();
@@ -125,6 +129,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
         };
 
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
         var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
@@ -149,6 +154,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommi
                 CommitsSinceTag = 5,
                 CommitsSinceVersionSource = 5,
                 Sha = "commitSha",
+                ShortSha = "commitShortSha",
                 CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
             }
         };
@@ -174,6 +180,7 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagNamePattern()
 
         semVer.BuildMetaData.Branch = "pull/2/merge";
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
         var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNumberPattern: @"[/-](?<number>\d+)[-/]");
@@ -195,6 +202,7 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName
 
         semVer.BuildMetaData.Branch = "feature";
         semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
         var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tag: "useBranchName");
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
diff --git a/src/GitVersionCore/SemanticVersionBuildMetaData.cs b/src/GitVersionCore/SemanticVersionBuildMetaData.cs
diff --git a/src/GitVersionCore/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersionFormatValues.cs
diff --git a/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs b/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs
diff --git a/src/GitVersionTask/GetVersion.cs b/src/GitVersionTask/GetVersion.cs
