Merge pull request #1 from MaxtorCoder/main

Fixes assembly resolution for ignored assemblies.

Author: Skippeh

FishNet.CodeGenerating/ILCore/PostProcessorAssemblyResolver.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 
@@ -16,7 +17,7 @@ public class PostProcessorAssemblyResolver : BaseAssemblyResolver
         [
             "FishNet.Runtime.dll"
         ];
-        
+
         private readonly string[] m_AssemblyReferences;
         private readonly Dictionary<string, AssemblyDefinition> m_AssemblyCache = new Dictionary<string, AssemblyDefinition>();
         private readonly ICompiledAssembly m_CompiledAssembly;
@@ -34,7 +35,7 @@ public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderPar
         {
             if (name.Name == "mscorlib" || name.Name == "netstandard")
                 return base.Resolve(name, parameters);
-            
+
             lock (m_AssemblyCache)
             {
                 if (name.Name == m_CompiledAssembly.Name)
@@ -50,12 +51,12 @@ public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderPar
                     fileName = ResolveAssemblyPath($"{name.Name}.dll");
                     pathResolved = true;
                 }
-                
+
                 if (fileName == null)
                 {
                     return base.Resolve(name, parameters);
                 }
-                
+
                 // Try to resolve absolute file path to assembly
                 if (!pathResolved)
                     fileName = ResolveAssemblyPath(fileName);
@@ -89,7 +90,10 @@ private string ResolveAssemblyPath(string assemblyPath)
                 return assemblyPath;
 
             if (IgnoreResolveAssemblies.Contains(assemblyPath))
-                return assemblyPath;
+            {
+                var currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                return Path.Combine(currentDirectory!, assemblyPath);
+            }
 
             foreach (var searchPath in AssemblySearchPaths)
             {
@@ -179,4 +183,4 @@ public void AddAssemblyDefinitionBeingOperatedOn(AssemblyDefinition assemblyDefi
             m_SelfAssembly = assemblyDefinition;
         }
     }
-}
+}