Merge pull request #4804 from jakublatkowski/feature/baseversion

Expose VersionSourceSemVer as Output Variable

Author: arturcic

docs/input/docs/reference/variables.md

@@ -32,6 +32,7 @@ what is available. For the `release/3.0.0` branch of GitVersion it shows:
     "EscapedBranchName": "release-3.022.011",
     "Sha": "28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
     "ShortSha": "28c8531",
+    "VersionSourceSemVer": "3.22.11",
     "VersionSourceSha": "28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
     "CommitsSinceVersionSource": 7,
     "VersionSourceDistance": 7,
@@ -65,6 +66,7 @@ Each property of the above JSON document is described in the below table.
 |         `EscapedBranchName` | Equal to `BranchName`, but with `/` replaced with `-`.                                                                                                                     |
 |                       `Sha` | The SHA of the Git commit.                                                                                                                                                 |
 |                  `ShortSha` | The `Sha` limited to 7 characters.                                                                                                                                         |
+|       `VersionSourceSemVer` | The semantic version of the commit used as version source.                                                                                                                 |
 |          `VersionSourceSha` | The SHA of the commit used as version source.                                                                                                                              |
 | `CommitsSinceVersionSource` | (Deprecated: use `VersionSourceDistance` instead) The number of commits since the version source.                                                                          |
 |     `VersionSourceDistance` | The number of commits since the version source.                                                                                                                            |

src/GitVersion.Core.Tests/CommitDateTests.cs

@@ -15,6 +15,7 @@ public void CommitDateFormatTest(string format, string expectedOutcome)
     {
         var date = new DateTime(2017, 10, 6);
         var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(
+            new SemanticVersion(1, 2, 2),
             "950d2f830f5a2af12a6779a48d20dcbb02351f25",
             0,
             MainBranch,

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -48,6 +48,7 @@ public class GitVersionExecutorTests : TestBase
           "ShortSha": "dd2a29af",
           "UncommittedChanges": 0,
           "VersionSourceDistance": 19,
+          "VersionSourceSemVer": "4.10.2",
           "VersionSourceSha": "4.10.2",
           "WeightedPreReleaseNumber": 19
         }
@@ -420,6 +421,7 @@ public void CalculateVersionFromWorktreeHead()
 
         // Verify
         version.SemVer.ShouldBe("1.0.0");
+        version.VersionSourceSemVer.ShouldBe("1.0.0");
         var commits = worktreeFixture.Repository.Head.Commits;
         version.Sha.ShouldBe(commits.First().Sha);
     }
@@ -483,6 +485,7 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndTagge
 
         // Verify
         version.SemVer.ShouldBe("1.0.1");
+        version.VersionSourceSemVer.ShouldBe("1.0.1");
         var commits = worktreeFixture.Repository.Head.Commits;
         version.Sha.ShouldBe(commits.First().Sha);
     }
@@ -578,6 +581,7 @@ public void CalculateVersionVariables_WithLimitedCloneDepth_AndAllowShallowTrue_
         // Verify that the correct commit is used
         version.Sha.ShouldBe(latestCommit.Sha);
         version.MajorMinorPatch.ShouldBe("2.0.0");
+        version.VersionSourceSemVer.ShouldBe("1.0.0");
 
         // Verify repository is still recognized as shallow
         var repository = this.sp.GetRequiredService<IGitRepository>();

src/GitVersion.Core.Tests/Helpers/TestableGitVersionVariables.cs

@@ -2,29 +2,31 @@
 
 namespace GitVersion.Core.Tests.Helpers;
 
-internal record TestableGitVersionVariables() : GitVersionVariables("",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "");
+internal record TestableGitVersionVariables() : GitVersionVariables(
+    Major: "",
+    Minor: "",
+    Patch: "",
+    BuildMetaData: "",
+    FullBuildMetaData: "",
+    BranchName: "",
+    EscapedBranchName: "",
+    Sha: "",
+    ShortSha: "",
+    MajorMinorPatch: "",
+    SemVer: "",
+    FullSemVer: "",
+    AssemblySemVer: "",
+    AssemblySemFileVer: "",
+    PreReleaseTag: "",
+    PreReleaseTagWithDash: "",
+    PreReleaseLabel: "",
+    PreReleaseLabelWithDash: "",
+    PreReleaseNumber: "",
+    WeightedPreReleaseNumber: "",
+    InformationalVersion: "",
+    CommitDate: "",
+    VersionSourceSemVer: "",
+    VersionSourceSha: "",
+    CommitsSinceVersionSource: "",
+    VersionSourceDistance: "",
+    UncommittedChanges: "");

src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "1.1.2",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 4
 }

src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 0
 }

src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 0
 }

src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 4
 }

src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 0
 }

src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForMainBranchWithEmptyLabel.approved.txt

@@ -23,6 +23,7 @@
   "ShortSha": "commitShortSha",
   "UncommittedChanges": 0,
   "VersionSourceDistance": 5,
+  "VersionSourceSemVer": "",
   "VersionSourceSha": "versionSourceSha",
   "WeightedPreReleaseNumber": 55009
 }