Better parsing of framework restrictions - fixes #1232

fsprojects · Nov 17, 2015 · 845d877 · 845d877
1 parent ff5158c
commit 845d877
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 2.26.0-alpha007 - 17.11.2015
+#### 2.26.0-alpha008 - 17.11.2015
 * Try all 4 NuGet APIs for "GetPackageDetails" in parallel - https://github.com/fsprojects/Paket/issues/1225
 * BUGFIX: Better parsing of framework restrictions - https://github.com/fsprojects/Paket/issues/1232
 * BUGFIX: Fix props files - https://github.com/fsprojects/Paket/issues/1233

diff --git a/src/Paket.Core/Nuget.fs b/src/Paket.Core/Nuget.fs
@@ -20,7 +20,7 @@ type NugetPackageCache =
       LicenseUrl : string
       CacheVersion: string }
 
-    static member CurrentCacheVersion = "2.0"
+    static member CurrentCacheVersion = "2.1"
 
 /// The NuGet cache folder.
 let CacheFolder = 

diff --git a/src/Paket.Core/Requirements.fs b/src/Paket.Core/Requirements.fs
@@ -112,7 +112,7 @@ let rec optimizeRestrictions restrictions =
                     | FrameworkRestriction.AtLeast(DotNetFramework(x)) -> isMatching x
                     | _ -> false
 
-                match newRestrictions' |> Seq.tryFind isLowerVersion with
+                match newRestrictions' |> Seq.rev |> Seq.tryFind isLowerVersion with
                 | None -> newRestrictions'
                 | Some n -> 
                     let newLowest =

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -37,7 +37,7 @@
     <StartArguments>update group Build</StartArguments>
     <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartArguments>install</StartArguments>
-    <StartArguments>update</StartArguments>
+    <StartArguments>update -f</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>