Rely on file paths not assembly names

Fixed dfederm#83
stan-sz · Mar 4, 2024 · c47be5a · c47be5a
1 parent 8374a52
commit c47be5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Analyzer/ReferenceTrimmerAnalyzer.cs b/src/Analyzer/ReferenceTrimmerAnalyzer.cs
@@ -87,7 +87,7 @@ private static void DumpUsedReferences(CompilationAnalysisContext context)
         {
             if (metadataReference.Display != null)
             {
-                string assemblyName = AssemblyName.GetAssemblyName(metadataReference.Display).Name;
+                string assemblyName = AssemblyName.GetAssemblyName(metadataReference.Display).CodeBase;
                 usedReferences.Add(assemblyName);
             }
         }

diff --git a/src/Tasks/CollectDeclaredReferencesTask.cs b/src/Tasks/CollectDeclaredReferencesTask.cs
@@ -100,14 +100,14 @@ public override bool Execute()
                         referencePath = referenceHintPath;
 
                         // If a hint path is given and exists, use that assembly's name.
-                        referenceAssemblyName = AssemblyName.GetAssemblyName(referenceHintPath).Name;
+                        referenceAssemblyName = AssemblyName.GetAssemblyName(referenceHintPath).CodeBase;
                     }
                     else if (File.Exists(referenceSpec))
                     {
                         referencePath = referenceSpec;
 
                         // If the spec is an existing file, use that assembly's name.
-                        referenceAssemblyName = AssemblyName.GetAssemblyName(referenceSpec).Name;
+                        referenceAssemblyName = AssemblyName.GetAssemblyName(referenceSpec).CodeBase;
                     }
                     else
                     {
@@ -151,7 +151,7 @@ public override bool Execute()
                         continue;
                     }
 
-                    string projectReferenceAssemblyName = new AssemblyName(projectReference.GetMetadata("FusionName")).Name;
+                    string projectReferenceAssemblyName = AssemblyName.GetAssemblyName(projectReference.ItemSpec).CodeBase;
                     string referenceProjectFile = projectReference.GetMetadata("OriginalProjectReferenceItemSpec");
 
                     declaredReferences.Add(new DeclaredReference(projectReferenceAssemblyName, DeclaredReferenceKind.ProjectReference, referenceProjectFile));
@@ -255,7 +255,7 @@ private Dictionary<string, PackageInfo> GetPackageInfos()
                 .Select(path =>
                 {
                     var fullPath = Path.Combine(nugetLibraryAbsolutePath, path);
-                    return AssemblyName.GetAssemblyName(fullPath).Name;
+                    return AssemblyName.GetAssemblyName(fullPath).CodeBase;
                 })
                 .ToList();