From db1609dced22afee4f2cd899485dad9159b732bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 4 Jul 2023 17:42:12 +0300
Subject: [PATCH] Use AllAssemblies instead of Type.Assembly

---
 .../AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs  |  2 +-
 .../Volo/Abp/AbpApplicationBase.cs            | 20 +++++++++++--------
 .../Volo/Abp/Reflection/AssemblyFinder.cs     |  2 +-
 .../Http/Client/Web/AbpHttpClientWebModule.cs |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
index e22fef4236..0e93bb7ec6 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@@ -233,7 +233,7 @@ public class AbpAspNetCoreMvcModule : AbpModule
             .GetRequiredService<IModuleContainer>()
             .Modules
             .Where(m => m.IsLoadedAsPlugIn)
-            .Select(m => m.Type.Assembly)
+            .SelectMany(m => m.AllAssemblies)
             .Distinct();
 
         AddToApplicationParts(partManager, moduleAssemblies);
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
index 0ccff2db23..ec20467ac9 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
@@ -188,11 +188,13 @@ public abstract class AbpApplicationBase : IAbpApplication
             {
                 if (!abpModule.SkipAutoServiceRegistration)
                 {
-                    var assembly = module.Type.Assembly;
-                    if (!assemblies.Contains(assembly))
+                    foreach (var assembly in module.AllAssemblies)
                     {
-                        Services.AddAssembly(assembly);
-                        assemblies.Add(assembly);
+                        if (!assemblies.Contains(assembly))
+                        {
+                            Services.AddAssembly(assembly);
+                            assemblies.Add(assembly);
+                        }
                     }
                 }
             }
@@ -279,11 +281,13 @@ public abstract class AbpApplicationBase : IAbpApplication
             {
                 if (!abpModule.SkipAutoServiceRegistration)
                 {
-                    var assembly = module.Type.Assembly;
-                    if (!assemblies.Contains(assembly))
+                    foreach (var assembly in module.AllAssemblies)
                     {
-                        Services.AddAssembly(assembly);
-                        assemblies.Add(assembly);
+                        if (!assemblies.Contains(assembly))
+                        {
+                            Services.AddAssembly(assembly);
+                            assemblies.Add(assembly);
+                        }
                     }
                 }
             }
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/AssemblyFinder.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/AssemblyFinder.cs
index 4e9a37db1a..602c577050 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/AssemblyFinder.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/AssemblyFinder.cs
@@ -29,7 +29,7 @@ public class AssemblyFinder : IAssemblyFinder
 
         foreach (var module in _moduleContainer.Modules)
         {
-            assemblies.Add(module.Type.Assembly);
+            assemblies.AddRange(module.AllAssemblies);
         }
 
         return assemblies.Distinct().ToImmutableList();
diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/AbpHttpClientWebModule.cs b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/AbpHttpClientWebModule.cs
index 5fcab7a7f1..655f96f068 100644
--- a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/AbpHttpClientWebModule.cs
+++ b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/AbpHttpClientWebModule.cs
@@ -31,7 +31,7 @@ public class AbpHttpClientWebModule : AbpModule
             .ServiceProvider
             .GetRequiredService<IModuleContainer>()
             .Modules
-            .Select(m => m.Type.Assembly)
+            .SelectMany(m => m.AllAssemblies)
             .Where(a => a.GetTypes().Any(AbpHttpClientProxyHelper.IsClientProxyService))
             .Distinct())
         {