Skip to content

Improve binding redirects performance #3239

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
Jun 7, 2018
Merged

Improve binding redirects performance #3239

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions src/Paket.Core/Installation/BindingRedirects.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ open System.Xml.Linq
open System.IO
open Paket.Xml.Linq
open System.Xml.XPath
open System.Reflection

/// Represents a binding redirection
type BindingRedirect =
Expand Down Expand Up @@ -196,9 +197,8 @@ let applyBindingRedirectsToFolder isFirstGroup createNewBindingFiles cleanBindin
applyBindingRedirects p

/// Calculates the short form of the public key token for use with binding redirects, if it exists.
let getPublicKeyToken (assembly:Mono.Cecil.AssemblyDefinition) =
("", assembly.Name.PublicKeyToken)
||> Array.fold(fun state b -> state + b.ToString("X2"))
|> function
| "" -> None
| token -> Some (token.ToLower())
let getPublicKeyToken (assembly:AssemblyName) =
assembly.GetPublicKeyToken()
|> Option.ofObj
|> Option.map (Array.fold(fun state b -> state + b.ToString("X2")) "")
|> Option.bind (function | "" -> None | token -> Some (token.ToLower()))
29 changes: 16 additions & 13 deletions src/Paket.Core/Installation/InstallProcess.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ open Paket.PackageSources
open Paket.Requirements
open System.Collections.Generic
open System
open ProviderImplementation.AssemblyReader

let updatePackagesConfigFile (model: Map<GroupName*PackageName,SemVerInfo*InstallSettings>) packagesConfigFileName =
let packagesInConfigFile = PackagesConfigFile.Read packagesConfigFileName
Expand Down Expand Up @@ -293,22 +294,25 @@ let private applyBindingRedirects isFirstGroup createNewBindingFiles cleanBindin
librariesForPackage
|> Seq.choose(fun (library,redirects,profile) ->
try
let assembly = Mono.Cecil.AssemblyDefinition.ReadAssembly(library.Path)
Some (assembly, BindingRedirects.getPublicKeyToken assembly, assembly.MainModule.AssemblyReferences, redirects, profile)
let assemblyReader =
ILModuleReaderAfterReadingAllBytes(library.Path, mkILGlobals EcmaMscorlibScopeRef)
let assembly = assemblyReader.ILModuleDef.ManifestOfAssembly
let assemblyName = assembly.GetName()
Some (assembly, BindingRedirects.getPublicKeyToken assemblyName, assemblyReader.ILAssemblyRefs, redirects, profile)
with _ -> None)
|> Seq.sortBy(fun (assembly,_,_,_,_) -> assembly.Name.Version)
|> Seq.sortBy(fun (assembly,_,_,_,_) -> assembly.Version)
|> Seq.toList
|> List.rev
|> function | head :: _ -> Some head | _ -> None)
|> Seq.cache

let referencesDifferentProfiles (assemblyName : Mono.Cecil.AssemblyNameDefinition) profile =
let referencesDifferentProfiles assemblyName assemblyVersion profile =
(targetProfiles |> Seq.exists ((=) profile))
&& assemblies
|> Seq.filter (fun (_,_,_,_,p) -> p <> profile)
|> Seq.map (fun (a,_,_,_,_) -> a.Name)
|> Seq.filter (fun a -> a.Name = assemblyName.Name)
|> Seq.exists (fun a -> a.Version <> assemblyName.Version)
|> Seq.map (fun (a,_,_,_,_) -> a)
|> Seq.filter (fun a -> a.Name = assemblyName)
|> Seq.exists (fun a -> a.Version <> assemblyVersion)

assemblies
|> Seq.choose (fun (assembly,token,refs,redirects,profile) ->
Expand All @@ -320,16 +324,15 @@ let private applyBindingRedirects isFirstGroup createNewBindingFiles cleanBindin
| Some BindingRedirectsSettings.Off -> false
| _ -> false)
|> Seq.filter (fun (assembly,_,_,redirects,profile) ->
let assemblyName = assembly.Name
redirects = Some BindingRedirectsSettings.Force
|| referencesDifferentProfiles assemblyName profile
|| referencesDifferentProfiles assembly.Name assembly.Version profile
|| assemblies
|> Seq.collect (fun (_,_,refs,_,_) -> refs)
|> Seq.filter (fun a -> assemblyName.Name = a.Name)
|> Seq.exists (fun a -> assemblyName.Version > a.Version))
|> Seq.filter (fun a -> assembly.Name = a.Name)
|> Seq.exists (fun a -> assembly.Version > a.Version))
|> Seq.map(fun (assembly, token,_,_,_) ->
{ BindingRedirect.AssemblyName = assembly.Name.Name
Version = assembly.Name.Version.ToString()
{ BindingRedirect.AssemblyName = assembly.Name
Version = Option.fold (fun _ x -> x.ToString()) "0.0.0.0" assembly.Version
PublicKeyToken = token
Culture = None })
|> Seq.sort
Expand Down