fix #1716

Author: forki

RELEASE_NOTES.md

@@ -1,5 +1,5 @@
-#### 2.66.8 - 02.06.2016
-* BUGFIX: Automatic prerelease expansion should not be done if explicit prereleases are requested - https://github.com/fsprojects/Paket/issues/1714
+#### 2.66.9 - 03.06.2016
+* BUGFIX: Automatic prerelease expansion should not be done if explicit prereleases are requested - https://github.com/fsprojects/Paket/issues/1716 https://github.com/fsprojects/Paket/issues/1714
 
 #### 2.66.6 - 31.05.2016
 * BUGFIX: Groups with different sources should not resolve to wrong packages - https://github.com/fsprojects/Paket/issues/1711

src/Paket.Core/PackageResolver.fs

@@ -337,13 +337,14 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, glob
                 globalOverride := true
             else
                 if Seq.isEmpty !compatibleVersions then
-                    let prereleaseStatus =
-                        if currentRequirement.Parent.IsRootRequirement() && currentRequirement.VersionRequirement <> VersionRequirement.AllReleases then
-                            currentRequirement.VersionRequirement.PreReleases
+                    let prereleaseStatus (r:PackageRequirement) =
+                        if r.Parent.IsRootRequirement() && r.VersionRequirement <> VersionRequirement.AllReleases then
+                            r.VersionRequirement.PreReleases
                         else
                             PreReleaseStatus.All
 
-                    let prereleases = Seq.filter (isInRange (fun r -> r.IncludingPrereleases(prereleaseStatus))) (!availableVersions) |> Seq.toList
+                    let available = !availableVersions |> Seq.toList
+                    let prereleases = List.filter (isInRange (fun r -> r.IncludingPrereleases(prereleaseStatus r))) available
                     let allPrereleases = prereleases |> List.filter (fun (v,_) -> v.PreRelease <> None) = prereleases
                     if allPrereleases then
                         availableVersions := Seq.ofList prereleases

src/Paket/Paket.fsproj

@@ -50,7 +50,7 @@
     <StartWorkingDirectory>D:\code\PaketKopie</StartWorkingDirectory>
     <StartArguments>update -f</StartArguments>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001117-aws\temp</StartWorkingDirectory>
-    <StartArguments>update</StartArguments>
+    <StartArguments>update nuget CityTouch.Util.Nhibernate</StartArguments>
     <StartWorkingDirectory>D:\temp\paket-issue-repro</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>