Add upm support

.gitignore

@@ -1,4 +1,3 @@
-*.meta
 scripts/LICENSE.txt
 *.sln
 .vs

README.md

@@ -11,7 +11,11 @@ Tool created mainly to solve old problem with reloading [native plugins](https:/
 
 ## Installation
 
-1. Download and add unity package from [releases](https://github.com/MCpiroman/UnityNativeTool/releases), or clone this repo to your project (note that if you don't use the prebuilt package and you're willing to use [low level interface callbacks](https://docs.unity3d.com/Manual/NativePluginInterface.html), you'll need to compile the stub plugin yourself form `stubLluiPlugin.c`).
+1. Download and add unity package from [releases](https://github.com/MCpiroman/UnityNativeTool/releases), or clone this repo to your project
+
+   - Clone it into the `<Project Root>/Packages` folder to use it as a local [embedded package](https://docs.unity3d.com/Manual/upm-embed.html) with [upm](https://docs.unity3d.com/Packages/com.unity.package-manager-ui@1.8/manual/index.html).
+
+   - Note that if you don't use the prebuilt package and you're willing to use [low level interface callbacks](https://docs.unity3d.com/Manual/NativePluginInterface.html), you'll need to compile the stub plugin yourself from `stubLluiPlugin.c`.
 
 2. In project settings, set _Api Compatibility Level_ to .NET 4.x or above.  
    Edit > Project Settings > Player > Other Settings > Api Compatibility Level

package.json

@@ -0,0 +1,21 @@
+{
+  "name": "com.mcpiroman.unity-native-tool",
+  "displayName": "Unity Native Tool",
+  "version": "7.1.0",
+  "description": "Tool for unloading native DLLs in the editor. \nhttps://github.com/mcpiroman/UnityNativeTool",
+  "keywords": [
+    "native",
+    "c++",
+    "dll"
+  ],
+  "category": "Unity",
+  "author": {
+    "name": "John Doe",
+    "email": "john.doe@example.com",
+    "url": "https://github.com/mcpiroman/UnityNativeTool/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mcpiroman/UnityNativeTool.git"
+  }
+}

scripts/DllManipulator.cs

@@ -17,6 +17,18 @@ 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 readonly string[] IGNORED_ASSEMBLY_PREFIXES = { "UnityEngine.", "UnityEditor.", "Unity.", "com.unity.", "Mono." , "nunit."};
+
 
         public static DllManipulatorOptions Options { get; set; }
         private static int _unityMainThreadId;
@@ -48,20 +60,18 @@ internal static void Initialize(int unityMainThreadId, string assetsPath)
 
             LowLevelPluginManager.ResetStubPlugin();
 
-            Assembly[] assemblies;
-            if (Options.assemblyPaths.Length == 0)
-            {
-                assemblies = new[] { Assembly.GetExecutingAssembly() };
-            }
-            else
+            IEnumerable<string> assemblyPathsTemp = Options.assemblyNames;
+            if (!assemblyPathsTemp.Any())
+                assemblyPathsTemp = DEFAULT_ASSEMBLY_NAMES;
+
+            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();
+            var missingAssemblies = assemblyPathsTemp.Except(assemblies.Select(a => Path.ChangeExtension(a.ManifestModule.Name, null)));
+            foreach (var assembly in missingAssemblies.Except(DEFAULT_ASSEMBLY_NAMES))
             {
-                var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-                assemblies = allAssemblies.Where(a => !a.IsDynamic && Options.assemblyPaths.Any(p => p == PathUtils.NormallizeSystemAssemblyPath(a.Location))).ToArray();
-                var missingAssemblies = Options.assemblyPaths.Except(assemblies.Select(a => PathUtils.NormallizeSystemAssemblyPath(a.Location)));
-                foreach (var assemblyPath in missingAssemblies)
-                {
-                    Debug.LogError($"Could not find assembly at path {assemblyPath}");
-                }
+                Debug.LogError($"Could not find assembly: {assembly}");
             }
 
             foreach (var assembly in assemblies)
@@ -644,34 +654,34 @@ private static void WriteNativeCrashLog(NativeFunction nativeFunction, object[]
 
         private static IntPtr SysLoadDll(string filepath)
         {
-#if UNITY_STANDALONE_WIN
-            return PInvokes_Windows.LoadLibrary(filepath);
-#elif UNITY_STANDALONE_LINUX
+#if UNITY_STANDALONE_LINUX
             return PInvokes_Linux.dlopen(filepath, (int)Options.posixDlopenFlags);
 #elif UNITY_STANDALONE_OSX
             return PInvokes_Osx.dlopen(filepath, (int)Options.posixDlopenFlags);
+#else // UNITY_STANDALONE_WIN
+            return PInvokes_Windows.LoadLibrary(filepath);
 #endif
         }
 
         private static bool SysUnloadDll(IntPtr libHandle)
         {
-#if UNITY_STANDALONE_WIN
-            return PInvokes_Windows.FreeLibrary(libHandle);
-#elif UNITY_STANDALONE_LINUX
+#if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
             return PInvokes_Linux.dlclose(libHandle) == 0;
-#elif UNITY_STANDALONE_OSX
+#elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             return PInvokes_Osx.dlclose(libHandle) == 0;
+#else // UNITY_STANDALONE_WIN
+            return PInvokes_Windows.FreeLibrary(libHandle);
 #endif
         }
 
         private static IntPtr SysGetDllProcAddress(IntPtr libHandle, string symbol)
         {
-#if UNITY_STANDALONE_WIN
-            return PInvokes_Windows.GetProcAddress(libHandle, symbol);
-#elif UNITY_STANDALONE_LINUX
+#if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
             return PInvokes_Linux.dlsym(libHandle, symbol);
-#elif UNITY_STANDALONE_OSX
+#elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             return PInvokes_Osx.dlsym(libHandle, symbol);
+#else // UNITY_STANDALONE_WIN
+            return PInvokes_Windows.GetProcAddress(libHandle, symbol);
 #endif
         }
     }
@@ -680,7 +690,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;
@@ -694,7 +704,7 @@ public class DllManipulatorOptions
         public DllManipulatorOptions CloneTo(DllManipulatorOptions other)
         {
             other.dllPathPattern = dllPathPattern;
-            other.assemblyPaths = (string[]) assemblyPaths.Clone();
+            other.assemblyNames = assemblyNames.Select(item => (string)item.Clone()).ToList();
             other.loadingMode = loadingMode;
             other.posixDlopenFlags = posixDlopenFlags;
             other.threadSafe = threadSafe;
@@ -710,7 +720,7 @@ public DllManipulatorOptions CloneTo(DllManipulatorOptions other)
 
         public bool Equals(DllManipulatorOptions other)
         {
-            return other.dllPathPattern == dllPathPattern && other.assemblyPaths.SequenceEqual(assemblyPaths) &&
+            return other.dllPathPattern == dllPathPattern && other.assemblyNames.SequenceEqual(assemblyNames) &&
                    other.loadingMode == loadingMode && other.posixDlopenFlags == posixDlopenFlags &&
                    other.threadSafe == threadSafe && other.enableCrashLogs == enableCrashLogs &&
                    other.crashLogsDir == crashLogsDir && other.crashLogsStackTrace == crashLogsStackTrace &&

scripts/DllManipulatorScript.cs

@@ -20,14 +20,14 @@ public class DllManipulatorScript : MonoBehaviour
         public DllManipulatorOptions Options = new DllManipulatorOptions()
         {
             dllPathPattern =
-#if UNITY_STANDALONE_WIN
-            "{assets}/Plugins/__{name}.dll",
-#elif UNITY_STANDALONE_LINUX
+#if UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
             "{assets}/Plugins/__{name}.so",
-#elif UNITY_STANDALONE_OSX
+#elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             "{assets}/Plugins/__{name}.dylib",
+#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,