Skip to content

we need to prefer package over group settings #2687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthid merged 1 commit into from
Aug 30, 2017
Merged

we need to prefer package over group settings #2687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
we need to prefer package over group settings, fixes #2682
  • Loading branch information
@matthid
matthid committed Aug 29, 2017
commit c26f20d38e1210f90b2578cba4c323b404fd69e4
6 changes: 3 additions & 3 deletions src/Paket.Core/Installation/DependencyChangeDetection.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let findNuGetChangesInDependenciesFile(dependenciesFile:DependenciesFile,lockFil
let lockFileGroup = lockFile.Groups |> Map.tryFind groupName
depsGroup.Packages
|> Seq.map (fun d ->
d.Name, { d with Settings = depsGroup.Options.Settings + d.Settings })
d.Name, { d with Settings = d.Settings + depsGroup.Options.Settings })
|> Seq.map (fun (name,dependenciesFilePackage) ->
name, dependenciesFilePackage,
match lockFileGroup with
Expand All @@ -60,7 +60,7 @@ let findNuGetChangesInDependenciesFile(dependenciesFile:DependenciesFile,lockFil
match group.TryFind name with
| Some lockFilePackage ->
getChanges groupName transitives
{ dependenciesFilePackage with Settings = depsGroup.Options.Settings + dependenciesFilePackage.Settings }
{ dependenciesFilePackage with Settings = dependenciesFilePackage.Settings + depsGroup.Options.Settings }
lockFilePackage
| _ -> [PackageNotFoundInLockFile])
|> Seq.filter (fun (_,_, changes) -> changes.Length > 0)
Expand All @@ -73,7 +73,7 @@ let findNuGetChangesInDependenciesFile(dependenciesFile:DependenciesFile,lockFil
| None -> Map.empty
| Some group ->
group.Packages
|> Seq.map (fun d -> d.Name,{ d with Settings = group.Options.Settings + d.Settings })
|> Seq.map (fun d -> d.Name,{ d with Settings = d.Settings + group.Options.Settings })
|> Map.ofSeq

[for t in lockFile.GetTopLevelDependencies(groupName) do
Expand Down