Merge pull request #366 from JakeGinnivan/BetterContinuousDeploymentLogic

JakeGinnivan · JakeGinnivan · commit a4cf51a8f832 · 2015-02-14T18:29:51.000Z
Better continuous deployment logic
diff --git a/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs b/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs
@@ -22,7 +22,7 @@ public void BuildNumberIsFullSemVer()
 
         semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
         semanticVersion.BuildMetaData.Sha = "commitSha";
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
         new BuildServer().WriteIntegration(writes.Add, variables);
 
         writes[1].ShouldBe("1.2.3-beta.1+5");
diff --git a/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -1,6 +1,7 @@
 ﻿assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDelivery
 tag-prefix: '[vV]'
+continuous-delivery-fallback-tag: ci
 branches:
   master:
     tag: 
diff --git a/GitVersionCore.Tests/JsonVersionBuilderTests.cs b/GitVersionCore.Tests/JsonVersionBuilderTests.cs
@@ -17,7 +17,7 @@ public void Json()
                 PreReleaseTag = "unstable4",
                 BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
         var json = JsonOutputFormatter.ToJson(variables);
         Approvals.Verify(json);
     }
diff --git a/GitVersionCore.Tests/SemanticVersionTests.cs b/GitVersionCore.Tests/SemanticVersionTests.cs
@@ -56,9 +56,10 @@ public void ValidateInvalidVersionParsing(string versionString)
     [Test]
     public void LegacySemVerTest()
     {
-        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT2134");
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT-2134");
         new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL");
-        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT21340001");
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT-2134-0001");
+        new SemanticVersionPreReleaseTag("TKT-2134", 1).ToString("lp").ShouldBe("TKT-2134-0001");
         new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001");
     }
 
diff --git a/GitVersionCore.Tests/TestEffectiveConfiguration.cs b/GitVersionCore.Tests/TestEffectiveConfiguration.cs
@@ -12,9 +12,10 @@ public TestEffectiveConfiguration(
             string nextVersion = null,
             string branchPrefixToTrim = "",
             bool preventIncrementForMergedBranchVersion = false,
-            string tagNumberPattern = null) : 
+            string tagNumberPattern = null,
+            string continuousDeploymentFallbackTag = "ci") : 
                 base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
-                    branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern)
+                    branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag)
         {
         }
     }
diff --git a/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt b/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
@@ -2,19 +2,19 @@
   "Major":1,
   "Minor":2,
   "Patch":3,
-  "PreReleaseTag":"",
-  "PreReleaseTagWithDash":"",
+  "PreReleaseTag":"ci.5",
+  "PreReleaseTagWithDash":"-ci.5",
   "BuildMetaData":5,
   "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
   "MajorMinorPatch":"1.2.3",
-  "SemVer":"1.2.3.5",
-  "LegacySemVer":"1.2.3.5",
-  "LegacySemVerPadded":"1.2.3.5",
+  "SemVer":"1.2.3-ci.5",
+  "LegacySemVer":"1.2.3-ci5",
+  "LegacySemVerPadded":"1.2.3-ci0005",
   "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3.5",
-  "InformationalVersion":"1.2.3.5+Branch.develop.Sha.commitSha",
+  "FullSemVer":"1.2.3-ci.5",
+  "InformationalVersion":"1.2.3-ci.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
-  "NuGetVersionV2":"1.2.3.5",
-  "NuGetVersion":"1.2.3.5"
+  "NuGetVersionV2":"1.2.3-ci0005",
+  "NuGetVersion":"1.2.3-ci0005"
 }
diff --git a/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt b/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
@@ -0,0 +1,20 @@
+﻿{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"",
+  "PreReleaseTagWithDash":"",
+  "BuildMetaData":5,
+  "FullBuildMetaData":"5.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3",
+  "LegacySemVer":"1.2.3",
+  "LegacySemVerPadded":"1.2.3",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3+5",
+  "InformationalVersion":"1.2.3+5.Sha.commitSha",
+  "BranchName":"",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3",
+  "NuGetVersion":"1.2.3"
+}
diff --git a/GitVersionCore.Tests/VariableProviderTests.cs b/GitVersionCore.Tests/VariableProviderTests.cs
@@ -21,7 +21,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
         semVer.BuildMetaData.Sha = "commitSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
 
         Approvals.Verify(JsonOutputFormatter.ToJson(vars));
     }
