Support for tagging prerelease based on branch ref spec when running in ContinuousDeployment mode. This enables pull request branches to produce unique version numbers when the pull request branch is set to ContinuousDeployment mode.

Author: Simon Ejsing

src/GitVersionCore.Tests/VariableProviderTests.cs

@@ -152,4 +152,27 @@ public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommi
 
         JsonOutputFormatter.ToJson(vars).ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
+
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeForTagNumber()
+    {
+        var semVer = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "PullRequest",
+            BuildMetaData = "5.Branch.develop"
+        };
+
+        semVer.BuildMetaData.Branch = "pull/2/merge";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNamePattern: @"[/-](?<number>\d+)[-/]");
+        var vars = VariableProvider.GetVariablesFor(semVer, config, false);
+
+        vars.FullSemVer.ShouldBe("1.2.3-PullRequest2.5");
+    }
+
 }

src/GitVersionCore/Configuration/BranchConfig.cs

@@ -14,6 +14,7 @@ public BranchConfig(BranchConfig branchConfiguration)
             Tag = branchConfiguration.Tag;
             Increment = branchConfiguration.Increment;
             PreventIncrementOfMergedBranchVersion = branchConfiguration.PreventIncrementOfMergedBranchVersion;
+            TagNamePattern = branchConfiguration.TagNamePattern;
             TagNumberPattern = branchConfiguration.TagNumberPattern;
             TrackMergeTarget = branchConfiguration.TrackMergeTarget;
             CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
@@ -34,6 +35,9 @@ public BranchConfig(BranchConfig branchConfiguration)
         [YamlMember(Alias = "prevent-increment-of-merged-branch-version")]
         public bool? PreventIncrementOfMergedBranchVersion { get; set; }
 
+        [YamlMember(Alias = "tag-name-pattern")]
+        public string TagNamePattern { get; set; }
+
         [YamlMember(Alias = "tag-number-pattern")]
         public string TagNumberPattern { get; set; }
 

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -114,9 +114,11 @@ public static void ApplyBranchDefaults(Config config,
             bool defaultPreventIncrement = false,
             VersioningMode? defaultVersioningMode = null, // Looked up from main config
             bool defaultTrackMergeTarget = false,
-            string defaultTagNumberPattern = null)
+            string defaultTagNumberPattern = null,
+            string defaultTagNamePattern = null)
         {
             branchConfig.Tag = branchConfig.Tag ?? defaultTag;
+            branchConfig.TagNamePattern = branchConfig.TagNamePattern ?? defaultTagNamePattern;
             branchConfig.TagNumberPattern = branchConfig.TagNumberPattern ?? defaultTagNumberPattern;
             branchConfig.Increment = branchConfig.Increment ?? defaultIncrementStrategy;
             branchConfig.PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion ?? defaultPreventIncrement;

src/GitVersionCore/EffectiveConfiguration.cs

@@ -15,6 +15,7 @@ public EffectiveConfiguration(
             string tag, string nextVersion, IncrementStrategy increment,
             string branchPrefixToTrim,
             bool preventIncrementForMergedBranchVersion,
+            string tagNamePattern,
             string tagNumberPattern,
             string continuousDeploymentFallbackTag,
             bool trackMergeTarget,
@@ -37,6 +38,7 @@ IEnumerable<IVersionFilter> versionFilters
             Increment = increment;
             BranchPrefixToTrim = branchPrefixToTrim;
             PreventIncrementForMergedBranchVersion = preventIncrementForMergedBranchVersion;
+            TagNamePattern = tagNamePattern;
             TagNumberPattern = tagNumberPattern;
             ContinuousDeploymentFallbackTag = continuousDeploymentFallbackTag;
             TrackMergeTarget = trackMergeTarget;
@@ -73,6 +75,8 @@ IEnumerable<IVersionFilter> versionFilters
 
         public bool PreventIncrementForMergedBranchVersion { get; private set; }
 
+        public string TagNamePattern { get; private set; }
+
         public string TagNumberPattern { get; private set; }
 
         public string ContinuousDeploymentFallbackTag { get; private set; }

src/GitVersionCore/GitVersionContext.cs

@@ -96,6 +96,7 @@ void CalculateEffectiveConfiguration()
 
             var versioningMode = currentBranchConfig.Value.VersioningMode.Value;
             var tag = currentBranchConfig.Value.Tag;
+            var tagNamePattern = currentBranchConfig.Value.TagNamePattern;
             var tagNumberPattern = currentBranchConfig.Value.TagNumberPattern;
             var incrementStrategy = currentBranchConfig.Value.Increment.Value;
             var preventIncrementForMergedBranchVersion = currentBranchConfig.Value.PreventIncrementOfMergedBranchVersion.Value;
@@ -116,6 +117,7 @@ void CalculateEffectiveConfiguration()
                 assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix,
                 tag, nextVersion, incrementStrategy, currentBranchConfig.Key,
                 preventIncrementForMergedBranchVersion,
+                tagNamePattern,
                 tagNumberPattern, configuration.ContinuousDeploymentFallbackTag,
                 trackMergeTarget,
                 majorMessage, minorMessage, patchMessage,

src/GitVersionCore/OutputVariables/VariableProvider.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.ComponentModel;
+    using System.Text.RegularExpressions;
 
     public static class VariableProvider
     {
@@ -16,6 +17,17 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                     semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
                 }
 
+                // Evaluate tag name pattern and append to prerelease tag
+                if (!string.IsNullOrEmpty(config.TagNamePattern))
+                {
+                    var match = Regex.Match(semanticVersion.BuildMetaData.Branch, config.TagNamePattern);
+                    var numberGroup = match.Groups["number"];
+                    if (numberGroup.Success)
+                    {
+                        semanticVersion.PreReleaseTag.Name += numberGroup.Value;
+                    }
+                }
+
                 // For continuous deployment the commits since tag gets promoted to the pre-release number
                 semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
                 semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag ?? 0;