Новый механизм настройки зависимостей

CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj

@@ -6,6 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Unity" Version="5.11.10" />
+    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\CarRepairShopDataModels\CarRepairShopDataModels.csproj" />
   </ItemGroup>

CarRepairShop/CarRepairShopContracts/DI/DependencyManager.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+
+namespace CarRepairShopContracts.DI
+{
+    public class DependencyManager
+    {
+        private readonly IDependencyContainer _dependencyManager;
+        private static DependencyManager? _manager;
+        private static readonly object _lockObject = new();
+        private DependencyManager()
+        {
+            _dependencyManager = new UnityDependencyContainer();
+        }
+        public static DependencyManager Instance { get { if (_manager == null) { lock (_lockObject) { _manager = new DependencyManager(); } } return _manager; } }
+
+        public static void InitDependency()
+        {
+            var ext = ServiceProviderLoader.GetImplementationExtensions();
+            if(ext == null)
+            {
+                throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
+            }
+            ext.RegisterServices();
+        }
+
+        public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
+
+        public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T: class => _dependencyManager.RegisterType<T, U>(isSingle);
+
+        public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
+
+        public T Resolve<T>() => _dependencyManager.Resolve<T>();
+    }
+}

CarRepairShop/CarRepairShopContracts/DI/IDependencyContainer.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.Logging;
+
+
+namespace CarRepairShopContracts.DI
+{
+    public interface IDependencyContainer
+    {
+        void AddLogging(Action<ILoggingBuilder> configure);
+        void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
+        void RegisterType<T>(bool isSingle) where T : class;
+        T Resolve<T>();
+    }
+}

CarRepairShop/CarRepairShopContracts/DI/IImplementationExtension.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopContracts.DI
+{
+    public interface IImplementationExtension
+    {
+        public int Priority { get; }
+        public void RegisterServices();
+    }
+}

CarRepairShop/CarRepairShopContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopContracts.DI
+{
+    public static partial class ServiceProviderLoader
+    {
+        public static IImplementationExtension? GetImplementationExtensions()
+        {
+            IImplementationExtension? source = null;
+            var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories);
+            foreach (var file in files.Distinct())
+            {
+                Assembly asm = Assembly.LoadFrom(file);
+                foreach(var t in asm.GetExportedTypes())
+                {
+                    if(t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t))
+                    {
+                        if(source == null)
+                        {
+                            source = (IImplementationExtension)Activator.CreateInstance(t)!;
+                        }
+                        else
+                        {
+                            var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
+                            if(newSource.Priority > source.Priority)
+                            {
+                                source = newSource;
+                            }
+                        }
+                    }
+                }
+            }
+            return source;
+        }
+
+        private static string TryGetImplementationExtensionsFolder()
+        {
+            var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
+            while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
+            {
+                directory = directory.Parent;
+            }
+            return $"{directory?.FullName}\\ImplementationExtensions";
+        }
+    }
+}

CarRepairShop/CarRepairShopContracts/DI/UnityDependencyContainer.cs

@@ -0,0 +1,55 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity;
+using Unity.Microsoft.Logging;
+
+namespace CarRepairShopContracts.DI
+{
+    public class UnityDependencyContainer : IDependencyContainer
+    {
+        private readonly IUnityContainer _container;
+        public UnityDependencyContainer()
+        {
+            _container = new UnityContainer();
+        }
+
+        public void AddLogging(Action<ILoggingBuilder> configure)
+        {
+            var logger = LoggerFactory.Create(configure);
+            _container.AddExtension(new LoggingExtension(logger));
+        }
+
+        public void RegisterType<T,U>(bool isSingle) where U : class, T where T : class
+        {
+            if (isSingle)
+            {
+                _container.RegisterSingleton<T, U>();
+            }
+            else
+            {
+                _container.RegisterType<T, U>();
+            }
+        }
+
+        public void RegisterType<T>(bool isSingle) where T : class
+        {
+            if (isSingle)
+            {
+                _container.RegisterSingleton<T>();
+            }
+            else
+            {
+                _container.RegisterType<T>();
+            }
+        }
+
+        public T Resolve<T>()
+        {
+            return _container.Resolve<T>();
+        }
+    }
+}

CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabaseImplement.csproj

@@ -21,4 +21,8 @@
     <ProjectReference Include="..\CarRepairShopDataModels\CarRepairShopDataModels.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

CarRepairShop/CarRepairShopDatabaseImplement/DatabaseImplementationExtension.cs

@@ -0,0 +1,27 @@
+using CarRepairShopContracts.DI;
+using CarRepairShopContracts.StoragesContracts;
+using CarRepairShopDatabaseImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopDatabaseImplement
+{
+    public class DatabaseImplementationExtension : IImplementationExtension
+    {
+        public int Priority => 2;
+
+        public void RegisterServices()
+        {
+            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+            DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+            DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
+            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+        }
+    }
+}

CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj

@@ -13,4 +13,8 @@
     <ProjectReference Include="..\CarRepairShopListImplement\CarRepairShopListImplement.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

CarRepairShop/CarRepairShopFileImplement/FileImplementationExtension.cs

@@ -0,0 +1,27 @@
+using CarRepairShopContracts.DI;
+using CarRepairShopContracts.StoragesContracts;
+using CarRepairShopFileImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopFileImplement
+{
+    public class FileImplementationExtension : IImplementationExtension
+    {
+        public int Priority => 1;
+
+        public void RegisterServices()
+        {
+            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+            DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+            DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
+            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+        }
+    }
+}

CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\CarRepairShopDataModels\CarRepairShopDataModels.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

CarRepairShop/CarRepairShopListImplement/Implements/BackUpInfo.cs

@@ -0,0 +1,22 @@
+using CarRepairShopContracts.StoragesContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopListImplement.Implements
+{
+    internal class BackUpInfo : IBackUpInfo
+    {
+        public List<T>? GetList<T>() where T : class, new()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Type? GetTypeByModelInterface(string modelInterfaceName)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

CarRepairShop/CarRepairShopListImplement/ListImplementationExtension.cs

@@ -0,0 +1,27 @@
+using CarRepairShopContracts.DI;
+using CarRepairShopContracts.StoragesContracts;
+using CarRepairShopListImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarRepairShopListImplement
+{
+    public class ListImplementationExtension : IImplementationExtension
+    {
+        public int Priority => 0;
+
+        public void RegisterServices()
+        {
+            DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+            DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+            DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+            DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+            DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
+            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+        }
+    }
+}

CarRepairShop/CarRepairShopView/FormComponents.cs

@@ -1,5 +1,6 @@
 using CarRepairShopContracts.BindingModels;
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -44,23 +45,20 @@ namespace CarRepairShopView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+            var form = DependencyManager.Instance.Resolve<FormComponent>();
-            if (service is FormComponent form)
+            
-            {
             if (form.ShowDialog() == DialogResult.OK)
             {
                 LoadData();
             }
-            }
+        
         }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+                var form = DependencyManager.Instance.Resolve<FormComponent>();
-                if (service is FormComponent form)
-                {
                 form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                 if (form.ShowDialog() == DialogResult.OK)
                 {
@@ -68,7 +66,6 @@ namespace CarRepairShopView
                 }
             }
         }
-        }
 
         private void buttonDel_Click(object sender, EventArgs e)
         {

CarRepairShop/CarRepairShopView/FormImplementers.cs

@@ -1,4 +1,5 @@
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -44,23 +45,18 @@ namespace CarRepairShopView
 
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+            var form = DependencyManager.Instance.Resolve<FormImplementer>();
-            if (service is FormImplementer form)
-            {
             if (form.ShowDialog() == DialogResult.OK)
             {
                 LoadData();
             }
         }
-        }
 
         private void buttonUpdate_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+                var form = DependencyManager.Instance.Resolve<FormImplementer>();
