Make compiler assembly loading a resolver in core loader

dotnet · Apr 24, 2024 · 13781c6 · 13781c6
1 parent 7c8ef76
commit 13781c6
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerAssemblyLoader.Core.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerAssemblyLoader.Core.cs
@@ -52,7 +52,7 @@ internal AnalyzerAssemblyLoader(AssemblyLoadContext? compilerLoadContext, Analyz
         {
             _loadOption = loadOption;
             _compilerLoadContext = compilerLoadContext ?? AssemblyLoadContext.GetLoadContext(typeof(AnalyzerAssemblyLoader).GetTypeInfo().Assembly)!;
-            _externalResolvers = externalResolvers;
+            _externalResolvers = [.. externalResolvers, new CompilerAnalyzerAssemblyResolver(_compilerLoadContext)];
         }
 
         public bool IsHostAssembly(Assembly assembly)
@@ -125,19 +125,6 @@ public DirectoryLoadContext(string directory, AnalyzerAssemblyLoader loader, Ass
                     return externallyResolvedAssembly;
                 }
 
-                try
-                {
-                    if (_compilerLoadContext.LoadFromAssemblyName(assemblyName) is { } compilerAssembly)
-                    {
-                        return compilerAssembly;
-                    }
-                }
-                catch
-                {
-                    // Expected to happen when the assembly cannot be resolved in the compiler / host
-                    // AssemblyLoadContext.
-                }
-
                 // Prefer registered dependencies in the same directory first.
                 var simpleName = assemblyName.Name!;
                 var assemblyPath = Path.Combine(Directory, simpleName + ".dll");
@@ -207,6 +194,19 @@ protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
                 return IntPtr.Zero;
             }
         }
+
+        internal sealed class CompilerAnalyzerAssemblyResolver : IAnalyzerAssemblyResolver
+        {
+            private readonly AssemblyLoadContext _compilerAlc;
+
+            public CompilerAnalyzerAssemblyResolver(AssemblyLoadContext? compilerContext = null)
+            {
+                _compilerAlc = compilerContext ?? AssemblyLoadContext.GetLoadContext(typeof(AnalyzerAssemblyLoader).GetTypeInfo().Assembly)!;
+            }
+
+            public Assembly? ResolveAssembly(AssemblyName assemblyName) => _compilerAlc.LoadFromAssemblyName(assemblyName);
+
+        }
     }
 }