Browse Source

Merge pull request #7580 from abpframework/auto-merge/rel-4-2/146

Merge branch dev with rel-4.2
pull/7590/head
maliming 5 years ago
committed by GitHub
parent
commit
1f3fa22da7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      framework/src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FolderPlugInSource.cs

8
framework/src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FolderPlugInSource.cs

@ -18,7 +18,7 @@ namespace Volo.Abp.Modularity.PlugIns
public Func<string, bool> Filter { get; set; }
public FolderPlugInSource(
[NotNull] string folder,
[NotNull] string folder,
SearchOption searchOption = SearchOption.TopDirectoryOnly)
{
Check.NotNull(folder, nameof(folder));
@ -52,7 +52,7 @@ namespace Volo.Abp.Modularity.PlugIns
return modules.ToArray();
}
private IEnumerable<Assembly> GetAssemblies()
private List<Assembly> GetAssemblies()
{
var assemblyFiles = AssemblyHelper.GetAssemblyFiles(Folder, SearchOption);
@ -61,7 +61,7 @@ namespace Volo.Abp.Modularity.PlugIns
assemblyFiles = assemblyFiles.Where(Filter);
}
return assemblyFiles.Select(AssemblyLoadContext.Default.LoadFromAssemblyPath);
return assemblyFiles.Select(AssemblyLoadContext.Default.LoadFromAssemblyPath).ToList();
}
}
}
}

Loading…
Cancel
Save