In Wrok 02

.gitignore

@@ -398,3 +398,4 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+Diner/ImplementationExtensions/*

Diner/DinerContracts/BindingModels/MessageInfoBindingModel.cs

@@ -18,5 +18,7 @@ namespace DinerContracts.BindingModels {
 		public string Subject { get; set; } = string.Empty;
 
 		public string Body { get; set; } = string.Empty;
+
+		public int ID { get; private set; }
 	}
 }

Diner/DinerContracts/DI/DependencyManager.cs

@@ -0,0 +1,56 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.DI {
+	public class DependencyManager {
+
+		private readonly IDependencyContainer _dependencyManager;
+
+		private static DependencyManager? _manager;
+
+		private static readonly object _locjObject = new();
+
+		private DependencyManager() { 
+			_dependencyManager = new ServiceDependencyContainer();
+		}
+
+		public static DependencyManager Instance {
+			get { 
+				if (_manager == null) {
+					lock (_locjObject) {
+						_manager = new DependencyManager();
+					}
+				}
+				return _manager;
+			}		
+		}
+
+		// Инициализация библиотек, в которых идут установки зависимостей
+
+		public static void InitDependency() {
+			var ext = ServiceProviderLoader.GetImplmentationExternsion();
+			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>();
+	}
+}

Diner/DinerContracts/DI/IDependencyContainer.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.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>();
+	}
+}

Diner/DinerContracts/DI/IImplmentationExternsion.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.DI {
+	public interface IImplmentationExternsion {
+		public int Priority { get; }
+
+		// Регистрация сервиса
+		public void RegisterServices();
+	}
+}

Diner/DinerContracts/DI/ServiceDependencyContainer.cs

@@ -0,0 +1,51 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.DI {
+	public class ServiceDependencyContainer : IDependencyContainer {
+
+		private ServiceProvider? _serviceProvider;
+
+		private readonly ServiceCollection _serviceCollection;
+
+		public ServiceDependencyContainer() {
+			_serviceCollection = new ServiceCollection();
+		}
+
+		public void AddLogging(Action<ILoggingBuilder> configure) {
+			_serviceCollection.AddLogging(configure);
+		}
+
+		public void RegisterType<T>(bool isSingle) where T : class {
+			if (isSingle) {
+				_serviceCollection.AddSingleton<T>();
+			}
+			else {
+				_serviceCollection.AddTransient<T>();
+			}
+			_serviceProvider = null;
+		}
+
+		public T Resolve<T>() {
+			if (_serviceProvider == null) {
+				_serviceProvider = _serviceCollection.BuildServiceProvider();
+			}
+			return _serviceProvider.GetService<T>()!;
+		}
+
+		void IDependencyContainer.RegisterType<T, U>(bool isSingle) {
+			if (isSingle) {
+				_serviceCollection.AddSingleton<T, U>();
+			}
+			else {
+				_serviceCollection.AddTransient<T, U>();
+			}
+			_serviceProvider = null;
+		}
+	}
+}

Diner/DinerContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.DI {
+	public class ServiceProviderLoader {
+		
+		// Загрузка всех классов-реализация IImplementationExtension
+
+		public static IImplmentationExternsion? GetImplmentationExternsion() {
+			IImplmentationExternsion? 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(IImplmentationExternsion).IsAssignableFrom(t)) {
+						if (source == null) {
+							source = (IImplmentationExternsion)Activator.CreateInstance(t)!;
+						}
+						else {
+							var newSource = (IImplmentationExternsion)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";
+		}
+	}
+}

Diner/DinerContracts/DinerContracts.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DinerDataModels\DinerDataModels.csproj" />
   </ItemGroup>

Diner/DinerContracts/SearchModels/IMessageInfoStorage.cs

@@ -1,17 +0,0 @@
-using DinerContracts.BindingModels;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.SearchModels {
-	public interface IMessageInfoStorage {
-		List<MessageInfoViewModel> GetFullList();
-		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-
-		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-	}
-}

Diner/DinerContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -0,0 +1,20 @@
+using DinerContracts.BindingModels;
+using DinerContracts.SearchModels;
+using DinerContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.StoragesContracts
+{
+    public interface IMessageInfoStorage
+    {
+        List<MessageInfoViewModel> GetFullList();
+        List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
+
+        MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
+        MessageInfoViewModel? Insert(MessageInfoBindingModel model);
+    }
+}

Diner/DinerContracts/ViewModels/MessageInfoViewModel.cs

@@ -16,6 +16,9 @@ namespace DinerContracts.ViewModels {
 		[Column(visible: false)]
 		public int? ClientID { get; set; }
 
+		[Column(visible: false)]
+		public int ID { get; private set; }
+
 		[Column(title: "Отправитель", width: 150)]
 		public string SenderName { get; set; } = string.Empty;
 
@@ -27,5 +30,7 @@ namespace DinerContracts.ViewModels {
 
 		[Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
 		public string Body { get; set; } = string.Empty;
+
+
 	}
 }

Diner/DinerDataBaseImplement/Implements/MessageInfoStorage.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
 using DinerDataBaseImplement.Models;
 using Microsoft.EntityFrameworkCore;
@@ -9,8 +10,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DinerDataBaseImplement.Implements {
-	public class MessageInfoStorage : IMessageInfoStorage {
+namespace DinerDataBaseImplement.Implements
+{
+    public class MessageInfoStorage : IMessageInfoStorage {
 
 		public MessageInfoViewModel? Insert(MessageInfoBindingModel model) {
 			using var context = new DinerDatabaseBy7Work();

Diner/DinerListImplement/DinerListImplement.csproj

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

Diner/DinerListImplement/Implements/BackUpInfo.cs

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

Diner/DinerListImplement/Implements/MessageInfoStorage.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
 using DinerListImplement.Models;
 using System;
@@ -9,8 +10,9 @@ using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DinerListImplement.Implements {
-	public class MessageInfoStorage : IMessageInfoStorage {
+namespace DinerListImplement.Implements
+{
+    public class MessageInfoStorage : IMessageInfoStorage {
 
 		private readonly DataListSingleton _source;
 

Diner/DinerListImplement/ListImplementationExtension.cs

@@ -0,0 +1,25 @@
+using DinerContracts.DI;
+using DinerContracts.StoragesContracts;
+using DinerListImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerListImplement
+{
+    public class ListImplementationExtension {
+		public int Priority => 0;
+
+		public void RegisterServices() {
+			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IFoodStorage, FoodStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<ISnackStorage, SnackStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

Diner/DinerListImplement/Models/MessageInfo.cs

@@ -9,6 +9,9 @@ using System.Threading.Tasks;
 
 namespace DinerListImplement.Models {
 	public class MessageInfo : IMessageInfoModel {
+
+		public int ID { get; private set; }
+
 		public string MessageID { get; private set; } = string.Empty;
 
 		public int? ClientID { get; set; }

Diner/DinerRestAPI/Program.cs

@@ -2,7 +2,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
 using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.SearchModels;
 using DinerContracts.StoragesContracts;
 using DinerDataBaseImplement.Implements;
 using DineryBusinessLogic.BusinessLogic;
@@ -10,8 +9,9 @@ using DineryBusinessLogic.MailWorker;
 using DocumentFormat.OpenXml.VariantTypes;
 using Microsoft.OpenApi.Models;
 
-namespace DinerRestAPI {
-	public class Program {
+namespace DinerRestAPI
+{
+    public class Program {
 		public static void Main(string[] args) {
 			var builder = WebApplication.CreateBuilder(args);
 

Diner/DinerShopImplement/Implements/MessageInfoStorage.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
 using DinerFileImplement.Models;
 using System;
@@ -9,8 +10,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DinerFileImplement.Implements {
-	public class MessageInfoStorage : IMessageInfoStorage {
+namespace DinerFileImplement.Implements
+{
+    public class MessageInfoStorage : IMessageInfoStorage {
 
 		private readonly DataFileSingleton _source;
 

Diner/DinerShopImplement/Models/MessageInfo.cs

@@ -10,6 +10,9 @@ using System.Xml.Linq;
 
 namespace DinerFileImplement.Models {
 	public class MessageInfo : IMessageInfoModel {
+
+		public int ID { get; private set; }
+
 		public string MessageID { get; set; } = string.Empty;
 
 		public int? ClientID { get; set; }
@@ -65,5 +68,6 @@ namespace DinerFileImplement.Models {
 										new XElement("DateDelivery", DateDelivery.ToString()),
 										new XElement("Subject", Subject),
 										new XElement("Body", Body));
+
 	}
 }

Diner/DinerView/FormFoods.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
+using DinerContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -41,7 +42,7 @@ namespace DinerView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormFood));
+            var service = DependencyManager.Instance.Resolve<FormFood>();
             if (service is FormFood form) {
                 if (form.ShowDialog() == DialogResult.OK) LoadData();
             }
@@ -81,7 +82,7 @@ namespace DinerView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormFood));
+                var service = DependencyManager.Instance.Resolve<FormFood>();
                 if (service is FormFood form)
                 {
                     form.ID = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ID"].Value);

Diner/DinerView/FormImplementers.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
+using DinerContracts.DI;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
 using System;
@@ -44,7 +45,7 @@ namespace DinerView {
 		}
 
 		private void buttonAdd_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			var service = DependencyManager.Instance.Resolve<FormImplementer>();
 			if (service is FormImplementer form) {
 				if (form.ShowDialog() == DialogResult.OK) {
 					LoadData();
@@ -54,7 +55,7 @@ namespace DinerView {
 
 		private void buttonCange_Click(object sender, EventArgs e) {
 			if (dataGridView.SelectedRows.Count == 1) {
-				var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				var service = DependencyManager.Instance.Resolve<FormImplementer>();
 				if (service is FormImplementer form) {
 					form.ID = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ID"].Value);
 					if (form.ShowDialog() == DialogResult.OK) {

Diner/DinerView/FormMain.cs

@@ -1,6 +1,7 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
 using DinerContracts.BusinessLogicsContracts;
+using DinerContracts.DI;
 using DinerDataBaseImplement.Models;
 using Microsoft.Extensions.Logging;
 using System;
@@ -46,7 +47,7 @@ namespace DinerView
 		}
 
 		private void toolStripMenuItemFoods_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormFoods));
+			var service = DependencyManager.Instance.Resolve<FormFoods>();
 			if (service is FormFoods form) {
 				form.ShowDialog();
 				LoadData();
@@ -54,7 +55,7 @@ namespace DinerView
 		}
 
 		private void toolStripMenuItemSnacks_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormSnacks));
+			var service = DependencyManager.Instance.Resolve<FormSnacks>();
 			if (service is FormSnacks form) {
 				form.ShowDialog();
 				LoadData();
@@ -62,7 +63,7 @@ namespace DinerView
 		}
 
 		private void buttonCreateOrder_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			var service = DependencyManager.Instance.Resolve<FormCreateOrder>();
 			if (service is FormCreateOrder form) {
 				form.ShowDialog();
 				LoadData();
@@ -137,41 +138,41 @@ namespace DinerView
 		}
 
 		private void FoodSnacksToolStripMenuItem_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportSnackFoods));
+			var service = DependencyManager.Instance.Resolve<FormReportSnackFoods>();
 			if (service is FormReportSnackFoods form) {
 				form.ShowDialog();
 			}
 		}
 
 		private void ordersToolStripMenuItem_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+			var service = DependencyManager.Instance.Resolve<FormReportOrders>();
 			if (service is FormReportOrders form) {
 				form.ShowDialog();
 			}
 		}
 
 		private void toolStripMenuItemClient_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormClient));
+			var service = DependencyManager.Instance.Resolve<FormClient>();
 			if (service is FormClient form) {
 				form.ShowDialog();
 			}
 		}
 
 		private void toolStripMenuItemImplementer_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+			var service = DependencyManager.Instance.Resolve<FormImplementers>();
 			if (service is FormImplementers form) {
 				form.ShowDialog();
 			}
 		}
 
 		private void toolStripMenuItemStartOfWork_Click(object sender, EventArgs e) {
-			_workProcess.Work((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+			_workProcess.Work((DependencyManager.Instance.Resolve<IImplementerLogic>() as IImplementerLogic)!, _orderLogic);
 			MessageBox.Show("Процесс обработки запущен", "Сообщение",
 		   MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
 		private void toolStripMenuItemMail_Click(object sender, EventArgs e) {
-			var service = Program.ServiceProvider?.GetService(typeof(FormMail));
+			var service = DependencyManager.Instance.Resolve<FormMail>();
 			if (service is FormMail form) {
 				form.ShowDialog();
 			}

Diner/DinerView/FormSnack.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
+using DinerContracts.DI;
 using DinerContracts.SearchModels;
 using DinerDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -87,7 +88,7 @@ namespace DinerView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSnackFood));
+            var service = DependencyManager.Instance.Resolve<FormSnackFood>();
             if (service is FormSnackFood form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
@@ -111,7 +112,7 @@ namespace DinerView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormSnackFood));
+                var service = DependencyManager.Instance.Resolve<FormSnackFood>();
                 if (service is FormSnackFood form)
                 {
                     int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);

Diner/DinerView/FormSnacks.cs

@@ -1,5 +1,6 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
+using DinerContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -39,7 +40,7 @@ namespace DinerView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSnack));
+            var service = DependencyManager.Instance.Resolve<FormSnack>();
             if (service is FormSnack form) {
                 if (form.ShowDialog() == DialogResult.OK) LoadData();
             }
@@ -74,7 +75,7 @@ namespace DinerView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormSnack));
+                var service = DependencyManager.Instance.Resolve<FormSnack>();
                 if (service is FormSnack form)
                 {
                     form.ID = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ID"].Value);

Diner/DinerView/Program.cs

@@ -1,7 +1,7 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContacts;
 using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.SearchModels;
+using DinerContracts.DI;
 using DinerContracts.StoragesContracts;
 using DinerDataBaseImplement.Implements;
 using DineryBusinessLogic.BusinessLogic;
@@ -16,8 +16,7 @@ namespace DinerView
 {
     internal static class Program
     {
-        private static ServiceProvider? _serviceProvider;
-        public static ServiceProvider? ServiceProvider => _serviceProvider;
+        
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
@@ -27,12 +26,10 @@ namespace DinerView
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            _serviceProvider = services.BuildServiceProvider();
+            InitDependency();
 
             try {
-                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
+                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
                 mailSender?.MailConfig(new MailConfigBindingModel {
                     MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
                     MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
@@ -46,58 +43,54 @@ namespace DinerView
 				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
             }
             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 ConfigureServices(ServiceCollection services)
+        private static void InitDependency()
         {
-            services.AddLogging(option =>
+            DependencyManager.InitDependency();
+
+			DependencyManager.Instance.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-            services.AddTransient<IFoodStorage, FoodStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<ISnackStorage, SnackStorage>();
-            services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
-            services.AddTransient<IClientLogic, ClientLogic>();
-            services.AddTransient<IFoodLogic, FoodLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<ISnackLogic, SnackLogic>();
-            services.AddTransient<IReportLogic, ReportLogic>();
-            services.AddTransient<IWorkProcess, WorkModelling>();
-			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<IFoodLogic, FoodLogic>();
+            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+            DependencyManager.Instance.RegisterType<ISnackLogic, SnackLogic>();
+            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModelling>();
+			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
 
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>();
 
-			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
 
-            services.AddTransient<FormMain>();
-            services.AddTransient<FormFood>();
-            services.AddTransient<FormFoods>();
-            services.AddTransient<FormCreateOrder>();
-            services.AddTransient<FormSnack>();
-            services.AddTransient<FormSnackFood>();
-            services.AddTransient<FormSnacks>();
-            services.AddTransient<FormReportSnackFoods>();
-            services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormClient>();
-            services.AddTransient<FormImplementers>();
-            services.AddTransient<FormImplementer>();
-            services.AddTransient<FormMail>();
+			DependencyManager.Instance.RegisterType<FormMain>();
+			DependencyManager.Instance.RegisterType<FormFood>();
+			DependencyManager.Instance.RegisterType<FormFoods>();
+			DependencyManager.Instance.RegisterType<FormCreateOrder>();
+			DependencyManager.Instance.RegisterType<FormSnack>();
+			DependencyManager.Instance.RegisterType<FormSnackFood>();
+			DependencyManager.Instance.RegisterType<FormSnacks>();
+			DependencyManager.Instance.RegisterType<FormReportSnackFoods>();
+			DependencyManager.Instance.RegisterType<FormReportOrders>();
+			DependencyManager.Instance.RegisterType<FormClient>();
+            DependencyManager.Instance.RegisterType<FormImplementers>();
+            DependencyManager.Instance.RegisterType<FormImplementer>();
+            DependencyManager.Instance.RegisterType<FormMail>();
         }
 
-		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
 
 	}
 }

Diner/DineryBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -1,6 +1,7 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
 using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
 using DocumentFormat.OpenXml.Packaging;
 using Microsoft.Extensions.Logging;
@@ -12,8 +13,9 @@ using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DineryBusinessLogic.BusinessLogic {
-	public class MessageInfoLogic : IMessageInfoLogic {
+namespace DineryBusinessLogic.BusinessLogic
+{
+    public class MessageInfoLogic : IMessageInfoLogic {
 
 		private readonly ILogger _logger;
 		private readonly IMessageInfoStorage _storage;