Updated other places which required git tag prefix cleanup

JakeGinnivan · JakeGinnivan · commit 81779f792fc3 · 2014-11-16T15:42:40.000Z
diff --git a/GitVersionCore.Tests/SemanticVersionTests.cs b/GitVersionCore.Tests/SemanticVersionTests.cs
@@ -31,7 +31,7 @@ public void ValidateVersionParsing(string versionString, int major, int minor, i
         fullFormattedVersionString = fullFormattedVersionString ?? versionString;
 
         SemanticVersion version;
-        Assert.IsTrue(SemanticVersion.TryParse(versionString, out version), "TryParse Result");
+        Assert.IsTrue(SemanticVersion.TryParse(versionString, null, out version), "TryParse Result");
         Assert.AreEqual(major, version.Major);
         Assert.AreEqual(minor, version.Minor);
         Assert.AreEqual(patch, version.Patch);
@@ -49,7 +49,7 @@ public void ValidateVersionParsing(string versionString, int major, int minor, i
     public void ValidateInvalidVersionParsing(string versionString)
     {
         SemanticVersion version;
-        Assert.IsFalse(SemanticVersion.TryParse(versionString, out version), "TryParse Result");
+        Assert.IsFalse(SemanticVersion.TryParse(versionString, null, out version), "TryParse Result");
     }
 
     [Test]
@@ -64,16 +64,16 @@ public void LegacySemVerTest()
     [Test]
     public void VersionSorting()
     {
-        SemanticVersion.Parse("1.0.0").ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta"));
-        SemanticVersion.Parse("1.0.0-beta.2").ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta.1"));
-        SemanticVersion.Parse("1.0.0-beta.1").ShouldBeLessThan(SemanticVersion.Parse("1.0.0-beta.2"));
+        SemanticVersion.Parse("1.0.0", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta", null));
+        SemanticVersion.Parse("1.0.0-beta.2", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta.1", null));
+        SemanticVersion.Parse("1.0.0-beta.1", null).ShouldBeLessThan(SemanticVersion.Parse("1.0.0-beta.2", null));
     }
 
     [Test]
     public void ToStringJTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("j"));
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4").ToString("j"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("j"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("j"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -93,8 +93,8 @@ public void ToStringJTests()
     [Test]
     public void ToStringSTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("s"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4").ToString("s"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("s"));
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("s"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -114,8 +114,8 @@ public void ToStringSTests()
     [Test]
     public void ToStringLTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("l"));
-        Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4").ToString("l"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("l"));
+        Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("l"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -135,8 +135,8 @@ public void ToStringLTests()
     [Test]
     public void ToStringLPTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("lp"));
-        Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4").ToString("lp"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("lp"));
+        Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("lp"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -156,9 +156,9 @@ public void ToStringLPTests()
     [Test]
     public void ToStringTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4").ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5").ToString());
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString());
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString());
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString());
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -178,9 +178,9 @@ public void ToStringTests()
     [Test]
     public void ToStringFTests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4").ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5").ToString("f"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("f"));
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("f"));
+        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("f"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
@@ -200,9 +200,9 @@ public void ToStringFTests()
     [Test]
     public void ToStringITests()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3").ToString("i"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4").ToString("i"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5").ToString("i"));
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("i"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("i"));
+        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("i"));
         var fullSemVer = new SemanticVersion
         {
             Major = 1,
diff --git a/GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs b/GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs
@@ -35,7 +35,7 @@ protected SemanticVersion FindVersion(
                     context.CurrentBranch.Name, context.CurrentCommit.Sha, context.CurrentCommit.When())
             };
 
-            semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository);
+            semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository, context.Configuration);
 
             return semanticVersion;
         }
diff --git a/GitVersionCore/GitFlow/BranchFinders/DevelopVersionFinder.cs b/GitVersionCore/GitFlow/BranchFinders/DevelopVersionFinder.cs
@@ -30,7 +30,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 BuildMetaData = new SemanticVersionBuildMetaData(numberOfCommitsSinceRelease, context.CurrentBranch.Name,tip.Sha,tip.When()),
             };
 
-            semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository);
+            semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository, context.Configuration);
 
             return semanticVersion;
         }