@@ -41,7 +41,7 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
         semVer.BuildMetaData.Sha = "commitSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment);
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", false);
 
         Approvals.Verify(JsonOutputFormatter.ToJson(vars));
     }
@@ -60,7 +60,7 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
         semVer.BuildMetaData.Sha = "commitSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
 
         Approvals.Verify(JsonOutputFormatter.ToJson(vars));
     }
@@ -79,7 +79,29 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
         semVer.BuildMetaData.Sha = "commitSha";
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment);
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", false);
+
+        Approvals.Verify(JsonOutputFormatter.ToJson(vars));
+    }
+
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged()
+    {
+        var semVer = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData =
+            {
+                CommitsSinceTag = 5,
+                Sha = "commitSha",
+                CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
+            }
+        };
+
+
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", true);
 
         Approvals.Verify(JsonOutputFormatter.ToJson(vars));
     }
diff --git a/GitVersionCore/Configuration/Config.cs b/GitVersionCore/Configuration/Config.cs
@@ -13,6 +13,7 @@ public Config()
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
             TagPrefix = "[vV]";
             VersioningMode = GitVersion.VersioningMode.ContinuousDelivery;
+            ContinuousDeploymentFallbackTag = "ci";
 
             Branches["master"] = new BranchConfig
             {
@@ -56,6 +57,9 @@ public Config()
         [YamlMember(Alias = "tag-prefix")]
         public string TagPrefix { get; set; }
 
+        [YamlMember(Alias = "continuous-delivery-fallback-tag")]
+        public string ContinuousDeploymentFallbackTag { get; set; }
+
         [YamlMember(Alias = "next-version")]
         public string NextVersion { get; set; }
 
diff --git a/GitVersionCore/Configuration/ConfigSerialiser.cs b/GitVersionCore/Configuration/ConfigSerialiser.cs
@@ -29,6 +29,7 @@ public static void WriteSample(TextWriter writer)
             writer.WriteLine("# tag-prefix: '[vV|version-] # regex to match git tag prefix");
             writer.WriteLine("# next-version: 1.0.0");
             writer.WriteLine("# mode: ContinuousDelivery | ContinuousDeployment");
+            writer.WriteLine("# continuous-delivery-fallback-tag: ci");
             writer.WriteLine("#branches:");
             writer.WriteLine("#   release[/-]*:\n    mode: ContinuousDelivery | ContinuousDeployment\n    tag: rc");
             writer.WriteLine("#   develop:\n    mode: ContinuousDelivery | ContinuousDeployment\n    tag: alpha");
diff --git a/GitVersionCore/EffectiveConfiguration.cs b/GitVersionCore/EffectiveConfiguration.cs
@@ -11,7 +11,8 @@ public EffectiveConfiguration(
             string tag, string nextVersion, IncrementStrategy increment, 
             string branchPrefixToTrim, 
             bool preventIncrementForMergedBranchVersion, 
-            string tagNumberPattern)
+            string tagNumberPattern,
+            string continuousDeploymentFallbackTag)
         {
             AssemblyVersioningScheme = assemblyVersioningScheme;
             VersioningMode = versioningMode;
@@ -22,6 +23,7 @@ public EffectiveConfiguration(
             BranchPrefixToTrim = branchPrefixToTrim;
             PreventIncrementForMergedBranchVersion = preventIncrementForMergedBranchVersion;
             TagNumberPattern = tagNumberPattern;
+            ContinuousDeploymentFallbackTag = continuousDeploymentFallbackTag;
         }
 
         public VersioningMode VersioningMode { get; private set; }
@@ -47,5 +49,7 @@ public EffectiveConfiguration(
         public bool PreventIncrementForMergedBranchVersion { get; private set; }
 
         public string TagNumberPattern { get; private set; }
+
+        public string ContinuousDeploymentFallbackTag { get; private set; }
     }
 }
diff --git a/GitVersionCore/GitVersionContext.cs b/GitVersionCore/GitVersionContext.cs
@@ -65,7 +65,7 @@ void CalculateEffectiveConfiguration()
                 assemblyVersioningScheme, versioningMode, gitTagPrefix, 
                 tag, nextVersion, incrementStrategy, currentBranchConfig.Key, 
                 preventIncrementForMergedBranchVersion, 
