GitTools#2340 undo coding changes

BomBastiG · BomBastiG · commit 7655c5097b56 · 2021-02-15T23:28:57.000+01:00
there might be an easier solution
diff --git a/src/GitVersionCore/Configuration/ConfigExtensions.cs b/src/GitVersionCore/Configuration/ConfigExtensions.cs
@@ -126,10 +126,7 @@ public static string GetBranchSpecificTag(this EffectiveConfiguration configurat
             }
             if (tagToUse.Contains("{BranchName}"))
             {
-                if (log != null)
-                {
-                    log.Info("Using branch name to calculate version tag");
-                }
+                log.Info("Using branch name to calculate version tag");
 
                 var branchName = branchNameOverride ?? branchFriendlyName;
                 if (!string.IsNullOrWhiteSpace(configuration.BranchPrefixToTrim))
diff --git a/src/GitVersionCore/Configuration/Init/SetNextVersion.cs b/src/GitVersionCore/Configuration/Init/SetNextVersion.cs
@@ -20,7 +20,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                 return StepResult.Ok();
             }
 
-            if (!SemanticVersion.TryParse(result, string.Empty, null, out var semVer))
+            if (!SemanticVersion.TryParse(result, string.Empty, out var semVer))
                 return StepResult.InvalidResponseSelected();
 
             config.NextVersion = semVer.ToString("t");
diff --git a/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs b/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs
@@ -34,10 +34,10 @@ public interface IRepositoryMetadataProvider
         /// </summary>
         BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, Config configuration, params Branch[] excludedBranches);
 
-        SemanticVersion GetCurrentCommitTaggedVersion(Branch branch, GitObject commit, EffectiveConfiguration config);
+        SemanticVersion GetCurrentCommitTaggedVersion(GitObject commit, EffectiveConfiguration config);
         SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext context);
-        IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex, string tagSuffix);
-        IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, string tagSuffix, DateTimeOffset? olderThan = null);
+        IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex);
+        IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, DateTimeOffset? olderThan = null);
 
         ICommitLog GetCommitLog(Commit baseVersionSource, Commit currentCommit);
         bool GetMatchingCommitBranch(Commit baseVersionSource, Branch branch, Commit firstMatchingCommit);
diff --git a/src/GitVersionCore/Core/GitVersionContextFactory.cs b/src/GitVersionCore/Core/GitVersionContextFactory.cs
@@ -45,7 +45,7 @@ private GitVersionContext Init(Branch currentBranch, string commitId = null, boo
 
             var currentBranchConfig = branchConfigurationCalculator.GetBranchConfiguration(currentBranch, currentCommit, configuration);
             var effectiveConfiguration = configuration.CalculateEffectiveConfiguration(currentBranchConfig);
-            var currentCommitTaggedVersion = repositoryMetadataProvider.GetCurrentCommitTaggedVersion(currentBranch, currentCommit, effectiveConfiguration);
+            var currentCommitTaggedVersion = repositoryMetadataProvider.GetCurrentCommitTaggedVersion(currentCommit, effectiveConfiguration);
             var numberOfUncommittedChanges = repositoryMetadataProvider.GetNumberOfUncommittedChanges();
 
             return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, numberOfUncommittedChanges);
diff --git a/src/GitVersionCore/Core/RepositoryMetadataProvider.cs b/src/GitVersionCore/Core/RepositoryMetadataProvider.cs
@@ -348,13 +348,12 @@ public BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, Config config
         }
 
 
-        public SemanticVersion GetCurrentCommitTaggedVersion(Branch branch, GitObject commit, EffectiveConfiguration config)
+        public SemanticVersion GetCurrentCommitTaggedVersion(GitObject commit, EffectiveConfiguration config)
         {
             return repository.Tags
                 .SelectMany(t =>
                 {
-                    var tag = config.GetBranchSpecificTag(null, branch.FriendlyName, null);
-                    if (t.PeeledTarget() == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, tag, out var version))
+                    if (t.PeeledTarget() == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, out var version))
                         return new[] {
                             version
                         };
@@ -369,7 +368,7 @@ public SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext
             return increment != null ? baseVersion.SemanticVersion.IncrementVersion(increment.Value) : baseVersion.SemanticVersion;
         }
 
