From 4a36386c35981584b449c273d73a643329a2384a Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 24 Jun 2016 17:48:57 +0200 Subject: [PATCH] Fixed out-of-date check for auto-detection of frameworks - references #1750 --- RELEASE_NOTES.md | 3 +++ src/Paket.Core/DependencyChangeDetection.fs | 15 +++++++++++---- src/Paket/Paket.fsproj | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c64ee6b5cf..56490c5a95 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 3.2.2 - 24.06.2016 +* BUGFIX: Fixed out-of-date check for auto-detection of frameworks - https://github.com/fsprojects/Paket/issues/1750 + #### 3.2.1 - 24.06.2016 * Paket.SemVer.Parse is now in PublicAPI.fs - https://github.com/fsprojects/Paket/pull/1754 diff --git a/src/Paket.Core/DependencyChangeDetection.fs b/src/Paket.Core/DependencyChangeDetection.fs index eb51916a42..9c208b5875 100644 --- a/src/Paket.Core/DependencyChangeDetection.fs +++ b/src/Paket.Core/DependencyChangeDetection.fs @@ -213,10 +213,17 @@ let GetChanges(dependenciesFile,lockFile,strict) = | Some dependenciesFileGroup -> match lockFile.Groups |> Map.tryFind groupName with | None -> true - | Some lockFileGroup -> dependenciesFileGroup.Options <> lockFileGroup.Options - - let hasChanges groupName _ = hasChangedSettings groupName || hasNuGetChanges groupName || hasRemoteFileChanges groupName - + | Some lockFileGroup -> + let lockFileGroupOptions = + if dependenciesFileGroup.Options.Settings.FrameworkRestrictions = AutoDetectFramework then + { lockFileGroup.Options with Settings = { lockFileGroup.Options.Settings with FrameworkRestrictions = AutoDetectFramework } } + else + lockFileGroup.Options + dependenciesFileGroup.Options <> lockFileGroupOptions + + let hasChanges groupName _ = + hasChangedSettings groupName || hasNuGetChanges groupName || hasRemoteFileChanges groupName + let hasAnyChanges = dependenciesFile.Groups |> Map.filter hasChanges diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 9a53531ae8..df5b6ca79e 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -51,8 +51,8 @@ D:\code\PaketKopie update -f D:\code\Paket\integrationtests\scenarios\i001117-aws\temp - find-packages source http://nuget.org/api/v2 - D:\code\Paket\integrationtests\scenarios\i001753-portablenet451\temp + restore + D:\code\fixieSpec 11