diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b20497fa6d..51a2783998 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 3.36.5 - 13.03.2017 +* BUGFIX: auto-detect no onger causes Out of sync warning - https://github.com/fsprojects/Paket/issues/2096 + #### 3.36.4 - 13.03.2017 * USABILITY: Remove confusing yellow diagnostics in pack - https://github.com/fsprojects/Paket/issues/2164 diff --git a/src/Paket.Core/DependencyChangeDetection.fs b/src/Paket.Core/DependencyChangeDetection.fs index 81989caefe..99a806b8dc 100644 --- a/src/Paket.Core/DependencyChangeDetection.fs +++ b/src/Paket.Core/DependencyChangeDetection.fs @@ -26,19 +26,20 @@ let findNuGetChangesInDependenciesFile(dependenciesFile:DependenciesFile,lockFil let added groupName transitives = match dependenciesFile.Groups |> Map.tryFind groupName with | None -> Set.empty - | Some group -> + | Some depsGroup -> let lockFileGroup = lockFile.Groups |> Map.tryFind groupName - group.Packages + depsGroup.Packages |> Seq.map (fun d -> - d.Name, { d with Settings = group.Options.Settings + d.Settings }) + d.Name, { d with Settings = depsGroup.Options.Settings + d.Settings }) |> Seq.filter (fun (name,dependenciesFilePackage) -> match lockFileGroup with | None -> true | Some group -> match group.Resolution.TryFind name with | Some lockFilePackage -> - let p' = { lockFilePackage with Settings = group.Options.Settings + lockFilePackage.Settings } - hasChanged groupName transitives dependenciesFilePackage p' + hasChanged groupName transitives + { dependenciesFilePackage with Settings = depsGroup.Options.Settings + dependenciesFilePackage.Settings } + { lockFilePackage with Settings = group.Options.Settings + lockFilePackage.Settings } | _ -> true) |> Seq.map (fun (p,_) -> groupName,p) |> Set.ofSeq