Merge branch 'master' of github.com:rivenfx/Modular

Author: yihango

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+## Release V0.0.7
+* 文件夹插件源加载 native dll bug修复
+
 ## Release V0.0.6
 * 增加模块插件支持
 	* FolderPlugInSource 文件夹插件源

src/Riven.Modular/Modular/PlugIns/FolderPlugInSource.cs

@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -33,7 +34,8 @@ public Type[] GetModules()
         {
             var modules = new List<Type>();
 
-            foreach (var assembly in GetAssemblies())
+            var assemblies = GetAssemblies();
+            foreach (var assembly in assemblies)
             {
                 try
                 {
@@ -54,16 +56,30 @@ public Type[] GetModules()
             return modules.ToArray();
         }
 
-        protected virtual IEnumerable<Assembly> GetAssemblies()
+        protected virtual List<Assembly> GetAssemblies()
         {
-            var assemblyFiles = this.GetAssemblyFiles(Folder, SearchOption);
+            var assemblies = new List<Assembly>();
+
+            var assemblyFilePaths = this.GetAssemblyFiles(Folder, SearchOption).ToList();
 
             if (Filter != null)
             {
-                assemblyFiles = assemblyFiles.Where(Filter);
+                assemblyFilePaths = (List<string>)assemblyFilePaths.Where(Filter);
+            }
+
+            foreach (var assemblyFile in assemblyFilePaths)
+            {
+
+                try
+                {
+                    assemblies.Add(AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyFile));
+                }
+                catch
+                {
+                }
             }
 
-            return assemblyFiles.Select(AssemblyLoadContext.Default.LoadFromAssemblyPath);
+            return assemblies;
         }
 
         protected virtual IEnumerable<string> GetAssemblyFiles(string folderPath, SearchOption searchOption)

version.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>0.0.6</Version>
+    <Version>0.0.7</Version>
   </PropertyGroup>
 
 </Project>