Parse new resolver settings as group setting in LockFile

Author: forki

Diff for: src/Paket.Core/Dependencies/PackageResolver.fs

@@ -1079,6 +1079,8 @@ let Resolve (getVersionsRaw : PackageVersionsFunc, getPreferredVersionsRaw : Pre
             let sorted =
                 match resolverStrategy with
                 | ResolverStrategy.Max -> List.sortDescending versions
+                | ResolverStrategy.LatestPatch -> List.sortDescending versions
+                | ResolverStrategy.LatestMinor -> List.sortDescending versions
                 | ResolverStrategy.Min -> List.sort versions
 
             yield! sorted }

Diff for: src/Paket.Core/PaketConfigFiles/DependenciesFile.fs

@@ -454,7 +454,12 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
         match strategy with
         | None -> this
         | Some strategy ->
-        let strategyString = sprintf "strategy: %s" (match strategy with ResolverStrategy.Max -> "max" | ResolverStrategy.Min -> "min")
+        let strategyString =
+            match strategy with
+            | ResolverStrategy.Max -> "strategy: max" 
+            | ResolverStrategy.LatestPatch -> "strategy: latest-patch" 
+            | ResolverStrategy.LatestMinor -> "strategy: latest-minor" 
+            | ResolverStrategy.Min -> "strategy: min"
 
         let list = new System.Collections.Generic.List<_>()
         list.AddRange textRepresentation
@@ -478,7 +483,11 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
         match strategy with
         | None -> this
         | Some strategy ->
-        let strategyString = sprintf "lowest_matching: %s" (match strategy with ResolverStrategy.Max -> "false" | ResolverStrategy.Min -> "true")
+        let strategyString = 
+            match strategy with
+            | ResolverStrategy.Max -> "lowest_matching: max" 
+            | ResolverStrategy.Min -> "lowest_matching: min"
+            | _ -> failwithf "Strategy %O is invalid for lowest_matching setting." strategy
 
         let list = new System.Collections.Generic.List<_>()
         list.AddRange textRepresentation

Diff for: src/Paket.Core/PaketConfigFiles/LockFile.fs

@@ -53,11 +53,14 @@ module LockFileSerializer =
         | None -> ()
         match options.ResolverStrategyForTransitives with
         | Some ResolverStrategy.Min -> yield "STRATEGY: MIN"
+        | Some ResolverStrategy.LatestPatch -> yield "STRATEGY: LATEST-PATCH"
+        | Some ResolverStrategy.LatestMinor -> yield "STRATEGY: LATEST-MINOR"
         | Some ResolverStrategy.Max -> yield "STRATEGY: MAX"
         | None -> ()
         match options.ResolverStrategyForDirectDependencies with
         | Some ResolverStrategy.Min -> yield "LOWEST_MATCHING: TRUE"
         | Some ResolverStrategy.Max -> yield "LOWEST_MATCHING: FALSE"
+        | Some x -> failwithf "Strategy %O is invalid as lowest_matching setting." x
         | None -> () 
         match options.Settings.CopyLocal with
         | Some x -> yield "COPY-LOCAL: " + x.ToString().ToUpper()
@@ -346,6 +349,8 @@ module LockFileParser =
             let setting =
                 match trimmed.Trim() with
                 | String.EqualsIC "min" -> Some ResolverStrategy.Min
+                | String.EqualsIC "latest-patch" -> Some ResolverStrategy.LatestPatch
+                | String.EqualsIC "latest-minor" -> Some ResolverStrategy.LatestMinor
                 | String.EqualsIC "max" -> Some ResolverStrategy.Max
                 | _ -> None
 

Diff for: tests/Paket.Tests/Lockfile/ParserSpecs.fs

@@ -670,6 +670,34 @@ NUGET
     packages.Length |> shouldEqual 1
     lockFile.Options.ResolverStrategyForTransitives |> shouldEqual (Some ResolverStrategy.Max)
 
+[<Test>]
+let ``should parse strategy latest-patch lock file``() = 
+    let lockFile = """STRATEGY: LATEST-PATCH
+NUGET
+  remote: "D:\code\temp with space"
+  specs:
+    Castle.Windsor (2.1)
+"""
+    let lockFile = LockFileParser.Parse(toLines lockFile) |> List.head
+    let packages = List.rev lockFile.Packages
+    
+    packages.Length |> shouldEqual 1
+    lockFile.Options.ResolverStrategyForTransitives |> shouldEqual (Some ResolverStrategy.LatestPatch)
+
+[<Test>]
+let ``should parse strategy latest-minor lock file``() = 
+    let lockFile = """STRATEGY: LATEST-MINOR
+NUGET
+  remote: "D:\code\temp with space"
+  specs:
+    Castle.Windsor (2.1)
+"""
+    let lockFile = LockFileParser.Parse(toLines lockFile) |> List.head
+    let packages = List.rev lockFile.Packages
+    
+    packages.Length |> shouldEqual 1
+    lockFile.Options.ResolverStrategyForTransitives |> shouldEqual (Some ResolverStrategy.LatestMinor)
+
 [<Test>]
 let ``should parse no strategy lock file``() = 
     let lockFile = """NUGET