diff --git a/GitVersionCore/GitFlow/BranchFinders/RecentTagVersionExtractor.cs b/GitVersionCore/GitFlow/BranchFinders/RecentTagVersionExtractor.cs
@@ -8,7 +8,7 @@ class RecentTagVersionExtractor
     {
         internal static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVersionContext context, ShortVersion matchVersion)
         {
-            var tagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(matchVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name));
+            var tagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(context.Configuration, matchVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix));
             return RetrieveMostRecentOptionalTagVersion(context, tagsInDescendingOrder.ToList());
         }
 
@@ -17,7 +17,7 @@ internal static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersio
             if (applicableTagsInDescendingOrder.Any())
             {
                 var taggedCommit = applicableTagsInDescendingOrder.First().Target;
-                var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name)).FirstOrDefault();
+                var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix)).FirstOrDefault();
                 if (preReleaseVersion != null)
                 {
                     if (taggedCommit != context.CurrentCommit)
diff --git a/GitVersionCore/GitFlow/BranchFinders/ReleaseVersionFinder.cs b/GitVersionCore/GitFlow/BranchFinders/ReleaseVersionFinder.cs
@@ -11,8 +11,8 @@ public SemanticVersion FindVersion(GitVersionContext context)
             var shortVersion = ShortVersionParser.Parse(versionString);
 
             EnsureVersionIsValid(shortVersion, context.CurrentBranch);
-            
-            var applicableTagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(shortVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name)).ToList();
+
+            var applicableTagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(context.Configuration, shortVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix)).ToList();
             var numberOfCommitsSinceLastTagOrBranchPoint = BranchCommitDifferenceFinder.NumberOfCommitsSinceLastTagOrBranchPoint(context, applicableTagsInDescendingOrder, BranchType.Release, "develop");
             var semanticVersionPreReleaseTag = RecentTagVersionExtractor.RetrieveMostRecentOptionalTagVersion(context, applicableTagsInDescendingOrder) ?? context.Configuration.ReleaseBranchTag + ".1";
 
diff --git a/GitVersionCore/GitFlow/BranchFinders/SupportVersionFinder.cs b/GitVersionCore/GitFlow/BranchFinders/SupportVersionFinder.cs
@@ -1,10 +1,11 @@
 namespace GitVersion
 {
+    using GitVersion.Configuration;
     using LibGit2Sharp;
 
     class SupportVersionFinder
     {
-        public SemanticVersion FindVersion(IRepository repository, Commit tip)
+        public SemanticVersion FindVersion(IRepository repository, Commit tip, Config configuration)
         {
             foreach (var tag in repository.TagsByDate(tip))
             {
@@ -19,7 +20,7 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)
             if (MergeMessageParser.TryParse(tip, out versionFromTip))
             {
                 var semanticVersion = BuildVersion(tip, versionFromTip);
-                semanticVersion.OverrideVersionManuallyIfNeeded(repository);
+                semanticVersion.OverrideVersionManuallyIfNeeded(repository, configuration);
                 return semanticVersion;
             }
             throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");
diff --git a/GitVersionCore/GitFlow/GitFlowVersionFinder.cs b/GitVersionCore/GitFlow/GitFlowVersionFinder.cs
@@ -31,7 +31,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
 
             if (context.CurrentBranch.IsSupport())
             {
-                return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentCommit);
+                return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentCommit, context.Configuration);
             }
 
             return new FeatureVersionFinder().FindVersion(context);
diff --git a/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs b/GitVersionCore/GitHubFlow/GitHubFlowVersionFinder.cs
@@ -6,7 +6,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
         {
             var repositoryDirectory = context.Repository.Info.WorkingDirectory;
             var lastTaggedReleaseFinder = new LastTaggedReleaseFinder(context);
-            var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repositoryDirectory);
+            var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repositoryDirectory, context.Configuration);
             var nextSemverCalculator = new NextSemverCalculator(nextVersionTxtFileFinder, lastTaggedReleaseFinder, context);
             return new BuildNumberCalculator(nextSemverCalculator, lastTaggedReleaseFinder, context.Repository).GetBuildNumber(context);
         }
