remove redundant dot checks

Author: SimonCropp

GitVersionCore/GitFlow/BranchFinders/HotfixVersionFinder.cs

@@ -8,8 +8,6 @@ class HotfixVersionFinder
         public SemanticVersion FindVersion(GitVersionContext context)
         {
             var versionString = GetSuffix(context.CurrentBranch);
-            if (!versionString.Contains("."))
-                return new SemanticVersion();
             var shortVersion = ShortVersionParser.Parse(versionString);
 
             EnsureVersionIsValid(shortVersion, context.CurrentBranch);

GitVersionCore/GitFlow/BranchFinders/ReleaseVersionFinder.cs

@@ -8,8 +8,6 @@ class ReleaseVersionFinder
         public SemanticVersion FindVersion(GitVersionContext context)
         {
             var versionString = GetSuffix(context.CurrentBranch);
-            if (!versionString.Contains("."))
-                return new SemanticVersion();
             var shortVersion = ShortVersionParser.Parse(versionString);
 
             EnsureVersionIsValid(shortVersion, context.CurrentBranch);

GitVersionCore/GitHubFlow/MergedBranchesWithVersionFinder.cs

@@ -1,39 +1,35 @@
 namespace GitVersion
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
 
     public class MergedBranchesWithVersionFinder
     {
-        Lazy<SemanticVersion> lastMergedBranchWithVersion;
+        GitVersionContext context;
 
         public MergedBranchesWithVersionFinder(GitVersionContext context)
         {
-            lastMergedBranchWithVersion = new Lazy<SemanticVersion>(() => GetVersion(context));
+            this.context = context;
         }
 
-        public SemanticVersion GetVersion()
-        {
-            return lastMergedBranchWithVersion.Value;
-        }
-
-        SemanticVersion GetVersion(GitVersionContext context)
+        public bool TryGetVersion(out SemanticVersion semanticVersion)
         {
             var shortVersion = GetAllVersions(context)
                 .OrderBy(x=>x.Major)
                 .ThenBy(x=>x.Minor).ThenBy(x=>x.Patch)
                 .LastOrDefault();
             if (shortVersion == null)
             {
-                return null;
+                semanticVersion = null;
+                return false;
             }
-            return new SemanticVersion
+            semanticVersion =new SemanticVersion
             {
                 Major = shortVersion.Major,
                 Minor = shortVersion.Minor,
                 Patch = shortVersion.Patch
             };
+            return true;
         }
 
         static IEnumerable<ShortVersion> GetAllVersions(GitVersionContext context)

GitVersionCore/GitHubFlow/NextSemverCalculator.cs

@@ -33,11 +33,18 @@ public SemanticVersion NextVersion()
             {
                 versions.Add(fileVersion);
             }
-            versions.Add(mergedBranchesWithVersionFinder.GetVersion());
+            SemanticVersion tryGetVersion;
+            if (mergedBranchesWithVersionFinder.TryGetVersion(out tryGetVersion))
+            {
+                versions.Add(tryGetVersion);
+            }
             var otherBranchVersion = unknownBranchFinder.FindVersion(context);
-            if (otherBranchVersion != null && otherBranchVersion.PreReleaseTag != null && otherBranchVersion.PreReleaseTag.Name == "release")
+            if (otherBranchVersion != null)
             {
-                otherBranchVersion.PreReleaseTag.Name = "beta";
+                if (otherBranchVersion.PreReleaseTag != null && otherBranchVersion.PreReleaseTag.Name == "release")
+                {
+                    otherBranchVersion.PreReleaseTag.Name = "beta";
+                }
             }
             versions.Add(otherBranchVersion);
 

GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs

@@ -1,39 +1,29 @@
 namespace GitVersion
 {
-    using System;
     using System.Linq;
     using LibGit2Sharp;
 
     class OtherBranchVersionFinder 
     {
         public SemanticVersion FindVersion(GitVersionContext context)
-        {
-            try
-            {
-                return FindVersion(context, "master");
-            }
-            catch (Exception)
-            {
-                return new SemanticVersion();
-            }
-        }
-
-        SemanticVersion FindVersion(GitVersionContext context, string baseBranchName)
         {
             var versionString = GetUnknownBranchSuffix(context.CurrentBranch);
             if (!versionString.Contains("."))
+            {
                 return new SemanticVersion();
+            }
             var shortVersion = ShortVersionParser.Parse(versionString);
 
             var semanticVersionPreReleaseTag = context.CurrentBranch.Name.Replace("-" + versionString, string.Empty) + ".1";
 
-            var nbHotfixCommits = BranchCommitDifferenceFinder.NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, BranchType.Unknown, baseBranchName);
-            
+            var nbHotfixCommits = BranchCommitDifferenceFinder.NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, BranchType.Unknown, "master");
+
             var tagVersion = RecentTagVersionExtractor.RetrieveMostRecentOptionalTagVersion(context.Repository, shortVersion, context.CurrentBranch.Commits.Take(nbHotfixCommits + 1));
             if (tagVersion != null)
             {
                 semanticVersionPreReleaseTag = tagVersion;
             }
+
             return new SemanticVersion
             {
                 Major = shortVersion.Major,
@@ -42,7 +32,6 @@ SemanticVersion FindVersion(GitVersionContext context, string baseBranchName)
                 PreReleaseTag = semanticVersionPreReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(nbHotfixCommits, context.CurrentBranch.Name, context.CurrentCommit.Sha, context.CurrentCommit.When())
             };
-
         }
 
         static string GetUnknownBranchSuffix(Branch branch)

GitVersionTask.Tests/GitHubFlow/MergedBranchesWithVersionFinderTests.cs

@@ -18,7 +18,8 @@ public void ShouldFindMergeCommit()
         };
         var sut = new MergedBranchesWithVersionFinder(new GitVersionContext(null, currentBranch));
 
-        var version = sut.GetVersion();
+        SemanticVersion version;
+        sut.TryGetVersion(out version);
 
         version.ToString().ShouldBe("2.0.0");
     }