PR feedback

dotnet · Jan 27, 2023 · 2813c9a · 2813c9a
1 parent 521a1e1
commit 2813c9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs b/src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs
@@ -336,6 +336,10 @@ public void AssemblyLoading_OverwriteBeforeLoad(bool shadowLoad)
 
                 var name = AssemblyName.GetAssemblyName(testFixture.Delta2.Path);
                 Assert.Equal(name.FullName, assembly.GetName().FullName);
+
+                VerifyDependencyAssemblies(
+                    loader,
+                    testFixture.Delta1.Path);
             });
         }
 

diff --git a/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerAssemblyLoader.cs b/src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerAssemblyLoader.cs
@@ -94,7 +94,7 @@ public Assembly LoadFromPath(string originalAnalyzerPath)
             // Not a managed assembly, nothing else to do
             if (assemblyName is null)
             {
-                throw new ArgumentException("Not a valid assembly");
+                throw new ArgumentException($"Not a valid assembly: {originalAnalyzerPath}");
             }
 
             try
@@ -127,7 +127,7 @@ public Assembly LoadFromPath(string originalAnalyzerPath)
 
                 if (tuple is { } info)
                 {
-                    return (info.AssemblyName, info.RealAssemblyPath);
+                    return info;
                 }
             }