Skip to content
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

generate-include-scripts: don't check dll order when it can be skipped #1945

Merged
merged 1 commit into from
Oct 10, 2016
Merged

generate-include-scripts: don't check dll order when it can be skipped #1945

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
16 changes: 10 additions & 6 deletions src/Paket.Core/ScriptGeneration.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,16 @@ module PackageAndAssemblyResolution =
|> Map.ofSeq

let getDllOrder (dllFiles : AssemblyDefinition list) =
// we ignore all unknown references as they are most likely resolved on package level
let known = dllFiles |> Seq.map (fun a -> a.FullName) |> Set.ofSeq
getPackageOrderGeneric
(fun (p:AssemblyDefinition) -> p.FullName)
(fun p -> p.MainModule.AssemblyReferences |> Seq.map (fun r -> r.FullName) |> Seq.filter (known.Contains))
dllFiles
// this check saves looking at assembly metadata when we know this is not needed
if List.length dllFiles = 1 then
dllFiles
else
// we ignore all unknown references as they are most likely resolved on package level
let known = dllFiles |> Seq.map (fun a -> a.FullName) |> Set.ofSeq
getPackageOrderGeneric
(fun (p:AssemblyDefinition) -> p.FullName)
(fun p -> p.MainModule.AssemblyReferences |> Seq.map (fun r -> r.FullName) |> Seq.filter (known.Contains))
dllFiles

let getDllsWithinPackage (framework: FrameworkIdentifier) (installModel :InstallModel) =
let dllFiles =
Expand Down