Move comparison into SemanticVersion

GitTools · Dec 13, 2019 · 495ba8a · 495ba8a
1 parent f6cbe6a
commit 495ba8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/GitVersionCore/SemanticVersioning/SemanticVersion.cs b/src/GitVersionCore/SemanticVersioning/SemanticVersion.cs
@@ -184,6 +184,11 @@ public static bool TryParse(string version, string tagPrefixRegex, out SemanticV
         }
 
         public int CompareTo(SemanticVersion value)
+        {
+            return CompareTo(value, true);
+        }
+
+        public int CompareTo(SemanticVersion value, bool includePrerelease)
         {
             if (value == null)
             {
@@ -213,7 +218,7 @@ public int CompareTo(SemanticVersion value)
                 }
                 return -1;
             }
-            if (PreReleaseTag != value.PreReleaseTag)
+            if (includePrerelease && PreReleaseTag != value.PreReleaseTag)
             {
                 if (PreReleaseTag > value.PreReleaseTag)
                 {

diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -66,9 +66,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             if (taggedSemanticVersion != null)
             {
                 // replace calculated version with tagged version only if tagged version greater or equal to calculated version
-                if (semver.Major > taggedSemanticVersion.Major ||
-                        (semver.Major == taggedSemanticVersion.Major && semver.Minor > taggedSemanticVersion.Minor) ||
-                        (semver.Major == taggedSemanticVersion.Major && semver.Minor == taggedSemanticVersion.Minor && semver.Patch > taggedSemanticVersion.Patch))
+                if (semver.CompareTo(taggedSemanticVersion, false) > 0)
                 {
                     taggedSemanticVersion = null;
                 }