-                if (service is FormImplementer form)
-                {
                 form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                 if (form.ShowDialog() == DialogResult.OK)
                 {
@@ -68,7 +64,6 @@ namespace CarRepairShopView
                 }
             }
         }
-        }
 
         private void buttonRef_Click(object sender, EventArgs e)
         {

CarRepairShop/CarRepairShopView/FormMain.cs

@@ -1,5 +1,6 @@
 using CarRepairShopContracts.BindingModels;
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using CarRepairShopDataModels.Enums;
 using Microsoft.Extensions.Logging;
 using System;
@@ -44,31 +45,27 @@ namespace CarRepairShopView
 
         private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+            var form = DependencyManager.Instance.Resolve<FormComponents>();
-            if (service is FormComponents form)
+
-            {
             form.ShowDialog();
-            }
+            
         }
 
         private void ремонтToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormRepairs));
+            var form = DependencyManager.Instance.Resolve<FormRepairs>();
-            if (service is FormRepairs form)
+            
-            {
             form.ShowDialog();
-            }
+            
         }
 
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+            var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
-            if (service is FormCreateOrder form)
+
-            {
             form.ShowDialog();
             LoadData();
         }
-        }
 
         private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
         {
@@ -168,55 +165,40 @@ namespace CarRepairShopView
 
         private void ComponentRepairsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents));
+            var form = DependencyManager.Instance.Resolve<FormReportRepairComponents>();
-            if (service is FormReportRepairComponents form)
-            {
             form.ShowDialog();
         }
-        }
 
 
         private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
-            if (service is FormReportOrders form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+            var form = DependencyManager.Instance.Resolve<FormClients>();
-            if (service is FormClients form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void workStartToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+            _workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
         private void implementersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+            var form = DependencyManager.Instance.Resolve<FormImplementers>();
-            if (service is FormImplementers form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void почтаToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormLetters));
+            var form = DependencyManager.Instance.Resolve<FormLetters>();
-            if (service is FormLetters form)
-            {
             form.ShowDialog();
         }
-        }
 
         private void CreateBackUpToolStripMenuItem_Click(object sender, EventArgs e)
         {

CarRepairShop/CarRepairShopView/FormRepair.cs

@@ -1,5 +1,6 @@
 using CarRepairShopContracts.BindingModels;
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using CarRepairShopContracts.SearchModels;
 using CarRepairShopDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -79,9 +80,7 @@ namespace CarRepairShopView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent));
+            var form = DependencyManager.Instance.Resolve<FormRepairComponent>();
-            if (service is FormRepairComponent form)
-            {
             if (form.ShowDialog() == DialogResult.OK)
             {
                 if (form.ComponentModel == null)
@@ -100,15 +99,13 @@ namespace CarRepairShopView
                 LoadData();
             }
         }
-        }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent));
+                var form = DependencyManager.Instance.Resolve<FormRepairComponent>();
-                if (service is FormRepairComponent form)
+
-                {
                 int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
                 form.Id = id;
                 form.Count = _repairComponents[id].Item2;
@@ -124,7 +121,6 @@ namespace CarRepairShopView
                 }
             }
         }
-        }
 
         private void buttonDel_Click(object sender, EventArgs e)
         {

CarRepairShop/CarRepairShopView/FormRepairs.cs

@@ -1,5 +1,6 @@
 using CarRepairShopContracts.BindingModels;
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -45,23 +46,18 @@ namespace CarRepairShopView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormRepair));
+            var form = DependencyManager.Instance.Resolve<FormRepair>();
-            if (service is FormRepair form)
-            {
             if (form.ShowDialog() == DialogResult.OK)
             {
                 LoadData();
             }
         }
-        }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormRepair));
+                var form = DependencyManager.Instance.Resolve<FormRepair>();
-                if (service is FormRepair form)
-                {
                 form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                 if (form.ShowDialog() == DialogResult.OK)
                 {
@@ -69,7 +65,6 @@ namespace CarRepairShopView
                 }
             }
         }