-        public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex, string tagSuffix)
+        public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex)
         {
             if (semanticVersionTagsOnBranchCache.ContainsKey(branch))
             {
@@ -379,7 +378,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string
 
             using (log.IndentLog($"Getting version tags from branch '{branch.CanonicalName}'."))
             {
-                var tags = GetValidVersionTags(tagPrefixRegex, tagSuffix);
+                var tags = GetValidVersionTags(tagPrefixRegex);
 
                 var versionTags = branch.Commits.SelectMany(c => tags.Where(t => c.Sha == t.Item1.Target.Sha).Select(t => t.Item2)).ToList();
 
@@ -388,7 +387,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string
             }
         }
 
-        public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, string tagSuffix, DateTimeOffset? olderThan = null)
+        public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, DateTimeOffset? olderThan = null)
         {
             var tags = new List<Tuple<Tag, SemanticVersion>>();
 
@@ -397,7 +396,7 @@ public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPr
                 if (!(tag.PeeledTarget() is Commit commit) || (olderThan.HasValue && commit.When() > olderThan.Value))
                     continue;
 
-                if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, tagSuffix, out var semver))
+                if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, out var semver))
                 {
                     tags.Add(Tuple.Create(tag, semver));
                 }
diff --git a/src/GitVersionCore/Model/MergeMessage.cs b/src/GitVersionCore/Model/MergeMessage.cs
@@ -47,7 +47,7 @@ public MergeMessage(string mergeMessage, Config config)
                         PullRequestNumber = pullNumber;
                     }
 
-                    Version = ParseVersion(config.TagPrefix, null);
+                    Version = ParseVersion(config.TagPrefix);
 
                     break;
                 }
@@ -61,7 +61,7 @@ public MergeMessage(string mergeMessage, Config config)
         public int? PullRequestNumber { get; }
         public SemanticVersion Version { get; }
 
-        private SemanticVersion ParseVersion(string tagPrefix, string tagSuffix)
+        private SemanticVersion ParseVersion(string tagPrefix)
         {
             // Remove remotes and branch prefixes like release/ feature/ hotfix/ etc
             var toMatch = Regex.Replace(MergedBranch, @"^(\w+[-/])*", "", RegexOptions.IgnoreCase);
@@ -70,7 +70,7 @@ private SemanticVersion ParseVersion(string tagPrefix, string tagSuffix)
             var versionMatch = new Regex(@"^(?<!://)\d+\.\d+(\.*\d+)*");
             var version = versionMatch.Match(toMatch);
 
-            if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, tagSuffix, out var val))
+            if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, out var val))
             {
                 return val;
             }
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using GitVersion.Common;
-using GitVersion.Configuration;
-using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation
 {
@@ -21,7 +18,7 @@ public override IEnumerable<BaseVersion> GetVersions()
         {
             if (string.IsNullOrEmpty(Context.Configuration.NextVersion) || Context.IsCurrentCommitTagged)
                 yield break;
-            var semanticVersion = SemanticVersion.Parse(Context.Configuration.NextVersion, Context.Configuration.GitTagPrefix, null);
+            var semanticVersion = SemanticVersion.Parse(Context.Configuration.NextVersion, Context.Configuration.GitTagPrefix);
             yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);
         }
     }
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -28,8 +28,7 @@ public override IEnumerable<BaseVersion> GetVersions()
 
         internal IEnumerable<BaseVersion> GetTaggedVersions(Branch currentBranch, DateTimeOffset? olderThan)
         {
-            var tagToUse = "";//Context.Configuration.GetBranchSpecificTag(null, currentBranch.FriendlyName, null);
-            var allTags = repositoryMetadataProvider.GetValidVersionTags(Context.Configuration.GitTagPrefix, tagToUse, olderThan);
+            var allTags = repositoryMetadataProvider.GetValidVersionTags(Context.Configuration.GitTagPrefix, olderThan);
 
 
             var taggedVersions = currentBranch
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
@@ -84,7 +84,6 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()
         private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Branch releaseBranch)
         {
             var tagPrefixRegex = context.Configuration.GitTagPrefix;
-            var tagSuffix = Context.Configuration.Tag;
 
             // Find the commit where the child branch was created.
             var baseSource = repositoryMetadataProvider.FindMergeBase(releaseBranch, context.CurrentBranch);
@@ -95,7 +94,7 @@ private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Br
             }
 
             return releaseVersionStrategy
