Updated NppPlugin.Host to handle Npp breaking change when the aditor tries to load both, file from the plugins root dll and from the subdirectory named the same way as the root dll.

Author: oleg-shilo

src/NppPlugin.Host/PluginInfrastructure/PluginProxy.cs

@@ -44,12 +44,25 @@ public static void beNotified(IntPtr notifyCode)
             plugin.beNotified(notifyCode);
         }
 
+        static string ProbeFile(params string[] paths)
+        {
+            var file = Path.Combine(paths);
+            if (File.Exists(file))
+                return file;
+            else
+                return null;
+        }
+
         public static void Init()
         {
             string thisAssembly = Assembly.GetExecutingAssembly().Location;
             string pluginName = Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(thisAssembly));
 
-            string pluginPath = Path.Combine(Path.GetDirectoryName(thisAssembly), pluginName, pluginName + ".dll");
+            string baseDir = Path.GetDirectoryName(thisAssembly);
+
+            string pluginPath = ProbeFile(baseDir, pluginName + ".asm.dll") ??
+                                ProbeFile(baseDir, pluginName, pluginName + ".dll") ??
+                                ProbeFile(baseDir, pluginName, pluginName + ".asm.dll");
 
             Assembly pluginAssembly = Assembly.LoadFrom(pluginPath);
 

src/NppPlugin.Host/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]