BUGFIX: Exclude unlisted NuGet packages in Resolver - fixes #327

fsprojects · Nov 6, 2014 · 502708e · 502708e
1 parent 1ff5bd8
commit 502708e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 0.11.16 - 06.11.2014
+* BUGFIX: Exclude unlisted NuGet packages in Resolver - https://github.com/fsprojects/Paket/issues/327
+
 #### 0.11.15 - 06.11.2014
 * BUGFIX: Detect Lib folder on Linux - https://github.com/fsprojects/Paket/issues/332
 

diff --git a/src/Paket.Core/LockFile.fs b/src/Paket.Core/LockFile.fs
@@ -109,6 +109,7 @@ module LockFileParser =
                                      { Source = PackageSource.Parse(remote, None)
                                        Name = parts.[0]
                                        Dependencies = Set.empty
+                                       Unlisted = false
                                        Version = SemVer.Parse version } :: state.Packages }
                 | None -> failwith "no source has been specified."
             | NugetDependency (name, _) ->

diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs
@@ -21,6 +21,7 @@ type ResolvedPackage =
     { Name : string
       Version : SemVerInfo
       Dependencies : (string * VersionRequirement * (FrameworkIdentifier option)) Set
+      Unlisted : bool
       Source : PackageSource }
 
     override this.ToString() = sprintf "%s %s" this.Name (this.Version.ToString())
@@ -86,6 +87,7 @@ let Resolve(getVersionsF, getPackageDetailsF, rootDependencies:PackageRequiremen
                 { Name = packageDetails.Name
                   Version = version
                   Dependencies = packageDetails.DirectDependencies
+                  Unlisted = packageDetails.Unlisted
                   Source = packageDetails.Source }
             exploredPackages.Add((packageName.ToLower(),version),explored)
             explored
@@ -160,7 +162,8 @@ let Resolve(getVersionsF, getPackageDetailsF, rootDependencies:PackageRequiremen
             |> List.fold (fun state versionToExplore ->
                 match state with
                 | ResolvedPackages.Conflict _ ->
-                    let exploredPackage = getExploredPackage(dependency.Sources,dependency.Name,versionToExplore)
+                    let exploredPackage = getExploredPackage(dependency.Sources,dependency.Name,versionToExplore)    
+                    if exploredPackage.Unlisted then state else                
                     let newFilteredVersion = Map.add dependency.Name ([versionToExplore],globalOverride) filteredVersions
                     let newDependencies =
                         exploredPackage.Dependencies
@@ -180,7 +183,7 @@ let Resolve(getVersionsF, getPackageDetailsF, rootDependencies:PackageRequiremen
 
                     improveModel (newFilteredVersion,exploredPackage::packages,Set.add dependency closed,Set.union rest newDependencies)
                 | ResolvedPackages.Ok _ -> state)
-                  (ResolvedPackages.Conflict(closed,stillOpen))
+                    (ResolvedPackages.Conflict(closed,stillOpen))
 
     match improveModel (Map.empty, [], Set.empty, Set.ofList rootDependencies) with
     | ResolvedPackages.Conflict(_) as c -> c

diff --git a/tests/Paket.Tests/Simplifier/BasicScenarioSpecs.fs b/tests/Paket.Tests/Simplifier/BasicScenarioSpecs.fs
@@ -11,6 +11,7 @@ let toPackages =
         { Name = name
           Version = SemVer.Parse ver
           Source = PackageSources.DefaultNugetSource
+          Unlisted = false
           Dependencies = deps |> List.map (fun (name, verRan) -> name, NugetVersionRangeParser.parse verRan,None) |> Set.ofList } : PackageResolver.ResolvedPackage)
 
 let graph1 =