-                .GetVersions(tagPrefixRegex, tagSuffix, releaseBranch)
+                .GetVersions(tagPrefixRegex, releaseBranch)
                 .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));
         }
     }
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -25,19 +25,18 @@ public override IEnumerable<BaseVersion> GetVersions()
         {
             var currentBranch = Context.CurrentBranch;
             var tagPrefixRegex = Context.Configuration.GitTagPrefix;
-            var tagSuffix = Context.Configuration.GetBranchSpecificTag(null, currentBranch.FriendlyName, null);
-            return GetVersions(tagPrefixRegex, tagSuffix, currentBranch);
+            return GetVersions(tagPrefixRegex, currentBranch);
         }
 
-        internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, string tagSuffix, Branch currentBranch)
+        internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex Branch currentBranch)
         {
             if (!Context.FullConfiguration.IsReleaseBranch(currentBranch.NameWithoutOrigin()))
             {
                 yield break;
             }
 
             var branchName = currentBranch.FriendlyName;
-            var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex, tagSuffix);
+            var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex);
             if (versionInBranch != null)
             {
                 var commitBranchWasBranchedFrom = repositoryMetadataProvider.FindCommitBranchWasBranchedFrom(currentBranch, Context.FullConfiguration);
@@ -46,12 +45,12 @@ internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, string tagS
             }
         }
 
