move beta bumping code

Author: SimonCropp

GitVersionCore/GitHubFlow/NextSemverCalculator.cs

@@ -38,14 +38,8 @@ public SemanticVersion NextVersion()
             {
                 versions.Add(tryGetVersion);
             }
+
             var otherBranchVersion = unknownBranchFinder.FindVersion(context);
-            if (otherBranchVersion != null)
-            {
-                if (otherBranchVersion.PreReleaseTag != null && otherBranchVersion.PreReleaseTag.Name == "release")
-                {
-                    otherBranchVersion.PreReleaseTag.Name = "beta";
-                }
-            }
             versions.Add(otherBranchVersion);
 
             var maxCalculated = versions.Max();

GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs

@@ -14,7 +14,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             }
             var shortVersion = ShortVersionParser.Parse(versionString);
 
-            var semanticVersionPreReleaseTag = context.CurrentBranch.Name.Replace("-" + versionString, string.Empty) + ".1";
+            SemanticVersionPreReleaseTag semanticVersionPreReleaseTag = context.CurrentBranch.Name.Replace("-" + versionString, string.Empty) + ".1";
 
             var nbHotfixCommits = BranchCommitDifferenceFinder.NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, BranchType.Unknown, "master");
 
@@ -24,6 +24,11 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 semanticVersionPreReleaseTag = tagVersion;
             }
 
+            if (semanticVersionPreReleaseTag.Name == "release")
+            {
+                semanticVersionPreReleaseTag.Name = "beta";
+            }
+
             return new SemanticVersion
             {
                 Major = shortVersion.Major,