Merge pull request fsprojects#1558 from fsprojects/stablelock

Check if lock keeps stable
cdrnet · Mar 29, 2016 · d3803b0 · d3803b0
2 parents 241a1e7 + 9a9d3ba
commit d3803b0
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/Paket.Core/SemVer.fs b/src/Paket.Core/SemVer.fs
@@ -114,17 +114,9 @@ type SemVerInfo =
         sprintf "%d.%d.%d%s%s" x.Major x.Minor x.Patch build pre
 
     member x.NormalizeToShorter() = 
-        let build = 
-            if String.IsNullOrEmpty x.Build |> not && x.Build <> "0" then "." + x.Build
-            else ""
-
-        let pre = 
-            match x.PreRelease with
-            | Some preRelease -> sprintf "-%s" preRelease.Origin
-            | None -> ""
-
-        let s = sprintf "%d.%d.%d%s%s" x.Major x.Minor x.Patch build pre
-        if s = sprintf "%d.%d.0" x.Major x.Minor then sprintf "%d.%d" x.Major x.Minor else s
+        let s = x.Normalize()
+        let s2 = sprintf "%d.%d" x.Major x.Minor
+        if s = s2 + ".0" then s2 else s
 
     override x.ToString() = 
         match x.Original with