-        }
 
         private void buttonDel_Click(object sender, EventArgs e)
         {

CarRepairShop/CarRepairShopView/Program.cs

@@ -4,6 +4,7 @@ using CarRepairShopBusinessLogic.OfficePackage;
 using CarRepairShopBusinessLogic.OfficePackage.Implements;
 using CarRepairShopContracts.BindingModels;
 using CarRepairShopContracts.BusinessLogicsContracts;
+using CarRepairShopContracts.DI;
 using CarRepairShopContracts.StoragesContracts;
 using CarRepairShopDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,9 +16,6 @@ namespace CarRepairShopView
 {
     internal static class Program
     {
-        private static ServiceProvider? _serviceProvider;
-        public static ServiceProvider? ServiceProvider => _serviceProvider;
-
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
@@ -28,12 +26,10 @@ namespace CarRepairShopView
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
             var services = new ServiceCollection();
-            ConfigureServices(services);
+            InitDependency();
-            _serviceProvider = services.BuildServiceProvider();
-
             try
             {
-                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
+                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
                 mailSender?.MailConfig(new MailConfigBindingModel
                 {
                     MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@@ -47,58 +43,50 @@ namespace CarRepairShopView
             }
             catch (Exception ex)
             {
-                var logger = _serviceProvider.GetService<ILogger>();
+                var logger = DependencyManager.Instance.Resolve<ILogger>();
                 logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
             }
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
         }
 
-
+        private static void InitDependency()
-        private static void ConfigureServices(ServiceCollection services)
         {
-            services.AddLogging(option =>
+            DependencyManager.InitDependency();
+            DependencyManager.Instance.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-            services.AddTransient<IComponentStorage, ComponentStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<IRepairStorage, RepairStorage>();
-            services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-            services.AddTransient<IBackUpInfo, BackUpInfo>();
 
-            services.AddTransient<IComponentLogic, ComponentLogic>();
+            DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
+            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-            services.AddTransient<IRepairLogic, RepairLogic>();
+            DependencyManager.Instance.RegisterType<IRepairLogic, RepairLogic>();
-            services.AddTransient<IReportLogic, ReportLogic>();
+            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-            services.AddTransient<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-            services.AddTransient<IBackUpLogic, BackUpLogic>();
             
-            services.AddTransient<IWorkProcess, WorkModeling>();
+            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
 
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<FormMain>();
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<FormComponent>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+            DependencyManager.Instance.RegisterType<FormComponents>();
-
+            DependencyManager.Instance.RegisterType<FormCreateOrder>();
-            services.AddTransient<FormMain>();
+            DependencyManager.Instance.RegisterType<FormRepair>();
-            services.AddTransient<FormComponent>();
+            DependencyManager.Instance.RegisterType<FormRepairComponent>();
-            services.AddTransient<FormComponents>();
+            DependencyManager.Instance.RegisterType<FormRepairs>();
-            services.AddTransient<FormCreateOrder>();
+            DependencyManager.Instance.RegisterType<FormReportRepairComponents>();
-            services.AddTransient<FormRepair>();
+            DependencyManager.Instance.RegisterType<FormReportOrders>();
-            services.AddTransient<FormRepairComponent>();
+            DependencyManager.Instance.RegisterType<FormClients>();
-            services.AddTransient<FormRepairs>();
+            DependencyManager.Instance.RegisterType<FormImplementer>();
-            services.AddTransient<FormReportRepairComponents>();
+            DependencyManager.Instance.RegisterType<FormImplementers>();
-            services.AddTransient<FormReportOrders>();
+            DependencyManager.Instance.RegisterType<FormLetters>();
-            services.AddTransient<FormClients>();
-            services.AddTransient<FormImplementer>();
-            services.AddTransient<FormImplementers>();
-            services.AddTransient<FormLetters>();
         }
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
     }
 }