Browse Source

Move CreateAllAssembliesList to AbpModuleHelper

pull/17026/head
Halil İbrahim Kalkan 3 years ago
parent
commit
204254f62a
  1. 24
      framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleDescriptor.cs
  2. 21
      framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs

24
framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleDescriptor.cs

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Reflection;
using JetBrains.Annotations;
@ -38,7 +37,7 @@ public class AbpModuleDescriptor : IAbpModuleDescriptor
Type = type;
Assembly = type.Assembly;
AllAssemblies = CreateAllAssembliesList(type);
AllAssemblies = AbpModuleHelper.GetAllAssemblies(type);
Instance = instance;
IsLoadedAsPlugIn = isLoadedAsPlugIn;
@ -54,25 +53,4 @@ public class AbpModuleDescriptor : IAbpModuleDescriptor
{
return $"[AbpModuleDescriptor {Type.FullName}]";
}
private static List<Assembly> CreateAllAssembliesList(Type moduleType)
{
var assemblies = new List<Assembly>();
var additionalAssemblyDescriptors = moduleType
.GetCustomAttributes()
.OfType<IAdditionalModuleAssemblyProvider>();
foreach (var descriptor in additionalAssemblyDescriptors)
{
foreach (var assembly in descriptor.GetAssemblies())
{
assemblies.AddIfNotContains(assembly);
}
}
assemblies.Add(moduleType.Assembly);
return assemblies;
}
}

21
framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs

@ -36,6 +36,27 @@ internal static class AbpModuleHelper
return dependencies;
}
public static List<Assembly> GetAllAssemblies(Type moduleType)
{
var assemblies = new List<Assembly>();
var additionalAssemblyDescriptors = moduleType
.GetCustomAttributes()
.OfType<IAdditionalModuleAssemblyProvider>();
foreach (var descriptor in additionalAssemblyDescriptors)
{
foreach (var assembly in descriptor.GetAssemblies())
{
assemblies.AddIfNotContains(assembly);
}
}
assemblies.Add(moduleType.Assembly);
return assemblies;
}
private static void AddModuleAndDependenciesRecursively(
List<Type> moduleTypes,

Loading…
Cancel
Save