Simplify resolver

fsprojects · Oct 16, 2015 · c6f6af2 · c6f6af2
1 parent f545c3c
commit c6f6af2
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -186,18 +186,14 @@ let calcOpenRequirements (exploredPackage:ResolvedPackage,globalFrameworkRestric
                            Parent = Package(dependency.Name, versionToExplore)
                            Settings = { dependency.Settings with FrameworkRestrictions = newRestrictions } })
     |> Set.filter (fun d ->
-        if Set.contains d stillOpen then false else
-        if Set.contains d closed then false else
-        if closed |> Seq.exists (fun x -> 
+        stillOpen
+        |> Seq.append closed
+        |> Seq.exists (fun x ->
             x.Name = d.Name && 
-              (x.VersionRequirement.Range.IsIncludedIn d.VersionRequirement.Range || 
-               x.VersionRequirement.Range.IsGlobalOverride)) then 
-            false 
-        else
-            stillOpen |> Seq.exists (fun x -> 
-                x.Name = d.Name && 
-                  (x.VersionRequirement.Range.IsIncludedIn d.VersionRequirement.Range ||
-                   x.VersionRequirement.Range.IsGlobalOverride)) |> not)
+                (x = d ||
+                 x.VersionRequirement.Range.IsIncludedIn d.VersionRequirement.Range ||
+                 x.VersionRequirement.Range.IsGlobalOverride))
+        |> not)
     |> Set.union rest
 
 type Resolved = {