assemblyPaths small fixes, editor gui adapted

EditorGUI for the target assemblies is now just a string array. Removed code to find _allKnownAssemblies.
assemblyPaths renamed to assemblyNames is now a list.
By default only Assembly-CSharp and the Editor variant is targeted. The assembly containing this tool is always included so we find the attributes.

Author: rogerbarton

scripts/DllManipulator.cs

@@ -17,6 +17,16 @@ public partial class DllManipulator
         public const string DLL_PATH_PATTERN_ASSETS_MACRO = "{assets}";
         public const string DLL_PATH_PATTERN_PROJECT_MACRO = "{proj}";
         private const string CRASH_FILE_NAME_PREFIX = "unityNativeCrash_";
+        public static readonly string[] DEFAULT_ASSEMBLY_NAMES = {"Assembly-CSharp"
+            #if UNITY_EDITOR
+            , "Assembly-CSharp-Editor"
+            #endif
+        };
+        public static readonly string[] INTERNAL_ASSEMBLY_NAMES = {"MCpiroman.UnityNativeTool"
+            #if UNITY_EDITOR
+            , "MCpiroman.UnityNativeTool.Editor"
+            #endif
+        };
 
         public static DllManipulatorOptions Options { get; set; }
         private static int _unityMainThreadId;
@@ -47,11 +57,11 @@ internal static void Initialize(int unityMainThreadId, string assetsPath)
 
             LowLevelPluginManager.ResetStubPlugin();
 
-            IEnumerable<string> assemblyPathsTemp = Options.assemblyPaths;
+            IEnumerable<string> assemblyPathsTemp = Options.assemblyNames;
             if (!assemblyPathsTemp.Any())
-                assemblyPathsTemp = new[] {"Assembly-CSharp", "Assembly-CSharp-Editor"};
+                assemblyPathsTemp = DEFAULT_ASSEMBLY_NAMES;
 
-            assemblyPathsTemp = assemblyPathsTemp.Concat(new [] { "MCpiroman.UnityNativeTool", "MCpiroman.UnityNativeTool.Editor" });
+            assemblyPathsTemp = assemblyPathsTemp.Concat(INTERNAL_ASSEMBLY_NAMES);
 
             var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
             var assemblies = allAssemblies.Where(a => !a.IsDynamic && assemblyPathsTemp.Any(p => p == Path.ChangeExtension(a.ManifestModule.Name, null))).ToArray();
@@ -642,7 +652,7 @@ private static IntPtr SysGetDllProcAddress(IntPtr libHandle, string symbol)
     public class DllManipulatorOptions
     {
         public string dllPathPattern;
-        public string[] assemblyPaths; //empty means only executing assembly
+        public List<string> assemblyNames; // empty means only default assemblies
         public DllLoadingMode loadingMode;
         public PosixDlopenFlags posixDlopenFlags;
         public bool threadSafe;

scripts/DllManipulatorScript.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using System.Linq;
@@ -21,7 +22,7 @@ public class DllManipulatorScript : MonoBehaviour
 #else // UNITY_STANDALONE_WIN Windows fallback
             "{assets}/Plugins/__{name}.dll",
 #endif
-            assemblyPaths = new string[0],
+            assemblyNames = new List<string>(),
             loadingMode = DllLoadingMode.Lazy,
             posixDlopenFlags = PosixDlopenFlags.Lazy,
             threadSafe = false,

scripts/Editor/DllManipulatorEditor.cs

@@ -17,12 +17,12 @@ public class DllManipulatorEditor : Editor
         private static readonly GUIContent TARGET_ALL_NATIVE_FUNCTIONS_GUI_CONTENT = new GUIContent("All native functions",
             "If true, all found native functions will be mocked.\n\n" +
             $"If false, you have to select them by using [{nameof(MockNativeDeclarationsAttribute)}] or [{nameof(MockNativeDeclarationAttribute)}].");
-        private static readonly GUIContent TARGET_ONLY_EXECUTING_ASSEMBLY_GUI_CONTENT = new GUIContent("Only executing assembly",
-            "If true, native functions will be mocked only in assembly that contains DllManipulator (usually Assembly-CSharp)");
+        private static readonly GUIContent ONLY_ASSEMBLY_CSHARP_GUI_CONTENT = new GUIContent("Only Assembly-CSharp(-Editor)",
+            "If true, native functions will be mocked only in Assembly-CSharp and Assembly-CSharp-Editor. Alternatively enter a list of assembly names.");
         private static readonly GUIContent ONLY_IN_EDITOR = new GUIContent("Only in editor",
             "Whether to run only inside editor (which is recommended).");
         private static readonly GUIContent TARGET_ASSEMBLIES_GUI_CONTENT = new GUIContent("Target assemblies",
-            "Choose from which assemblies to mock native functions");
+            "List of assembly names to mock native functions in (no file extension).");
         private static readonly GUIContent DLL_PATH_PATTERN_GUI_CONTENT = new GUIContent("DLL path pattern", 
             "Available macros:\n\n" +
             $"{DllManipulator.DLL_PATH_PATTERN_DLL_NAME_MACRO} - name of DLL as specified in [DllImport] attribute.\n\n" +
@@ -53,7 +53,6 @@ public class DllManipulatorEditor : Editor
             "Use only if you are sure no other thread will be call mocked natives.");
         private static readonly GUIContent UNLOAD_ALL_DLLS_AND_PAUSE_WITH_THREAD_SAFETY_GUI_CONTENT = new GUIContent("Unload all DLLs & Pause [dangerous]",
             "Use only if you are sure no other thread will be call mocked natives.");
