From 712f74e861ed44e340e19bf60ea325b5862df8f5 Mon Sep 17 00:00:00 2001 From: Petr Date: Thu, 13 Mar 2025 14:46:39 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Reference=20assembly=20loading=20fixe?= =?UTF-8?q?s:=201)=20don't=20try=20to=20load=20assemblies=20alr=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 76b83e62bded3b6ce447cc5e92cda9ddeff462ec. --- tests/service/data/TestTP/ProvidedTypes.fs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/service/data/TestTP/ProvidedTypes.fs b/tests/service/data/TestTP/ProvidedTypes.fs index 1df9d3139d1..50dd53a55a4 100644 --- a/tests/service/data/TestTP/ProvidedTypes.fs +++ b/tests/service/data/TestTP/ProvidedTypes.fs @@ -8907,7 +8907,6 @@ namespace ProviderImplementation.ProvidedTypes let enqueueReferencedAssemblies(asm: Assembly) = do sourceAssembliesQueue.Add (fun () -> [| for referencedAssemblyName in asm.GetReferencedAssemblies() do - if not (sourceAssembliesTable_.ContainsKey referencedAssemblyName.Name) then let referencedAssembly = try Assembly.Load(referencedAssemblyName) with _ -> null if not (isNull referencedAssembly) then yield referencedAssembly |]) @@ -8921,12 +8920,12 @@ namespace ProviderImplementation.ProvidedTypes for q in qs do for asm in q() do let simpleName = asm.GetName().Name - sourceAssembliesTable_.GetOrAdd(simpleName, fun k -> + if not (sourceAssembliesTable_.ContainsKey(simpleName)) then + sourceAssembliesTable_[simpleName] <- asm sourceAssemblies_.Add asm // Find the transitive closure of all referenced assemblies enqueueReferencedAssemblies asm - asm - ) |> ignore + sourceAssemblies_ /// When translating quotations, Expr.Var's are translated to new variable respecting reference equality.