Reuse the tagNumberPattern option for ContinuousDeployment scenario and fix for useBranchName as the tag value

Author: Simon Ejsing

src/GitVersionCore.Tests/VariableProviderTests.cs

@@ -169,10 +169,30 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagNamePattern()
         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 config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNumberPattern: @"[/-](?<number>\d+)[-/]");
         var vars = VariableProvider.GetVariablesFor(semVer, config, false);
 
         vars.FullSemVer.ShouldBe("1.2.3-PullRequest2.5");
     }
 
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName()
+    {
+        var semVer = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
+
+        semVer.BuildMetaData.Branch = "feature";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tag: "useBranchName");
+        var vars = VariableProvider.GetVariablesFor(semVer, config, false);
+
+        vars.FullSemVer.ShouldBe("1.2.3-feature.5");
+    }
 }

src/GitVersionCore/OutputVariables/VariableProvider.cs

@@ -3,6 +3,7 @@
     using System;
     using System.ComponentModel;
     using System.Text.RegularExpressions;
+    using GitVersion.VersionCalculation;
 
     public static class VariableProvider
     {
@@ -14,13 +15,17 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 // Continuous Deployment always requires a pre-release tag unless the commit is tagged
                 if (!semanticVersion.PreReleaseTag.HasTag())
                 {
-                    semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
+                    semanticVersion.PreReleaseTag.Name = NextVersionCalculator.GetBranchSpecificTag(config, semanticVersion.BuildMetaData.Branch, null);
+                    if (string.IsNullOrEmpty(semanticVersion.PreReleaseTag.Name))
+                    {
+                        semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
+                    }
                 }
 
-                // Evaluate tag name pattern and append to prerelease tag
-                if (!string.IsNullOrEmpty(config.TagNamePattern))
+                // Evaluate tag number pattern and append to prerelease tag, preserving build metadata
+                if (!string.IsNullOrEmpty(config.TagNumberPattern))
                 {
-                    var match = Regex.Match(semanticVersion.BuildMetaData.Branch, config.TagNamePattern);
+                    var match = Regex.Match(semanticVersion.BuildMetaData.Branch, config.TagNumberPattern);
                     var numberGroup = match.Groups["number"];
                     if (numberGroup.Success)
                     {

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -69,24 +69,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
 
         void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVersion, string branchNameOverride)
         {
-            var tagToUse = context.Configuration.Tag;
-            if (tagToUse == "useBranchName")
-            {
-                tagToUse = "{BranchName}";
-            }
-            if (tagToUse.Contains("{BranchName}"))
-            {
-                Logger.WriteInfo("Using branch name to calculate version tag");
-
-                var branchName = branchNameOverride ?? context.CurrentBranch.FriendlyName;
-                if (!string.IsNullOrWhiteSpace(context.Configuration.BranchPrefixToTrim))
-                {
-                    branchName = branchName.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
-                }
-                branchName = branchName.RegexReplace("[^a-zA-Z0-9-]", "-");
-
-                tagToUse = tagToUse.Replace("{BranchName}", branchName);
-            }
+            var tagToUse = GetBranchSpecificTag(context.Configuration, context.CurrentBranch.FriendlyName, branchNameOverride);
 
             int? number = null;
             if (!string.IsNullOrEmpty(context.Configuration.TagNumberPattern))
@@ -119,6 +102,29 @@ void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVers
             semanticVersion.PreReleaseTag = new SemanticVersionPreReleaseTag(tagToUse, number);
         }
 
+        public static string GetBranchSpecificTag(EffectiveConfiguration configuration, string branchFriendlyName, string branchNameOverride)
+        {
+            var tagToUse = configuration.Tag;
+            if (tagToUse == "useBranchName")
+            {
+                tagToUse = "{BranchName}";
+            }
+            if (tagToUse.Contains("{BranchName}"))
+            {
+                Logger.WriteInfo("Using branch name to calculate version tag");
+
+                var branchName = branchNameOverride ?? branchFriendlyName;
+                if (!string.IsNullOrWhiteSpace(configuration.BranchPrefixToTrim))
+                {
+                    branchName = branchName.RegexReplace(configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                }
+                branchName = branchName.RegexReplace("[^a-zA-Z0-9-]", "-");
+
+                tagToUse = tagToUse.Replace("{BranchName}", branchName);
+            }
+            return tagToUse;
+        }
+
         static bool MajorMinorPatchEqual(SemanticVersion lastTag, SemanticVersion baseVersion)
         {
             return lastTag.Major == baseVersion.Major &&