Skip to content

Do not generate a dependency group for empty framework-neutral groups #2954

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
forki merged 1 commit into from
Jan 2, 2018
Merged

Do not generate a dependency group for empty framework-neutral groups #2954

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
Do not generate a dependency group for empty framework-neutral groups
  • Loading branch information
@eiriktsarpalis
eiriktsarpalis committed Jan 1, 2018
commit 960b040f89929d640db98df51af7e70d79358261
24 changes: 15 additions & 9 deletions src/Paket.Core/Packaging/NupkgWriter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,28 @@ module internal NupkgWriter =
add g
g

let buildDependencyNodes (excludedDependencies, add, dependencyList) =
let aggregateDependencies excludedDependencies dependencyList =
dependencyList
|> List.filter (fun (a, _) -> Set.contains a excludedDependencies |> not)
|> List.map (fun (a, b) -> a, b)
|> List.filter (fun (a, _) -> Set.contains a excludedDependencies |> not)

let buildDependencyNodes (add, dependencies) =
dependencies
|> List.iter (buildDependencyNode >> add)

let buildDependencyNodesByGroup excludedDependencies add dependencyGroup =
let node = buildGroupNode(dependencyGroup.Framework, add)
buildDependencyNodes(excludedDependencies, node.Add, dependencyGroup.Dependencies)
let buildDependencyNodesByGroup excludedDependencies add dependencyGroup =
match aggregateDependencies excludedDependencies dependencyGroup.Dependencies with
| [] when Option.isNone dependencyGroup.Framework -> ()
| dependencies ->
let node = buildGroupNode(dependencyGroup.Framework, add)
buildDependencyNodes(node.Add, dependencies)

let buildDependenciesNode excludedDependencies dependencyGroups =
if List.isEmpty dependencyGroups then () else
let d = XElement(ns + "dependencies")
match dependencyGroups.Length, dependencyGroups.Head.Framework with
| (1, None) ->
buildDependencyNodes(excludedDependencies, d.Add, dependencyGroups.Head.Dependencies)
match dependencyGroups with
| [g] when Option.isNone g.Framework ->
let deps = aggregateDependencies excludedDependencies g.Dependencies
buildDependencyNodes(d.Add, deps)
| _ ->
for g in dependencyGroups do
buildDependencyNodesByGroup excludedDependencies d.Add g
Expand Down