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

accept the cached assembly when the public token of the given assembly is null. #1205

Merged
merged 1 commit into from
Apr 7, 2016
Merged

accept the cached assembly when the public token of the given assembly is null. #1205

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
5 changes: 4 additions & 1 deletion src/app/FakeLib/FSIHelper.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,19 @@ let private getCacheInfoFromScript printDetails fsiOptions scriptPath =
if printDetails then tracefn "Redirect assembly load to known assembly: %s" ev.Name
a
| _ ->
let token = name.GetPublicKeyToken()
match loadedAssemblies
|> Seq.map snd
|> Seq.tryFind (fun asem ->
let n = asem.GetName()
n.Name = name.Name &&
n.GetPublicKeyToken() = name.GetPublicKeyToken()) with
(isNull token || // When null accept what we have.
n.GetPublicKeyToken() = token)) with
| Some (asem) ->
traceFAKE "Redirect assembly from '%s' to '%s'" ev.Name asem.FullName
asem
| _ ->
if printDetails then traceFAKE "Could not resolve '%s'" ev.Name
null))
assemVersionValidCount = Seq.length cacheConfig.Value.Assemblies
else
Expand Down