-                tagNumberPattern);
+                tagNumberPattern, configuration.ContinuousDeploymentFallbackTag);
         }
     }
 }
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -84,7 +84,6 @@
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
     <Compile Include="Helpers\ProcessHelper.cs" />
-    <Compile Include="OutputVariables\CommitsAsFourthVersionPartFormatter.cs" />
     <Compile Include="OutputVariables\VersionVariables.cs" />
     <Compile Include="Extensions\ExtensionMethods.git.cs" />
     <Compile Include="SemanticVersionExtensions.cs" />
diff --git a/GitVersionCore/OutputVariables/CommitsAsFourthVersionPartFormatter.cs b/GitVersionCore/OutputVariables/CommitsAsFourthVersionPartFormatter.cs
diff --git a/GitVersionCore/OutputVariables/VariableProvider.cs b/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -1,28 +1,26 @@
 ﻿namespace GitVersion
 {
-    using System;
-
     public static class VariableProvider
     {
-        public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion, AssemblyVersioningScheme assemblyVersioningScheme, VersioningMode mode)
+        public static VersionVariables GetVariablesFor(
+            SemanticVersion semanticVersion, AssemblyVersioningScheme assemblyVersioningScheme, 
+            VersioningMode mode, string continuousDeploymentFallbackTag, 
+            bool currentCommitIsTagged)
         {
             var bmd = semanticVersion.BuildMetaData;
-            IFormatProvider formatProvider = null;
-            if (mode == VersioningMode.ContinuousDeployment)
+            if (mode == VersioningMode.ContinuousDeployment && !currentCommitIsTagged)
             {
-                // For continuous deployment the commits since tag gets promoted to the pre-release number
                 semanticVersion = new SemanticVersion(semanticVersion);
-                if (semanticVersion.PreReleaseTag.HasTag())
-                {
-                    var oldPreReleaseNumber = semanticVersion.PreReleaseTag.Number;
-                    semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
-                    semanticVersion.BuildMetaData.CommitsSinceTag = oldPreReleaseNumber;
-                }
-                else
+                // Continuous Delivery always requires a pre-release tag unless the commit is tagged
+                if (!semanticVersion.PreReleaseTag.HasTag())
                 {
-                    // When there is no pre-release tag we will make the version a 4 part number
-                    formatProvider = new CommitsAsFourthVersionPartFormatter();
+                    semanticVersion.PreReleaseTag.Name = continuousDeploymentFallbackTag;
                 }
+
+                // For continuous deployment the commits since tag gets promoted to the pre-release number
+                var oldPreReleaseNumber = semanticVersion.PreReleaseTag.Number;
+                semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
+                semanticVersion.BuildMetaData.CommitsSinceTag = oldPreReleaseNumber;
             }
 
             var variables = new VersionVariables(
@@ -34,12 +32,12 @@ public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion,
                 buildMetaData: bmd,
                 fullBuildMetaData: bmd.ToString("f"),
                 majorMinorPatch: string.Format("{0}.{1}.{2}", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch),
-                semVer: semanticVersion.ToString(null, formatProvider),
-                legacySemVer: semanticVersion.ToString("l", formatProvider),
-                legacySemVerPadded: semanticVersion.ToString("lp", formatProvider),
+                semVer: semanticVersion.ToString(),
+                legacySemVer: semanticVersion.ToString("l"),
+                legacySemVerPadded: semanticVersion.ToString("lp"),
                 assemblySemVer: semanticVersion.GetAssemblyVersion(assemblyVersioningScheme),
-                fullSemVer: semanticVersion.ToString("f", formatProvider),
-                informationalVersion: semanticVersion.ToString("i", formatProvider),
+                fullSemVer: semanticVersion.ToString("f"),
+                informationalVersion: semanticVersion.ToString("i"),
                 branchName: bmd.Branch,
                 sha: bmd.Sha);
 
diff --git a/GitVersionCore/SemanticVersionPreReleaseTag.cs b/GitVersionCore/SemanticVersionPreReleaseTag.cs
@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System;
+    using System.Linq;
     using System.Text.RegularExpressions;
 
     public class SemanticVersionPreReleaseTag : 
@@ -152,29 +153,30 @@ public string ToString(string format, IFormatProvider formatProvider = null)
                 case "t":
                     return Number.HasValue ? string.Format("{0}.{1}", Name, Number) : Name;
                 case "l":
-                    return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.ToString()) : FormatLegacy(GetLegacyName());
+                    return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName());
                 case "lp":
                     return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D4")) : FormatLegacy(GetLegacyName());
                 default:
                     throw new ArgumentException("Unknown format", "format");
             }
         }
 
