Force resolver to look into deeper levels - fixes #1520

fsprojects · Mar 16, 2016 · 355708f · 355708f
1 parent 579a2e7
commit 355708f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
 #### 2.52.9 - 16.03.2016
 * USABILITY: Improved error message when paket.dependencies can't be found - https://github.com/fsprojects/Paket/pull/1519
+* BUGFIX: Force resolver to look into deeper levels - https://github.com/fsprojects/Paket/issues/1520
 
 #### 2.52.8 - 15.03.2016
 * USABILITY: Better error message when paket.lock an paket.dependencies are out of sync.

diff --git a/integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs b/integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs
@@ -112,7 +112,6 @@ let ``#1432 update doesn't throw Stackoverflow``() =
     directPaket "pack templatefile paket.D.template version 1.0.0-prerelease output bin" scenario  |> ignore
     directPaket "update" scenario|> ignore
 
-
 [<Test>]
 let ``#1500 don't detect framework twice``() =
     update "i001500-auto-detect" |> ignore
@@ -123,4 +122,8 @@ let ``#1500 don't detect framework twice``() =
 
 [<Test>]
 let ``#1501 download succeeds``() =
-    update "i001510-download" |> ignore
+    update "i001510-download" |> ignore
+
+[<Test>]
+let ``#1520 update with pinned dependency succeeds``() =
+    update "i001520-pinned-error" |> ignore
diff --git a/integrationtests/scenarios/i001520-pinned-error/before/paket.dependencies b/integrationtests/scenarios/i001520-pinned-error/before/paket.dependencies
@@ -0,0 +1,2 @@
+source https://nuget.org/api/v2
+nuget Microsoft.ApplicationInsights.WindowsServer = 1.2.3
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -473,12 +473,14 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
 
                             let newResolution = Map.add exploredPackage.Name exploredPackage currentResolution
 
-                            state := step (relax,newFilteredVersions,newResolution,Set.add currentRequirement closedRequirements,newOpen)
-                            match !state with
-                            | Resolution.Conflict (_,_,stillOpen,_,_)
-                                when stillOpen |> Set.exists (fun r -> r = currentRequirement || r.Graph |> List.contains currentRequirement) |> not ->
-                                forceBreak := true
-                            | _ -> ()
+                            let newClosed = Set.add currentRequirement closedRequirements
+
+                            state := step (relax,newFilteredVersions,newResolution,newClosed,newOpen)
+//                            match !state with
+//                            | Resolution.Conflict(resolved,closed,stillOpen,lastPackageRequirement,getVersionF) 
+//                                when stillOpen |> Set.exists (fun r -> r = currentRequirement || r.Graph |> List.contains currentRequirement) |> not ->
+//                                forceBreak := true
+//                            | _ -> ()
 
                             allUnlisted := exploredPackage.Unlisted && !allUnlisted
 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -29,8 +29,8 @@
     </DocumentationFile>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
-    <StartArguments>install</StartArguments>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001427-content-once-remove\temp</StartWorkingDirectory>
+    <StartArguments>update</StartArguments>
+    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001520-pinned-error\temp</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		source https://nuget.org/api/v2
		nuget Microsoft.ApplicationInsights.WindowsServer = 1.2.3