try to fix #2640 by always calling getVersions.

fsprojects · Sep 4, 2017 · 7077dcd · 7077dcd
1 parent 29aadbc
commit 7077dcd
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/Paket.Core/Dependencies/PackageResolver.fs b/src/Paket.Core/Dependencies/PackageResolver.fs
@@ -499,22 +499,25 @@ let private getCompatibleVersions
             allRequirementsOfCurrentPackage
             |> Set.forall (fun r -> (mapF r).VersionRequirement.IsInRange ver)
 
-        let getSingleVersion v =
-            match currentRequirement.Parent with
-            | PackageRequirementSource.Package(_,_,parentSource) ->
-                let sources = parentSource :: currentRequirement.Sources |> List.distinct
-                Seq.singleton (v,sources)
-            | _ ->
-                let sources : PackageSource list = currentRequirement.Sources |> List.sortBy (fun x -> not x.IsLocalFeed, String.containsIgnoreCase "nuget.org" x.Url |> not)
-                Seq.singleton (v,sources)
+        //let getSingleVersion v =
+        //    match currentRequirement.Parent with
+        //    | PackageRequirementSource.Package(_,_,parentSource) ->
+        //        let sources = parentSource :: currentRequirement.Sources |> List.distinct
+        //        Seq.singleton (v,sources)
+        //    | _ ->
+        //        let sources : PackageSource list = currentRequirement.Sources |> List.sortBy (fun x -> not x.IsLocalFeed, String.containsIgnoreCase "nuget.org" x.Url |> not)
+        //        Seq.singleton (v,sources)
 
         let availableVersions =
+            let resolverStrategy = getResolverStrategy globalStrategyForDirectDependencies globalStrategyForTransitives allRequirementsOfCurrentPackage currentRequirement
+            let allVersions = getVersionsF currentRequirement.Sources resolverStrategy groupName currentRequirement.Name
             match currentRequirement.VersionRequirement.Range with
-            | OverrideAll v -> getSingleVersion v
-            | Specific v -> getSingleVersion v 
-            | _ ->
-                let resolverStrategy = getResolverStrategy globalStrategyForDirectDependencies globalStrategyForTransitives allRequirementsOfCurrentPackage currentRequirement
-                getVersionsF currentRequirement.Sources resolverStrategy groupName currentRequirement.Name
+            | Specific v
+            | OverrideAll v -> 
+                allVersions
+                |> Seq.filter (fun (v1, _) -> v1 = v)
+                //getSingleVersion v
+            | _ -> allVersions
 
         let compatibleVersions = Seq.filter (isInRange id) availableVersions |> Seq.cache