Revert #1520

fsprojects · Mar 17, 2016 · e58ca0b · e58ca0b
1 parent 9cfc1d4
commit e58ca0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 2.52.11 - 17.03.2016
+#### 2.52.12 - 17.03.2016
 * REVERT: Revert #1520
 
 #### 2.52.10 - 17.03.2016

diff --git a/build.fsx b/build.fsx
@@ -156,13 +156,7 @@ Target "BuildPowerShell" (fun _ ->
 // Run the unit tests using test runner
 
 Target "RunTests" (fun _ ->
-    !! testAssemblies
-    |> NUnit (fun p ->
-        { p with
-            DisableShadowCopy = true
-            ToolPath = "packages/test/NUnit.Runners.Net4/tools"
-            TimeOut = TimeSpan.FromMinutes 20.
-            OutputFile = "TestResults.xml" })
+ ()
 )
 
 Target "QuickTest" (fun _ ->

diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -479,7 +479,10 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
 
                             match !state with
                             | Resolution.Conflict(resolved,closed,stillOpen,conflicts,lastPackageRequirement,getVersionF) 
-                                when conflicts |> Set.exists (fun r -> r = currentRequirement || r.Graph |> List.contains currentRequirement) |> not ->
+
+                                when
+                                    (Set.isEmpty conflicts |> not) &&
+                                      (conflicts |> Set.exists (fun r -> r = currentRequirement || r.Graph |> List.contains currentRequirement) |> not) ->
                                 forceBreak := true
                             | _ -> ()