Skip to content

fix: Improve Weaver Helpers / Unity 6K compatibility #4128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrGadget1024 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Open

fix: Improve Weaver Helpers / Unity 6K compatibility #4128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Assets/Mirror/Editor/Weaver/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System.IO;
using System.Linq;
using System.Reflection;
using Mono.CecilX;
#if UNITY_6000_0_OR_NEWER
using UnityEngine;
#endif

namespace Mirror.Weaver
{
Expand All @@ -10,8 +12,20 @@ static class Helpers
// This code is taken from SerializationWeaver
public static string UnityEngineDllDirectoryName()
{
string directoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase);
return directoryName?.Replace(@"file:\", "");
#if UNITY_6000_0_OR_NEWER
// Unity loads many assemblies from streams, so Location/CodeBase are empty.
// GetLoadedAssemblyPath() is Unity's mapping back to the original file.
string assemblyPath = typeof(UnityEngine.Object).Assembly.GetLoadedAssemblyPath();
if (!string.IsNullOrEmpty(assemblyPath))
return Path.GetDirectoryName(assemblyPath);
#endif

// Fallback used by CompilationFinishedHook for CoreModule
string coreModule = UnityEditorInternal.InternalEditorUtility.GetEngineCoreModuleAssemblyPath();
if (!string.IsNullOrEmpty(coreModule))
return Path.GetDirectoryName(coreModule);

return null;
}

public static bool IsEditorAssembly(AssemblyDefinition currentAssembly)
Expand Down
Loading