-        private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex, string tagSuffix)
+        private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)
         {
             var branchParts = branchName.Split('/', '-');
             foreach (var part in branchParts)
             {
-                if (SemanticVersion.TryParse(part, tagPrefixRegex, tagSuffix, out var semanticVersion))
+                if (SemanticVersion.TryParse(part, tagPrefixRegex, out var semanticVersion))
                 {
                     return Tuple.Create(part, semanticVersion);
                 }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -111,7 +111,7 @@ private void UpdatePreReleaseTag(SemanticVersion semanticVersion, string branchN
             int? number = null;
 
             var lastTag = repositoryMetadataProvider
-                .GetVersionTagsOnBranch(context.CurrentBranch, context.Configuration.GitTagPrefix, tagToUse)
+                .GetVersionTagsOnBranch(context.CurrentBranch, context.Configuration.GitTagPrefix)
                 .FirstOrDefault(v => v.PreReleaseTag.Name.IsEquivalentTo(tagToUse));
 
             if (lastTag != null &&
diff --git a/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -136,21 +136,17 @@ public override int GetHashCode()
             return v1.CompareTo(v2) < 0;
         }
 
-        public static SemanticVersion Parse(string version, string tagPrefixRegex, string tagSuffix)
+        public static SemanticVersion Parse(string version, string tagPrefixRegex)
         {
-            if (!TryParse(version, tagPrefixRegex, tagSuffix, out var semanticVersion))
+            if (!TryParse(version, tagPrefixRegex, out var semanticVersion))
                 throw new WarningException($"Failed to parse {version} into a Semantic Version");
 
             return semanticVersion;
         }
 
-        public static bool TryParse(string version, string tagPrefixRegex, string tagSuffix, out SemanticVersion semanticVersion)
+        public static bool TryParse(string version, string tagPrefixRegex, out SemanticVersion semanticVersion)
         {
-            if (tagSuffix == null)
-            {
-                tagSuffix = ".*";
-            }
-            var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>[0-9.]+-?{tagSuffix}[.]?\\d*)$");
+            var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>.*)$");
 
             if (!match.Success)
             {
diff --git a/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs b/src/GitVersionCore/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
@@ -6,7 +6,7 @@ public static class SemanticVersionExtensions
     {
         public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, EffectiveConfiguration configuration)
         {
-            if (!string.IsNullOrEmpty(configuration.NextVersion) && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, null, out var manualNextVersion))
+            if (!string.IsNullOrEmpty(configuration.NextVersion) && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, out var manualNextVersion))
             {
                 if (manualNextVersion > version)
                 {

Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,7 @@ public static string GetBranchSpecificTag(this EffectiveConfiguration configurat`
`126`	`126`	`}`
`127`	`127`	`if (tagToUse.Contains("{BranchName}"))`
`128`	`128`	`{`
`129`		`- if (log != null)`
`130`		`- {`
`131`		`- log.Info("Using branch name to calculate version tag");`
`132`		`- }`
	`129`	`+ log.Info("Using branch name to calculate version tag");`
`133`	`130`
`134`	`131`	`var branchName = branchNameOverride ?? branchFriendlyName;`
`135`	`132`	`if (!string.IsNullOrWhiteSpace(configuration.BranchPrefixToTrim))`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard`
`20`	`20`	`return StepResult.Ok();`
`21`	`21`	`}`
`22`	`22`
`23`		`- if (!SemanticVersion.TryParse(result, string.Empty, null, out var semVer))`
	`23`	`+ if (!SemanticVersion.TryParse(result, string.Empty, out var semVer))`
`24`	`24`	`return StepResult.InvalidResponseSelected();`
`25`	`25`
`26`	`26`	`config.NextVersion = semVer.ToString("t");`
Original file line number	Diff line number	Diff line change
`@@ -348,13 +348,12 @@ public BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, Config config`
`348`	`348`	`}`
`349`	`349`
`350`	`350`
`351`		`- public SemanticVersion GetCurrentCommitTaggedVersion(Branch branch, GitObject commit, EffectiveConfiguration config)`
	`351`	`+ public SemanticVersion GetCurrentCommitTaggedVersion(GitObject commit, EffectiveConfiguration config)`
`352`	`352`	`{`
`353`	`353`	`return repository.Tags`
`354`	`354`	`.SelectMany(t =>`
`355`	`355`	`{`
`356`		`- var tag = config.GetBranchSpecificTag(null, branch.FriendlyName, null);`
`357`		`- if (t.PeeledTarget() == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, tag, out var version))`
	`356`	`+ if (t.PeeledTarget() == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, out var version))`
`358`	`357`	`return new[] {`
`359`	`358`	`version`
`360`	`359`	`};`
`@@ -369,7 +368,7 @@ public SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext`
`369`	`368`	`return increment != null ? baseVersion.SemanticVersion.IncrementVersion(increment.Value) : baseVersion.SemanticVersion;`
`370`	`369`	`}`
`371`	`370`
`372`		`- public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex, string tagSuffix)`
	`371`	`+ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex)`
`373`	`372`	`{`
`374`	`373`	`if (semanticVersionTagsOnBranchCache.ContainsKey(branch))`
`375`	`374`	`{`
`@@ -379,7 +378,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string`
`379`	`378`
`380`	`379`	`using (log.IndentLog($"Getting version tags from branch '{branch.CanonicalName}'."))`
`381`	`380`	`{`
`382`		`- var tags = GetValidVersionTags(tagPrefixRegex, tagSuffix);`
	`381`	`+ var tags = GetValidVersionTags(tagPrefixRegex);`
`383`	`382`
`384`	`383`	`var versionTags = branch.Commits.SelectMany(c => tags.Where(t => c.Sha == t.Item1.Target.Sha).Select(t => t.Item2)).ToList();`
`385`	`384`
`@@ -388,7 +387,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string`
`388`	`387`	`}`
`389`	`388`	`}`
`390`	`389`
`391`		`- public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, string tagSuffix, DateTimeOffset? olderThan = null)`
	`390`	`+ public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, DateTimeOffset? olderThan = null)`
`392`	`391`	`{`
`393`	`392`	`var tags = new List<Tuple<Tag, SemanticVersion>>();`
`394`	`393`
`@@ -397,7 +396,7 @@ public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPr`
`397`	`396`	`if (!(tag.PeeledTarget() is Commit commit) \|\| (olderThan.HasValue && commit.When() > olderThan.Value))`
`398`	`397`	`continue;`
`399`	`398`
`400`		`- if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, tagSuffix, out var semver))`
	`399`	`+ if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, out var semver))`
`401`	`400`	`{`
`402`	`401`	`tags.Add(Tuple.Create(tag, semver));`
`403`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public MergeMessage(string mergeMessage, Config config)`
`47`	`47`	`PullRequestNumber = pullNumber;`
`48`	`48`	`}`
`49`	`49`
`50`		`- Version = ParseVersion(config.TagPrefix, null);`
	`50`	`+ Version = ParseVersion(config.TagPrefix);`
`51`	`51`
`52`	`52`	`break;`
`53`	`53`	`}`
`@@ -61,7 +61,7 @@ public MergeMessage(string mergeMessage, Config config)`
`61`	`61`	`public int? PullRequestNumber { get; }`
`62`	`62`	`public SemanticVersion Version { get; }`
`63`	`63`
`64`		`- private SemanticVersion ParseVersion(string tagPrefix, string tagSuffix)`
	`64`	`+ private SemanticVersion ParseVersion(string tagPrefix)`
`65`	`65`	`{`
`66`	`66`	`// Remove remotes and branch prefixes like release/ feature/ hotfix/ etc`
`67`	`67`	`var toMatch = Regex.Replace(MergedBranch, @"^(\w+[-/])*", "", RegexOptions.IgnoreCase);`
`@@ -70,7 +70,7 @@ private SemanticVersion ParseVersion(string tagPrefix, string tagSuffix)`
`70`	`70`	`var versionMatch = new Regex(@"^(?<!://)\d+\.\d+(\.\d+)");`
`71`	`71`	`var version = versionMatch.Match(toMatch);`
`72`	`72`
`73`		`- if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, tagSuffix, out var val))`
	`73`	`+ if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, out var val))`
`74`	`74`	`{`
`75`	`75`	`return val;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using GitVersion.Common;`
`4`		`-using GitVersion.Configuration;`
`5`		`-using GitVersion.Extensions;`
`6`	`3`
`7`	`4`	`namespace GitVersion.VersionCalculation`
`8`	`5`	`{`
`@@ -21,7 +18,7 @@ public override IEnumerable<BaseVersion> GetVersions()`
`21`	`18`	`{`
`22`	`19`	`if (string.IsNullOrEmpty(Context.Configuration.NextVersion) \|\| Context.IsCurrentCommitTagged)`
`23`	`20`	`yield break;`
`24`		`- var semanticVersion = SemanticVersion.Parse(Context.Configuration.NextVersion, Context.Configuration.GitTagPrefix, null);`
	`21`	`+ var semanticVersion = SemanticVersion.Parse(Context.Configuration.NextVersion, Context.Configuration.GitTagPrefix);`
`25`	`22`	`yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);`
`26`	`23`	`}`
`27`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public override IEnumerable<BaseVersion> GetVersions()`
`28`	`28`
`29`	`29`	`internal IEnumerable<BaseVersion> GetTaggedVersions(Branch currentBranch, DateTimeOffset? olderThan)`
`30`	`30`	`{`
`31`		`- var tagToUse = "";//Context.Configuration.GetBranchSpecificTag(null, currentBranch.FriendlyName, null);`
`32`		`- var allTags = repositoryMetadataProvider.GetValidVersionTags(Context.Configuration.GitTagPrefix, tagToUse, olderThan);`
	`31`	`+ var allTags = repositoryMetadataProvider.GetValidVersionTags(Context.Configuration.GitTagPrefix, olderThan);`
`33`	`32`
`34`	`33`
`35`	`34`	`var taggedVersions = currentBranch`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()`
`84`	`84`	`private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Branch releaseBranch)`
`85`	`85`	`{`
`86`	`86`	`var tagPrefixRegex = context.Configuration.GitTagPrefix;`
`87`		`- var tagSuffix = Context.Configuration.Tag;`
`88`	`87`
`89`	`88`	`// Find the commit where the child branch was created.`
`90`	`89`	`var baseSource = repositoryMetadataProvider.FindMergeBase(releaseBranch, context.CurrentBranch);`
`@@ -95,7 +94,7 @@ private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Br`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`return releaseVersionStrategy`
`98`		`- .GetVersions(tagPrefixRegex, tagSuffix, releaseBranch)`
	`97`	`+ .GetVersions(tagPrefixRegex, releaseBranch)`
`99`	`98`	`.Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));`
`100`	`99`	`}`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,19 +25,18 @@ public override IEnumerable<BaseVersion> GetVersions()`
`25`	`25`	`{`
`26`	`26`	`var currentBranch = Context.CurrentBranch;`
`27`	`27`	`var tagPrefixRegex = Context.Configuration.GitTagPrefix;`
`28`		`- var tagSuffix = Context.Configuration.GetBranchSpecificTag(null, currentBranch.FriendlyName, null);`
`29`		`- return GetVersions(tagPrefixRegex, tagSuffix, currentBranch);`
	`28`	`+ return GetVersions(tagPrefixRegex, currentBranch);`
`30`	`29`	`}`
`31`	`30`
`32`		`- internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, string tagSuffix, Branch currentBranch)`
	`31`	`+ internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex Branch currentBranch)`
`33`	`32`	`{`
`34`	`33`	`if (!Context.FullConfiguration.IsReleaseBranch(currentBranch.NameWithoutOrigin()))`
`35`	`34`	`{`
`36`	`35`	`yield break;`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`var branchName = currentBranch.FriendlyName;`
`40`		`- var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex, tagSuffix);`
	`39`	`+ var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex);`
`41`	`40`	`if (versionInBranch != null)`
`42`	`41`	`{`
`43`	`42`	`var commitBranchWasBranchedFrom = repositoryMetadataProvider.FindCommitBranchWasBranchedFrom(currentBranch, Context.FullConfiguration);`
`@@ -46,12 +45,12 @@ internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, string tagS`
`46`	`45`	`}`
`47`	`46`	`}`
`48`	`47`
`49`		`- private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex, string tagSuffix)`
	`48`	`+ private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)`
`50`	`49`	`{`
`51`	`50`	`var branchParts = branchName.Split('/', '-');`
`52`	`51`	`foreach (var part in branchParts)`
`53`	`52`	`{`
`54`		`- if (SemanticVersion.TryParse(part, tagPrefixRegex, tagSuffix, out var semanticVersion))`
	`53`	`+ if (SemanticVersion.TryParse(part, tagPrefixRegex, out var semanticVersion))`
`55`	`54`	`{`
`56`	`55`	`return Tuple.Create(part, semanticVersion);`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,21 +136,17 @@ public override int GetHashCode()`
`136`	`136`	`return v1.CompareTo(v2) < 0;`
`137`	`137`	`}`
`138`	`138`
`139`		`- public static SemanticVersion Parse(string version, string tagPrefixRegex, string tagSuffix)`
	`139`	`+ public static SemanticVersion Parse(string version, string tagPrefixRegex)`
`140`	`140`	`{`
`141`		`- if (!TryParse(version, tagPrefixRegex, tagSuffix, out var semanticVersion))`
	`141`	`+ if (!TryParse(version, tagPrefixRegex, out var semanticVersion))`
`142`	`142`	`throw new WarningException($"Failed to parse {version} into a Semantic Version");`
`143`	`143`
`144`	`144`	`return semanticVersion;`
`145`	`145`	`}`
`146`	`146`
`147`		`- public static bool TryParse(string version, string tagPrefixRegex, string tagSuffix, out SemanticVersion semanticVersion)`
	`147`	`+ public static bool TryParse(string version, string tagPrefixRegex, out SemanticVersion semanticVersion)`
`148`	`148`	`{`
`149`		`- if (tagSuffix == null)`
`150`		`- {`
`151`		`- tagSuffix = ".*";`
`152`		`- }`
`153`		`- var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>[0-9.]+-?{tagSuffix}[.]?\\d*)$");`
	`149`	`+ var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>.*)$");`
`154`	`150`
`155`	`151`	`if (!match.Success)`
`156`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public static class SemanticVersionExtensions`
`6`	`6`	`{`
`7`	`7`	`public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, EffectiveConfiguration configuration)`
`8`	`8`	`{`
`9`		`- if (!string.IsNullOrEmpty(configuration.NextVersion) && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, null, out var manualNextVersion))`
	`9`	`+ if (!string.IsNullOrEmpty(configuration.NextVersion) && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, out var manualNextVersion))`
`10`	`10`	`{`
`11`	`11`	`if (manualNextVersion > version)`
`12`	`12`	`{`