From 05d88ca8f1c842d7599f94afe9371944c95113d8 Mon Sep 17 00:00:00 2001 From: kotcheshir73 Date: Sat, 19 Mar 2022 22:54:25 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20Depend?= =?UTF-8?q?encyRegistration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ServiceProviderLoader.cs | 10 +++++----- ...entationExtension.cs => IDependencyRegistration.cs} | 2 +- .../DepartmentLogicDependencyRegistration.cs | 2 +- ... DepartmentImplementationDependencyRegistration.cs} | 2 +- .../SecurityLogicDependencyRegistration.cs | 2 +- ...=> SecurityImplementationDependencyRegistration.cs} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename DepartmentPortal/Common/ToolsModule/Interfaces/{IImplementationExtension.cs => IDependencyRegistration.cs} (86%) rename DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/{DepartmentImplementationExtensions.cs => DepartmentImplementationDependencyRegistration.cs} (96%) rename DepartmentPortal/Security/SecurityDatabaseImplementation/{SecurityImplementationExtensions.cs => SecurityImplementationDependencyRegistration.cs} (91%) diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs index 4ca8434..74feea9 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs @@ -42,9 +42,9 @@ namespace ToolsModule.BusinessLogics /// Загрузка всех классов-реализаций IImplementationExtension /// /// - public static List GetImplementationExtensions() + public static List GetImplementationExtensions() { - var list = new List(); + var list = new List(); if(Directory.Exists(_pathToImplementationExt)) { var files = Directory.GetFiles(_pathToImplementationExt, "*.dll", SearchOption.AllDirectories); @@ -55,12 +55,12 @@ namespace ToolsModule.BusinessLogics { continue; } - Assembly asm = Assembly.LoadFrom(file); + var asm = Assembly.LoadFrom(file); foreach (var t in asm.GetExportedTypes()) { - if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + if (t.IsClass && typeof(IDependencyRegistration).IsAssignableFrom(t)) { - list.Add((IImplementationExtension)Activator.CreateInstance(t)); + list.Add((IDependencyRegistration)Activator.CreateInstance(t)); } } loadedFiles.Add(file.GetFileName()); diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs b/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs similarity index 86% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs rename to DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs index d765ab2..e639c6e 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IImplementationExtension.cs +++ b/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs @@ -3,7 +3,7 @@ /// /// Интерфейс для регистрации зависимостей в модулях /// - public interface IImplementationExtension + public interface IDependencyRegistration { /// /// Регистрация сервисов diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs index 34234dc..95b4acb 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs @@ -5,7 +5,7 @@ using ToolsModule.Interfaces; namespace DepartmentBusinessLogic { - public class DepartmentLogicDependencyRegistration : IImplementationExtension + public class DepartmentLogicDependencyRegistration : IDependencyRegistration { public void RegisterServices() { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs similarity index 96% rename from DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs rename to DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs index aa901c8..ae074aa 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationExtensions.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs @@ -6,7 +6,7 @@ using ToolsModule.Interfaces; namespace DepartmentDatabaseImplementation { - public class DepartmentImplementationExtensions : IImplementationExtension + public class DepartmentImplementationDependencyRegistration : IDependencyRegistration { public void RegisterServices() { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs index b86be91..5080331 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs @@ -7,7 +7,7 @@ using ToolsModule.Interfaces; namespace SecurityBusinessLogic { - public class SecurityLogicDependencyRegistration : IImplementationExtension + public class SecurityLogicDependencyRegistration : IDependencyRegistration { public void RegisterServices() { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs similarity index 91% rename from DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs rename to DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs index adcf639..017538e 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationExtensions.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs @@ -7,7 +7,7 @@ using ToolsModule.Interfaces; namespace SecurityDatabaseImplementation { - public class SecurityImplementationExtensions : IImplementationExtension + public class SecurityImplementationDependencyRegistration : IDependencyRegistration { public void RegisterServices() {