Skip to content

Revert "Test-TP: Reference assembly loading fixes" #18382

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

Closed
wants to merge 2 commits into from
Closed

Revert "Test-TP: Reference assembly loading fixes" #18382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712f74e
Revert "Reference assembly loading fixes: 1) don't try to load assemb…
psfinaki Mar 13, 2025
2cf0b11
Merge branch 'main' into revert-18377-test-typeprovider-update
psfinaki Mar 14, 2025
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
7 changes: 3 additions & 4 deletions tests/service/data/TestTP/ProvidedTypes.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |])
Expand All @@ -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.
Expand Down