-        string FormatLegacy(string tag, string number = null)
+        string FormatLegacy(string tag, string number = "")
         {
-            var tagLength = tag.Length;
-            var numberLength = number == null ? 0 : number.Length;
+            var tagEndsWithANumber = char.IsNumber(tag.Last());
+            if (tagEndsWithANumber && number.Length > 0)
+                number = "-" + number;
 
-            if (tagLength + numberLength > 20)
-                return string.Format("{0}{1}", tag.Substring(0, 20 - numberLength), number);
+            if (tag.Length + number.Length > 20)
+                return string.Format("{0}{1}", tag.Substring(0, 20 - number.Length), number);
 
             return string.Format("{0}{1}", tag, number);
         }
 
         string GetLegacyName()
         {
             var firstPart = Name.Split('_')[0];
-            return firstPart.Replace("-", string.Empty).Replace(".", string.Empty);
+            return firstPart.Replace(".", string.Empty);
         }
 
         public bool HasTag()
diff --git a/GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs b/GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs
@@ -13,7 +13,7 @@ public void ShouldStartSearchFromWorkingDirectory()
     {
         var fileSystem = Substitute.For<IFileSystem>();
         const string workingDir = "C:\\Testing";
-        var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
         using (new AssemblyInfoFileUpdate(new Arguments { UpdateAssemblyInfo = true }, workingDir, variables, fileSystem))
         {
             fileSystem.Received().DirectoryGetFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());
@@ -43,7 +43,7 @@ public void ShouldReplaceAssemblyVersion()
         {
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor
         };
-        var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
+        var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery, "ci", false);
         var args = new Arguments
         {
             UpdateAssemblyInfo = true,
@@ -81,7 +81,7 @@ public void ShouldReplaceAssemblyVersionWithStar()
         {
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor
         };
-        var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
+        var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery, "ci", false);
         var args = new Arguments
         {
             UpdateAssemblyInfo = true,
diff --git a/GitVersionExe/Program.cs b/GitVersionExe/Program.cs
diff --git a/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
diff --git a/GitVersionTask/GetVersion.cs b/GitVersionTask/GetVersion.cs
diff --git a/GitVersionTask/WriteVersionInfoToBuildLog.cs b/GitVersionTask/WriteVersionInfoToBuildLog.cs
diff --git a/Icons/CommitGraph.png b/Icons/CommitGraph.png
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void Json()`
`17`	`17`	`PreReleaseTag = "unstable4",`
`18`	`18`	`BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))`
`19`	`19`	`};`
`20`		`- var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);`
	`20`	`+ var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);`
`21`	`21`	`var json = JsonOutputFormatter.ToJson(variables);`
`22`	`22`	`Approvals.Verify(json);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,10 @@ public void ValidateInvalidVersionParsing(string versionString)`
`56`	`56`	`[Test]`
`57`	`57`	`public void LegacySemVerTest()`
`58`	`58`	`{`
`59`		`- new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT2134");`
	`59`	`+ new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT-2134");`
`60`	`60`	`new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL");`
`61`		`- new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT21340001");`
	`61`	`+ new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT-2134-0001");`
	`62`	`+ new SemanticVersionPreReleaseTag("TKT-2134", 1).ToString("lp").ShouldBe("TKT-2134-0001");`
`62`	`63`	`new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001");`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@ public TestEffectiveConfiguration(`
`12`	`12`	`string nextVersion = null,`
`13`	`13`	`string branchPrefixToTrim = "",`
`14`	`14`	`bool preventIncrementForMergedBranchVersion = false,`
`15`		`- string tagNumberPattern = null) :`
	`15`	`+ string tagNumberPattern = null,`
	`16`	`+ string continuousDeploymentFallbackTag = "ci") :`
`16`	`17`	`base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,`
`17`		`- branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern)`
	`18`	`+ branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag)`
`18`	`19`	`{`
`19`	`20`	`}`
`20`	`21`	`}`