expose AssemblyResolver

Fody · Oct 23, 2021 · b520115 · b520115
1 parent 8d2b7f9
commit b520115
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>6.5.5</Version>
+    <Version>6.6.0</Version>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>8.0</LangVersion>
     <NoWarn>CS1591;CS0618</NoWarn>

diff --git a/FodyHelpers/BaseModuleWeaver.cs b/FodyHelpers/BaseModuleWeaver.cs
@@ -142,12 +142,17 @@ public virtual void WriteError(string message, MethodDefinition method)
         /// </summary>
         [Obsolete("Use WriteError", false)]
         public Action<string, SequencePoint?> LogErrorPoint { get; set; } = (m, p) => { };
-
+        
         /// <summary>
         /// Handler for resolving <see cref="AssemblyDefinition"/>s.
         /// </summary>
         public Func<string, AssemblyDefinition?> ResolveAssembly { get; set; } = null!;
 
+        /// <summary>
+        /// The current <see cref="IAssemblyResolver"/>s.
+        /// </summary>
+        public IAssemblyResolver AssemblyResolver { get; set; } = null!;
+
         /// <summary>
         /// An instance of <see cref="Mono.Cecil.ModuleDefinition"/> for processing.
         /// </summary>

diff --git a/FodyHelpers/Testing/WeaverTestHelper.cs b/FodyHelpers/Testing/WeaverTestHelper.cs
@@ -59,6 +59,7 @@ public static class WeaverTestHelper
             weaver.FindType = typeCache.FindType;
             weaver.TryFindType = typeCache.TryFindType;
             weaver.ResolveAssembly = assemblyResolver.Resolve;
+            weaver.AssemblyResolver = assemblyResolver;
             var readerParameters = new ReaderParameters
             {
                 AssemblyResolver = assemblyResolver,

diff --git a/FodyIsolated/WeaverInitialiser.cs b/FodyIsolated/WeaverInitialiser.cs
@@ -33,6 +33,7 @@ public virtual void SetProperties(WeaverEntry weaverEntry, BaseModuleWeaver weav
         weaverInstance.FindType = TypeCache.FindType;
         weaverInstance.TryFindType = TypeCache.TryFindType;
         weaverInstance.ResolveAssembly = assemblyName => assemblyResolver.Resolve(assemblyName);
+        weaverInstance.AssemblyResolver = assemblyResolver;
     }
 
     void LogWarningPoint(string message, SequencePoint? point)

diff --git a/Tests/FodyIsolated/WeaverInitialiserTests.ValidPropsFromBase.Core.verified.txt b/Tests/FodyIsolated/WeaverInitialiserTests.ValidPropsFromBase.Core.verified.txt
@@ -42,6 +42,7 @@
     Target: InnerWeaver,
     Method: Mono.Cecil.AssemblyDefinition SetProperties(System.String)
   },
+  AssemblyResolver: {},
   AssemblyFilePath: AssemblyFilePath,
   ProjectDirectoryPath: ProjectDirectoryPath,
   ProjectFilePath: ProjectFilePath,

diff --git a/Tests/FodyIsolated/WeaverInitialiserTests.ValidPropsFromBase.Net.verified.txt b/Tests/FodyIsolated/WeaverInitialiserTests.ValidPropsFromBase.Net.verified.txt
@@ -42,6 +42,7 @@
     Target: InnerWeaver,
     Method: Mono.Cecil.AssemblyDefinition SetProperties(System.String)
   },
+  AssemblyResolver: {},
   AssemblyFilePath: AssemblyFilePath,
   ProjectDirectoryPath: ProjectDirectoryPath,
   ProjectFilePath: ProjectFilePath,