diff --git a/Directory.Build.props b/Directory.Build.props index 96e158c6b..2e5b7fbd7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 6.5.5 + 6.6.0 true 8.0 CS1591;CS0618 diff --git a/FodyHelpers/BaseModuleWeaver.cs b/FodyHelpers/BaseModuleWeaver.cs index 8606822d7..ccdc16532 100644 --- a/FodyHelpers/BaseModuleWeaver.cs +++ b/FodyHelpers/BaseModuleWeaver.cs @@ -142,12 +142,17 @@ public virtual void WriteError(string message, MethodDefinition method) /// [Obsolete("Use WriteError", false)] public Action LogErrorPoint { get; set; } = (m, p) => { }; - + /// /// Handler for resolving s. /// public Func ResolveAssembly { get; set; } = null!; + /// + /// The current s. + /// + public IAssemblyResolver AssemblyResolver { get; set; } = null!; + /// /// An instance of for processing. /// diff --git a/FodyHelpers/Testing/WeaverTestHelper.cs b/FodyHelpers/Testing/WeaverTestHelper.cs index b7100abb6..0e91ed7a0 100644 --- 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 index 6ddc38e9f..f171a4daa 100644 --- 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 index 081c213b9..0f8a26e3c 100644 --- 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 index 38fafc75a..fa77389e2 100644 --- 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,