diff --git a/GitVersionCore/GitHubFlow/LastTaggedReleaseFinder.cs b/GitVersionCore/GitHubFlow/LastTaggedReleaseFinder.cs
@@ -1,7 +1,6 @@
 namespace GitVersion
 {
     using System.Linq;
-    using System.Text.RegularExpressions;
     using LibGit2Sharp;
 
     public class LastTaggedReleaseFinder
@@ -17,9 +16,8 @@ public bool GetVersion(out VersionTaggedCommit versionTaggedCommit)
         {
             var tags = context.Repository.Tags.Select(t =>
             {
-                var match = Regex.Match(t.Name, string.Format("({0})?(?<version>.*)", context.Configuration.TagPrefix));
                 SemanticVersion version;
-                if (SemanticVersion.TryParse(match.Groups["version"].Value, out version))
+                if (SemanticVersion.TryParse(t.Name, context.Configuration.TagPrefix, out version))
                 {
                     return new VersionTaggedCommit((Commit)t.Target, version);
                 }
diff --git a/GitVersionCore/GitHubFlow/NextVersionTxtFileFinder.cs b/GitVersionCore/GitHubFlow/NextVersionTxtFileFinder.cs
@@ -2,14 +2,17 @@
 {
     using System;
     using System.IO;
+    using GitVersion.Configuration;
 
     public class NextVersionTxtFileFinder
     {
         string repositoryDirectory;
+        Config configuration;
 
-        public NextVersionTxtFileFinder(string repositoryDirectory)
+        public NextVersionTxtFileFinder(string repositoryDirectory, Config configuration)
         {
             this.repositoryDirectory = repositoryDirectory;
+            this.configuration = configuration;
         }
 
         public bool TryGetNextVersion(out SemanticVersion semanticVersion)
@@ -28,7 +31,7 @@ public bool TryGetNextVersion(out SemanticVersion semanticVersion)
                 return false;
             }
 
-            if (!SemanticVersion.TryParse(version, out semanticVersion))
+            if (!SemanticVersion.TryParse(version, configuration.TagPrefix, out semanticVersion))
             {
                 throw new ArgumentException("Make sure you have a valid semantic version in NextVersion.txt");
             }
diff --git a/GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs b/GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs
@@ -16,7 +16,7 @@ public bool FindVersion(GitVersionContext context, out SemanticVersion semanticV
             var shortVersion = ShortVersionParser.Parse(versionString);
 
 
-            var applicableTagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(shortVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name)).ToList();
+            var applicableTagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(context.Configuration, shortVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix)).ToList();
             var nbHotfixCommits = BranchCommitDifferenceFinder.NumberOfCommitsSinceLastTagOrBranchPoint(context, applicableTagsInDescendingOrder, BranchType.Unknown, "master");
             var semanticVersionPreReleaseTag = RecentTagVersionExtractor.RetrieveMostRecentOptionalTagVersion(context, applicableTagsInDescendingOrder) ?? CreateDefaultPreReleaseTag(context, versionString);
 
diff --git a/GitVersionCore/LibGitExtensions.cs b/GitVersionCore/LibGitExtensions.cs
@@ -4,6 +4,7 @@ namespace GitVersion
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using GitVersion.Configuration;
     using LibGit2Sharp;
 
     static class LibGitExtensions
@@ -39,12 +40,12 @@ public static IEnumerable<Tag> TagsByDate(this IRepository repository, Commit co
                 });
         }
 
-        public static IEnumerable<Tag> SemVerTagsRelatedToVersion(this IRepository repository, ShortVersion version)
+        public static IEnumerable<Tag> SemVerTagsRelatedToVersion(this IRepository repository, Config configuration, ShortVersion version)
         {
             foreach (var tag in repository.Tags)
             {
                 SemanticVersion tagVersion;
-                if (SemanticVersion.TryParse(tag.Name, out tagVersion))
+                if (SemanticVersion.TryParse(tag.Name, configuration.TagPrefix, out tagVersion))
                 {
                     if (version.Major == tagVersion.Major &&
                         version.Minor == tagVersion.Minor &&
diff --git a/GitVersionCore/SemanticVersion.cs b/GitVersionCore/SemanticVersion.cs
@@ -116,17 +116,19 @@ public override int GetHashCode()
             return v1.CompareTo(v2) < 0;
         }
 
-        public static SemanticVersion Parse(string version)
+        public static SemanticVersion Parse(string version, string tagPrefixRegex)
         {
             SemanticVersion semanticVersion;
-            if (!TryParse(version, out semanticVersion))
+            if (!TryParse(version, tagPrefixRegex, out semanticVersion))
                 throw new WarningException(string.Format("Failed to parse {0} into a Semantic Version", version));
 
             return semanticVersion;
         }
 
-        public static bool TryParse(string version, out SemanticVersion semanticVersion)
+        public static bool TryParse(string version, string tagPrefixRegex, out SemanticVersion semanticVersion)
         {
+            var match = Regex.Match(version, string.Format("({0})?(?<version>.*)", tagPrefixRegex));
+            version = match.Groups["version"].Value;
             var parsed = ParseSemVer.Match(version);
 
             if (!parsed.Success)
diff --git a/GitVersionCore/SemanticVersionExtensions.cs b/GitVersionCore/SemanticVersionExtensions.cs
@@ -1,12 +1,13 @@
 ﻿namespace GitVersion
 {
+    using GitVersion.Configuration;
     using LibGit2Sharp;
 
     public static class SemanticVersionExtensions
     {
-        public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, IRepository repository)
+        public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, IRepository repository, Config configuration)
         {
-            var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repository.GetRepositoryDirectory());
+            var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repository.GetRepositoryDirectory(), configuration);
             SemanticVersion manualNextVersion ;
             if (nextVersionTxtFileFinder.TryGetNextVersion(out manualNextVersion))
             {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected SemanticVersion FindVersion(`
`35`	`35`	`context.CurrentBranch.Name, context.CurrentCommit.Sha, context.CurrentCommit.When())`
`36`	`36`	`};`
`37`	`37`
`38`		`- semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository);`
	`38`	`+ semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository, context.Configuration);`
`39`	`39`
`40`	`40`	`return semanticVersion;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`30`	`30`	`BuildMetaData = new SemanticVersionBuildMetaData(numberOfCommitsSinceRelease, context.CurrentBranch.Name,tip.Sha,tip.When()),`
`31`	`31`	`};`
`32`	`32`
`33`		`- semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository);`
	`33`	`+ semanticVersion.OverrideVersionManuallyIfNeeded(context.Repository, context.Configuration);`
`34`	`34`
`35`	`35`	`return semanticVersion;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class RecentTagVersionExtractor`
`8`	`8`	`{`
`9`	`9`	`internal static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVersionContext context, ShortVersion matchVersion)`
`10`	`10`	`{`
`11`		`- var tagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(matchVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name));`
	`11`	`+ var tagsInDescendingOrder = context.Repository.SemVerTagsRelatedToVersion(context.Configuration, matchVersion).OrderByDescending(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix));`
`12`	`12`	`return RetrieveMostRecentOptionalTagVersion(context, tagsInDescendingOrder.ToList());`
`13`	`13`	`}`
`14`	`14`
`@@ -17,7 +17,7 @@ internal static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersio`
`17`	`17`	`if (applicableTagsInDescendingOrder.Any())`
`18`	`18`	`{`
`19`	`19`	`var taggedCommit = applicableTagsInDescendingOrder.First().Target;`
`20`		`- var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name)).FirstOrDefault();`
	`20`	`+ var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.TagPrefix)).FirstOrDefault();`
`21`	`21`	`if (preReleaseVersion != null)`
`22`	`22`	`{`
`23`	`23`	`if (taggedCommit != context.CurrentCommit)`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`namespace GitVersion`
`2`	`2`	`{`
	`3`	`+ using GitVersion.Configuration;`
`3`	`4`	`using LibGit2Sharp;`
`4`	`5`
`5`	`6`	`class SupportVersionFinder`
`6`	`7`	`{`
`7`		`- public SemanticVersion FindVersion(IRepository repository, Commit tip)`
	`8`	`+ public SemanticVersion FindVersion(IRepository repository, Commit tip, Config configuration)`
`8`	`9`	`{`
`9`	`10`	`foreach (var tag in repository.TagsByDate(tip))`
`10`	`11`	`{`
`@@ -19,7 +20,7 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)`
`19`	`20`	`if (MergeMessageParser.TryParse(tip, out versionFromTip))`
`20`	`21`	`{`
`21`	`22`	`var semanticVersion = BuildVersion(tip, versionFromTip);`
`22`		`- semanticVersion.OverrideVersionManuallyIfNeeded(repository);`
	`23`	`+ semanticVersion.OverrideVersionManuallyIfNeeded(repository, configuration);`
`23`	`24`	`return semanticVersion;`
`24`	`25`	`}`
`25`	`26`	`throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`31`	`31`
`32`	`32`	`if (context.CurrentBranch.IsSupport())`
`33`	`33`	`{`
`34`		`- return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentCommit);`
	`34`	`+ return new SupportVersionFinder().FindVersion(context.Repository, context.CurrentCommit, context.Configuration);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`return new FeatureVersionFinder().FindVersion(context);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`6`	`6`	`{`
`7`	`7`	`var repositoryDirectory = context.Repository.Info.WorkingDirectory;`
`8`	`8`	`var lastTaggedReleaseFinder = new LastTaggedReleaseFinder(context);`
`9`		`- var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repositoryDirectory);`
	`9`	`+ var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repositoryDirectory, context.Configuration);`
`10`	`10`	`var nextSemverCalculator = new NextSemverCalculator(nextVersionTxtFileFinder, lastTaggedReleaseFinder, context);`
`11`	`11`	`return new BuildNumberCalculator(nextSemverCalculator, lastTaggedReleaseFinder, context.Repository).GetBuildNumber(context);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace GitVersion`
`2`	`2`	`{`
`3`	`3`	`using System.Linq;`
`4`		`- using System.Text.RegularExpressions;`
`5`	`4`	`using LibGit2Sharp;`
`6`	`5`
`7`	`6`	`public class LastTaggedReleaseFinder`
`@@ -17,9 +16,8 @@ public bool GetVersion(out VersionTaggedCommit versionTaggedCommit)`
`17`	`16`	`{`
`18`	`17`	`var tags = context.Repository.Tags.Select(t =>`
`19`	`18`	`{`
`20`		`- var match = Regex.Match(t.Name, string.Format("({0})?(?<version>.*)", context.Configuration.TagPrefix));`
`21`	`19`	`SemanticVersion version;`
`22`		`- if (SemanticVersion.TryParse(match.Groups["version"].Value, out version))`
	`20`	`+ if (SemanticVersion.TryParse(t.Name, context.Configuration.TagPrefix, out version))`
`23`	`21`	`{`
`24`	`22`	`return new VersionTaggedCommit((Commit)t.Target, version);`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,17 @@`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.IO;`
	`5`	`+ using GitVersion.Configuration;`
`5`	`6`
`6`	`7`	`public class NextVersionTxtFileFinder`
`7`	`8`	`{`
`8`	`9`	`string repositoryDirectory;`
	`10`	`+ Config configuration;`
`9`	`11`
`10`		`- public NextVersionTxtFileFinder(string repositoryDirectory)`
	`12`	`+ public NextVersionTxtFileFinder(string repositoryDirectory, Config configuration)`
`11`	`13`	`{`
`12`	`14`	`this.repositoryDirectory = repositoryDirectory;`
	`15`	`+ this.configuration = configuration;`
`13`	`16`	`}`
`14`	`17`
`15`	`18`	`public bool TryGetNextVersion(out SemanticVersion semanticVersion)`
`@@ -28,7 +31,7 @@ public bool TryGetNextVersion(out SemanticVersion semanticVersion)`
`28`	`31`	`return false;`
`29`	`32`	`}`
`30`	`33`
`31`		`- if (!SemanticVersion.TryParse(version, out semanticVersion))`
	`34`	`+ if (!SemanticVersion.TryParse(version, configuration.TagPrefix, out semanticVersion))`
`32`	`35`	`{`
`33`	`36`	`throw new ArgumentException("Make sure you have a valid semantic version in NextVersion.txt");`
`34`	`37`	`}`