charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 19:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #791 corrected assembly paths passed to weaver (#803)

Browse Source 
* fixed incorrect assembly paths

* Update CompilationFinishedHook.cs
This commit is contained in:
c6burns 2019-04-12 03:52:35 -06:00 committed by vis2k
parent 2eb247a6d2
commit 3ba546e133
1 changed files with 4 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs
View File

@ -2,11 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using UnityEditor; using UnityEditor;
using UnityEditor.Compilation; using UnityEditor.Compilation;
using UnityEngine; using UnityEngine;
using DotNetAssembly = System.Reflection.Assembly;
using UnityAssembly = UnityEditor.Compilation.Assembly; using UnityAssembly = UnityEditor.Compilation.Assembly;
namespace Mirror.Weaver namespace Mirror.Weaver
@ -68,38 +66,6 @@ static string FindMirrorRuntime()
return ""; return "";
} }
// get all dependency directories
static HashSet<string> GetDependencyDirectories(AssemblyName[] dependencies)
{
// Since this assembly is already loaded in the domain this is a
// no-op and returns the already loaded assembly
return new HashSet<string>(
dependencies.Select(dependency => Path.GetDirectoryName(DotNetAssembly.Load(dependency).Location))
);
}
// get all non-dynamic assembly directories
static HashSet<string> GetNonDynamicAssemblyDirectories(DotNetAssembly[] assemblies)
{
HashSet<string> paths = new HashSet<string>();
foreach (DotNetAssembly assembly in assemblies)
{
if (!assembly.IsDynamic)
{
// need to check if file exists to avoid potential
// FileNotFoundException in Assembly.Load
string assemblyName = assembly.GetName().Name;
if (File.Exists(assemblyName))
{
paths.Add(Path.GetDirectoryName(DotNetAssembly.Load(assemblyName).Location));
}
}
}
return paths;
}
static bool CompilerMessagesContainError(CompilerMessage[] messages) static bool CompilerMessagesContainError(CompilerMessage[] messages)
{ {
return messages.Any(msg => msg.type == CompilerMessageType.Error); return messages.Any(msg => msg.type == CompilerMessageType.Error);
@ -151,57 +117,19 @@ static void OnCompilationFinished(string assemblyPath, CompilerMessage[] message
return; return;
} }
// find all assemblies and the currently compiling assembly // build directory list for later asm/symbol resolving using CompilationPipeline refs
DotNetAssembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
DotNetAssembly targetAssembly = assemblies.FirstOrDefault(asm => asm.GetName().Name == Path.GetFileNameWithoutExtension(assemblyPath));
// prepare variables
HashSet<string> dependencyPaths = new HashSet<string>(); HashSet<string> dependencyPaths = new HashSet<string>();
dependencyPaths.Add(Path.GetDirectoryName(assemblyPath));
// found this assembly in assemblies?
if (targetAssembly != null)
{
// get all dependencies for the target assembly
AssemblyName[] dependencies = targetAssembly.GetReferencedAssemblies();
// does the target assembly depend on Mirror at all?
// otherwise there is nothing to weave anyway.
bool usesMirror = dependencies.Any(dependency => dependency.Name == MirrorRuntimeAssemblyName);
if (!usesMirror)
{
return;
}
// get all the directories
dependencyPaths = GetDependencyDirectories(dependencies);
}
else
{
// Target assembly not found in current domain, trying to load it to check references
// will lead to trouble in the build pipeline, so lets assume it should go to weaver.
// Add all assemblies in current domain to dependency list since there could be a
// dependency lurking there (there might be generated assemblies so ignore file not found exceptions).
// (can happen in runtime test framework on editor platform and when doing full library reimport)
dependencyPaths = GetNonDynamicAssemblyDirectories(assemblies);
}
// add compiled refs from CompilationPipeline
foreach (UnityAssembly unityAsm in _cachedAssemblies) foreach (UnityAssembly unityAsm in _cachedAssemblies)
{ {
if (unityAsm.outputPath != assemblyPath) continue; if (unityAsm.outputPath != assemblyPath) continue;
foreach (string unityAsmRef in unityAsm.compiledAssemblyReferences) foreach (string unityAsmRef in unityAsm.compiledAssemblyReferences)
{ {
// including NetStandard dependencies causes a stack overflow dependencyPaths.Add(Path.GetDirectoryName(unityAsmRef));
// in the Weaver: https://github.com/vis2k/Mirror/issues/791
// root issue: https://github.com/jbevain/cecil/issues/573
if (!unityAsmRef.Contains("NetStandard"))
dependencyPaths.Add(Path.GetDirectoryName(unityAsmRef));
} }
} }
//if (UnityLogEnabled) Debug.Log("Weaving: " + assemblyPath); // uncomment to easily observe weave targets
// passing null in the outputDirectory param will do an in-place update of the assembly // passing null in the outputDirectory param will do an in-place update of the assembly
if (Program.Process(unityEngineCoreModuleDLL, mirrorRuntimeDll, null, new[] { assemblyPath }, dependencyPaths.ToArray(), HandleWarning, HandleError)) if (Program.Process(unityEngineCoreModuleDLL, mirrorRuntimeDll, null, new[] { assemblyPath }, dependencyPaths.ToArray(), HandleWarning, HandleError))
{ {