Merge pull request #1205 from matthid/fix_1199

accept the cached assembly when the public token of the given assembly is null.
fsprojects · Apr 7, 2016 · 66ca140 · 66ca140
2 parents a362ff2 + 8dcfa9a
commit 66ca140
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/app/FakeLib/FSIHelper.fs b/src/app/FakeLib/FSIHelper.fs
@@ -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