Merge branch 'release/5.3.0'

Fody · Apr 19, 2021 · 695ba2e · 695ba2e
2 parents c145e62 + bec34e3
commit 695ba2e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/Costura.Fody.Tests/Helpers/WeavingHelper.cs b/src/Costura.Fody.Tests/Helpers/WeavingHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using Costura.Fody.Tests;
@@ -16,7 +15,6 @@ public static TestResult CreateIsolatedAssemblyCopy(string assemblyPath, string
             Config = XElement.Parse(config),
             References = string.Join(";", references.Select(r => Path.Combine(currentDirectory, r))),
             ReferenceCopyLocalPaths = references.Select(r => Path.Combine(currentDirectory, r)).ToList(),
-            AssemblyResolver = new TestAssemblyResolver()
         };
 
         if (!Path.IsPathRooted(assemblyPath))

diff --git a/src/Costura.Fody/AssemblyLoaderImporter.cs b/src/Costura.Fody/AssemblyLoaderImporter.cs
@@ -26,7 +26,7 @@ private void ImportAssemblyLoader(bool createTemporaryAssemblies)
     {
         var readerParameters = new ReaderParameters
         {
-            AssemblyResolver = AssemblyResolver,
+            AssemblyResolver = ModuleDefinition.AssemblyResolver,
             ReadSymbols = true,
             SymbolReaderProvider = new PdbReaderProvider(),
             SymbolStream = GetType().Assembly.GetManifestResourceStream("Costura.Template.pdb"),

diff --git a/src/Costura.Fody/ModuleWeaver.cs b/src/Costura.Fody/ModuleWeaver.cs
@@ -1,12 +1,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Fody;
-using Mono.Cecil;
 
 public partial class ModuleWeaver: BaseModuleWeaver
 {
-    public IAssemblyResolver AssemblyResolver { get; set; }
-
     public override void Execute()
     {
 //#if DEBUG