Paket.dependency with version ranges fails when package has pinned de…

…pendency and that version is unlisted - fixes #1579
fsprojects · Apr 7, 2016 · e79f45c · e79f45c
1 parent b099dfe
commit e79f45c
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 8 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.58.5 - 07.04.2016
+* BUGFIX: Paket.dependency with version ranges failed when package has pinned dependency and that version is unlisted - https://github.com/fsprojects/Paket/issues/1579
+
 #### 2.58.4 - 07.04.2016
 * BUGFIX: Github dependencies reference transitive NuGet packages to projects - https://github.com/fsprojects/Paket/issues/1578
 

diff --git a/integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs b/integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs
@@ -112,6 +112,14 @@ 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 ``#1579 update allows unpinned``() =
+    let scenario = "i001579-unlisted"
+
+    prepare scenario
+    directPaket "pack templatefile paket.A.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

diff --git a/integrationtests/scenarios/i001579-unlisted/before/paket.A.templatetemplate b/integrationtests/scenarios/i001579-unlisted/before/paket.A.templatetemplate
@@ -0,0 +1,24 @@
+type file
+id Paket.Test.A
+owners Wooga
+authors Wooga
+owners Paket
+authors Paket
+projectUrl
+    https://github.com/
+iconUrl
+    http://github.io/logo.png
+licenseUrl
+    https://github.com/LICENSE.txt
+requireLicenseAcceptance
+    false
+copyright
+    Copyright 2015
+tags
+    wdk
+summary
+    Sbs Core Library
+description
+    provides connecting to sbs on the network layer
+dependencies    
+  Mvvmlight == 4.2.30.0
diff --git a/integrationtests/scenarios/i001579-unlisted/before/paket.dependencies b/integrationtests/scenarios/i001579-unlisted/before/paket.dependencies
@@ -0,0 +1,6 @@
+source bin
+source https://www.nuget.org/api/v2
+
+nuget Mvvmlight ~> 4
+
+nuget Paket.Test.A
diff --git a/integrationtests/scenarios/i001579-unlisted/before/paket.lock b/integrationtests/scenarios/i001579-unlisted/before/paket.lock
@@ -0,0 +1,4 @@
+NUGET
+  remote: bin
+  specs:
+    Paket.Test.A (1.0.0)
diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -441,7 +441,7 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
                 let ready = ref false
                 let state = ref conflictStatus
                 let useUnlisted = ref false
-                let allUnlisted = ref true
+                let hasUnlisted = ref false
 
                 while not !ready do
                     let trial = ref 0
@@ -466,8 +466,9 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
                         match getExploredPackage(currentRequirement,versionToExplore) with
                         | None -> ()
                         | Some exploredPackage ->
+                            hasUnlisted := exploredPackage.Unlisted || !hasUnlisted
                             if exploredPackage.Unlisted && not !useUnlisted then 
-                                () 
+                                ()
                             else
                                 let newFilteredVersions = Map.add currentRequirement.Name ([versionToExplore],globalOverride) filteredVersions
 
@@ -488,11 +489,9 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
                                           newResolution.Count > 1 &&
                                           (conflicts |> Set.exists (fun r -> r = currentRequirement || r.Graph |> List.contains currentRequirement) |> not) ->
                                         forceBreak := true
-                                | _ -> ()
+                                | _ -> ()                            
 
-                                allUnlisted := exploredPackage.Unlisted && !allUnlisted
-
-                    if not !useUnlisted && !allUnlisted && not (isOk()) then
+                    if not !useUnlisted && !hasUnlisted && not (isOk()) then
                         useUnlisted := true
                     else
                         ready := true

diff --git a/src/Paket.Core/Requirements.fs b/src/Paket.Core/Requirements.fs
@@ -555,6 +555,7 @@ type PackageRequirement =
     override this.ToString() =
         sprintf "%O %O (from %O)" this.Name this.VersionRequirement this.Parent
 
+
     override this.GetHashCode() = hash (this.Name,this.VersionRequirement)
 
     member this.IncludingPrereleases() = 

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\i001578-transitive-ref\temp</StartWorkingDirectory>
+    <StartArguments>update</StartArguments>
+    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001579-unlisted\temp\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>