-        private static readonly TimeSpan ASSEMBLIES_REFRESH_INTERVAL = TimeSpan.FromSeconds(1);
 
         private bool _showLoadedLibraries = true;
         private bool _showTargetAssemblies = true;
@@ -181,63 +180,25 @@ private void DrawOptions(DllManipulatorOptions options)
                 GUI.enabled = false;
             options.mockAllNativeFunctions = EditorGUILayout.Toggle(TARGET_ALL_NATIVE_FUNCTIONS_GUI_CONTENT, options.mockAllNativeFunctions);
 
-            if (EditorGUILayout.Toggle(TARGET_ONLY_EXECUTING_ASSEMBLY_GUI_CONTENT, options.assemblyPaths.Length == 0))
+            if (EditorGUILayout.Toggle(ONLY_ASSEMBLY_CSHARP_GUI_CONTENT, options.assemblyNames.Count == 0))
             {
-                options.assemblyPaths = new string[0];
+                options.assemblyNames.Clear();
             }
             else
             {
                 var prevIndent1 = EditorGUI.indentLevel;
                 EditorGUI.indentLevel++;
 
-                if (_allKnownAssemblies == null || _lastKnownAssembliesRefreshTime + ASSEMBLIES_REFRESH_INTERVAL < DateTime.Now)
-                {
-                    var playerCompiledAssemblies = CompilationPipeline.GetAssemblies(AssembliesType.Player)
-                        .Select(a => PathUtils.NormallizeUnityAssemblyPath(a.outputPath));
-
-                    var editorCompiledAssemblies = CompilationPipeline.GetAssemblies(AssembliesType.Editor)
-                       .Select(a => PathUtils.NormallizeUnityAssemblyPath(a.outputPath));
-
-                    var assemblyAssets = Resources.FindObjectsOfTypeAll<PluginImporter>()
-                        .Where(p => !p.isNativePlugin)
-                        .Select(p => PathUtils.NormallizeUnityAssemblyPath(p.assetPath));
-
-                    string[] defaultAssemblyPrefixes = { "UnityEngine.", "UnityEditor.", "Unity.", "com.unity.", "Mono." , "nunit."};
-                    
-                    _allKnownAssemblies = playerCompiledAssemblies
-                        .Concat(assemblyAssets)
-                        .Concat(editorCompiledAssemblies)
-                        .OrderBy(path => Array.FindIndex(defaultAssemblyPrefixes, p => path.Substring(path.LastIndexOf('/') + 1).StartsWith(p)))
-                        .ToArray();
-                    _lastKnownAssembliesRefreshTime = DateTime.Now;
-                }
-
-                if (options.assemblyPaths.Length == 0)
-                {
-                    var first = GetFirstAssemblyToList(_allKnownAssemblies);
-                    if(first != null)
-                        options.assemblyPaths = new[] { first };
-                }
+                if (options.assemblyNames.Count == 0)
+                    options.assemblyNames.AddRange(DllManipulator.DEFAULT_ASSEMBLY_NAMES);
 
                 _showTargetAssemblies = EditorGUILayout.Foldout(_showTargetAssemblies, TARGET_ASSEMBLIES_GUI_CONTENT);
                 if (_showTargetAssemblies)
                 {
                     var prevIndent2 = EditorGUI.indentLevel;
                     EditorGUI.indentLevel++;
 
-                    var selectedAssemblies = options.assemblyPaths.Where(p => _allKnownAssemblies.Any(a => PathUtils.DllPathsEqual(a, p))).ToList();
-                    var notSelectedAssemblies = _allKnownAssemblies.Except(selectedAssemblies).ToArray();
-                    DrawList(selectedAssemblies, i =>
-                    {
-                        var values = new[] { selectedAssemblies[i] }
-                            .Concat(notSelectedAssemblies)
-                            .Select(a => a.Substring(a.LastIndexOf('/') + 1))
-                            .ToArray();
-
-                        var selectedIndex = EditorGUILayout.Popup(0, values);
-                        return selectedIndex == 0 ? selectedAssemblies[i] : notSelectedAssemblies[selectedIndex - 1];
-                    }, notSelectedAssemblies.Length > 0, () => notSelectedAssemblies[0]);
-                    options.assemblyPaths = selectedAssemblies.ToArray();
+                    DrawList(options.assemblyNames, i => EditorGUILayout.TextField(options.assemblyNames[i]), true, () => "");
 
                     EditorGUI.indentLevel = prevIndent2;
                 }