Confectionery/ConfectioneryBusinessLogic/BackUpLogic.cs

@@ -1,102 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryDataModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO.Compression;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryBusinessLogic
-{
-	public class BackUpLogic : IBackUpLogic
-	{
-		private readonly ILogger _logger;
-
-		private readonly IBackUpInfo _backUpInfo;
-
-		public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
-		{
-			_logger = logger;
-			_backUpInfo = backUpInfo;
-		}
-
-		public void CreateBackUp(BackUpSaveBinidngModel model)
-		{
-			if (_backUpInfo == null)
-			{
-				return;
-			}
-			try
-			{
-				_logger.LogDebug("Clear folder");
-				var dirInfo = new DirectoryInfo(model.FolderName);
-				if (dirInfo.Exists)
-				{
-					foreach (var file in dirInfo.GetFiles())
-					{
-						file.Delete();
-					}
-				}
-				_logger.LogDebug("Delete archive");
-				string fileName = $"{model.FolderName}.zip";
-				if (File.Exists(fileName))
-				{
-					File.Delete(fileName);
-				}
-				// берем метод для сохранения
-				_logger.LogDebug("Get assembly");
-				var typeIId = typeof(IId);
-				var assembly = typeIId.Assembly;
-				if (assembly == null)
-				{
-					throw new ArgumentNullException("Сборка не найдена", nameof(assembly));
-				}
-				var types = assembly.GetTypes();
-				var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
-				_logger.LogDebug("Find {count} types", types.Length);
-				foreach (var type in types)
-				{
-					if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
-					{
-						var modelType = _backUpInfo.GetTypeByModelInterface(type.Name);
-						if (modelType == null)
-						{
-							throw new InvalidOperationException($"Не найден класс-модель для {type.Name}");
-						}
-						_logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
-						// вызываем метод на выполнение
-						method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName });
-					}
-				}
-				_logger.LogDebug("Create zip and remove folder");
-				// архивируем
-				ZipFile.CreateFromDirectory(model.FolderName, fileName);
-				// удаляем папку
-				dirInfo.Delete(true);
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-
-		private void SaveToFile<T>(string folderName) where T : class, new()
-		{
-			var records = _backUpInfo.GetList<T>();
-			if (records == null)
-			{
-				_logger.LogWarning("{type} type get null list", typeof(T).Name);
-				return;
-			}
-			var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-			using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
-			jsonFormatter.WriteObject(fs, records);
-		}
-	}
-}

Confectionery/ConfectioneryContracts/DI/DependencyManager.cs

@@ -1,66 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.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; } }
-
-		/// <summary>
-		/// Иницализация библиотек, в которых идут установки зависомстей
-		/// </summary>
-		public static void InitDependency()
-		{
-			var ext = ServiceProviderLoader.GetImplementationExtensions();
-			if (ext == null)
-			{
-				throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-			}
-			// регистрируем зависимости
-			ext.RegisterServices();
-		}
-
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
-
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		public T Resolve<T>() => _dependencyManager.Resolve<T>();
-	}
-}

Confectionery/ConfectioneryContracts/DI/IDependencyContainer.cs

@@ -1,40 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.DI
-{
-	public interface IDependencyContainer
-	{
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		void AddLogging(Action<ILoggingBuilder> configure);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		/// <param name="isSingle"></param>
-		void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="isSingle"></param>
-		void RegisterType<T>(bool isSingle) where T : class;
-
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		T Resolve<T>();
-	}
-}

Confectionery/ConfectioneryContracts/DI/IImplementationExtension.cs

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

Confectionery/ConfectioneryContracts/DI/ServiceDependencyContainer.cs

@@ -1,62 +0,0 @@
-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 ConfectioneryContracts.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, U>(bool isSingle) where U : class, T where T : class
-		{
-			if (isSingle)
-			{
-				_serviceCollection.AddSingleton<T, U>();
-			}
-			else
-			{
-				_serviceCollection.AddTransient<T, U>();
-			}
-			_serviceProvider = null;
-		}
-
-		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>()!;
-		}
-	}
-}

Confectionery/ConfectioneryContracts/DI/ServiceProviderLoader.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.DI
-{
-	public class ServiceProviderLoader
-	{
-		/// <summary>
-		/// Загрузка всех классов-реализаций IImplementationExtension
-		/// </summary>
-		/// <returns></returns>
-		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";
-		}
-	}
-}

Confectionery/ConfectioneryFileImplement/BackUpInfo.cs

@@ -1,44 +0,0 @@
-using ConfectioneryContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		private readonly DataFileSingleton source;
-		private readonly PropertyInfo[] sourceProperties;
-
-		public BackUpInfo()
-		{
-			source = DataFileSingleton.GetInstance();
-			sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
-		}
-
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			var requredType = typeof(T);
-			return (List<T>?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType)
-				?.GetValue(source);
-
-		}
-
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			var assembly = typeof(BackUpInfo).Assembly;
-			var types = assembly.GetTypes();
-			foreach (var type in types)
-			{
-				if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-				{
-					return type;
-				}
-			}
-			return null;
-		}
-	}
-}

Confectionery/ConfectioneryFileImplement/ImplementationExtension.cs

@@ -1,27 +0,0 @@
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryDatabaseImplement.Implements;
-using ConfectioneryContracts.DI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement
-{
-	public class ImplementationExtension
-	{
-		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<IPastryStorage, PastryStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

Confectionery/ConfectioneryListImplement/BackUpInfo.cs

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

Confectionery/ConfectioneryListImplement/ImplementationExtension.cs

@@ -1,27 +0,0 @@
-using ConfectioneryContracts.DI;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryListImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryListImplement
-{
-	public class ImplementationExtension : 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<IPastryStorage, PastryStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

Confectionery/ConfectioneryView/FormMain.Designer.cs

@@ -40,13 +40,12 @@
 			componentPastryToolStripMenuItem = new ToolStripMenuItem();
 			ordersListToolStripMenuItem = new ToolStripMenuItem();
 			startWorkToolStripMenuItem = new ToolStripMenuItem();
-			mailToolStripMenuItem = new ToolStripMenuItem();
 			buttonCreateOrder = new Button();
 			buttonTakeOrderInWork = new Button();
 			buttonOrderReady = new Button();
 			buttonIssuedOrder = new Button();
 			buttonRef = new Button();
-			createBackupToolStripMenuItem = new ToolStripMenuItem();
+			mailToolStripMenuItem = new ToolStripMenuItem();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			menuStrip.SuspendLayout();
 			SuspendLayout();
@@ -64,7 +63,7 @@
 			// menuStrip
 			// 
 			menuStrip.ImageScalingSize = new Size(24, 24);
-			menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem, startWorkToolStripMenuItem, mailToolStripMenuItem, createBackupToolStripMenuItem });
+			menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem, startWorkToolStripMenuItem, mailToolStripMenuItem });
 			menuStrip.Location = new Point(0, 0);
 			menuStrip.Name = "menuStrip";
 			menuStrip.Size = new Size(1921, 33);
@@ -141,13 +140,6 @@
 			startWorkToolStripMenuItem.Text = "Запуск работ";
 			startWorkToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
 			// 
-			// mailToolStripMenuItem
-			// 
-			mailToolStripMenuItem.Name = "mailToolStripMenuItem";
-			mailToolStripMenuItem.Size = new Size(78, 29);
-			mailToolStripMenuItem.Text = "Почта";
-			mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
-			// 
 			// buttonCreateOrder
 			// 
 			buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -203,12 +195,12 @@
 			buttonRef.UseVisualStyleBackColor = true;
 			buttonRef.Click += buttonRef_Click;
 			// 
-			// createBackupToolStripMenuItem
+			// mailToolStripMenuItem
 			// 
-			createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem";
-			createBackupToolStripMenuItem.Size = new Size(145, 29);
-			createBackupToolStripMenuItem.Text = "Создать бекап";
-			createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click;
+			mailToolStripMenuItem.Name = "mailToolStripMenuItem";
+			mailToolStripMenuItem.Size = new Size(78, 29);
+			mailToolStripMenuItem.Text = "Почта";
+			mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
 			// 
 			// FormMain
 			// 
@@ -253,6 +245,5 @@
 		private ToolStripMenuItem implementersToolStripMenuItem;
 		private ToolStripMenuItem startWorkToolStripMenuItem;
 		private ToolStripMenuItem mailToolStripMenuItem;
-		private ToolStripMenuItem createBackupToolStripMenuItem;
 	}
 }

Confectionery/ConfectioneryView/FormMain.cs

@@ -1,5 +1,4 @@
-using ConfectioneryBusinessLogic;
-using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
 using System;
@@ -20,16 +19,14 @@ namespace ConfectioneryView
 		private readonly IOrderLogic _orderLogic;
 		private readonly IReportLogic _reportLogic;
 		private readonly IWorkProcess _workProcess;
-		private readonly IBackUpLogic _backUpLogic;
 
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
 		{
 			InitializeComponent();
 			_logger = logger;
 			_orderLogic = orderLogic;
 			_reportLogic = reportLogic;
 			_workProcess = workProcess;
-			_backUpLogic = backUpLogic;
 		}
 		private void FormMain_Load(object sender, EventArgs e)
 		{
@@ -224,30 +221,5 @@ namespace ConfectioneryView
 				form.ShowDialog();
 			}
 		}
-
-		private void createBackupToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				if (_backUpLogic != null)
-				{
-					var fbd = new FolderBrowserDialog();
-					if (fbd.ShowDialog() == DialogResult.OK)
-					{
-						_backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
-						{
-							FolderName = fbd.SelectedPath
-						});
-						MessageBox.Show("Бекап создан", "Сообщение",
-						MessageBoxButtons.OK, MessageBoxIcon.Information);
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show(ex.Message, "Ошибка создания бекапа", MessageBoxButtons.OK,
-				MessageBoxIcon.Error);
-			}
-		}
 	}
 }

Confectionery/ConfectioneryView/Program.cs

@@ -10,7 +10,6 @@ using NLog.Extensions.Logging;
 using ConfectioneryBusinessLogic.BusinessLogics;
 using Microsoft.EntityFrameworkCore.Design;
 using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.DI;
 
 namespace ConfectioneryView
 {
@@ -26,10 +25,12 @@ namespace ConfectioneryView
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            InitDependency();
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
 			try
 			{
-				var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
+				var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
 				mailSender?.MailConfig(new MailConfigBindingModel
 				{
 					MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@@ -44,59 +45,55 @@ namespace ConfectioneryView
 			}
 			catch (Exception ex)
 			{
-				var logger = DependencyManager.Instance.Resolve<ILogger>();
+				var logger = _serviceProvider.GetService<ILogger>();
 				logger?.LogError(ex, "Mails Problem");
 			}
-			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+			Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-		private static void InitDependency()
+        private static void ConfigureServices(ServiceCollection services)
         {
-			DependencyManager.InitDependency();
-
-			DependencyManager.Instance.AddLogging(option =>
+            services.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-            DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IPastryStorage, PastryStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+            services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<IPastryStorage, PastryStorage>();
+			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+			services.AddTransient<IClientStorage, ClientStorage>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
 
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IClientLogic, ClientLogic>();
+			services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IPastryLogic, PastryLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
 
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-            DependencyManager.Instance.RegisterType<IPastryLogic, PastryLogic>();
-            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+			services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+			services.AddTransient<FormMain>();
+            services.AddTransient<FormComponent>();
+            services.AddTransient<FormComponents>();
+            services.AddTransient<FormCreateOrder>();
+            services.AddTransient<FormPastry>();
+            services.AddTransient<FormPastryComponent>();
+            services.AddTransient<FormPastrys>();
+            services.AddTransient<FormReportPastryComponents>();
+            services.AddTransient<FormReportOrders>();
+			services.AddTransient<FormClients>();
+			services.AddTransient<FormImplementers>();
+			services.AddTransient<FormImplementer>();
+			services.AddTransient<FormMail>();
 
-			DependencyManager.Instance.RegisterType<FormMain>();
-            DependencyManager.Instance.RegisterType<FormComponent>();
-            DependencyManager.Instance.RegisterType<FormComponents>();
-            DependencyManager.Instance.RegisterType<FormCreateOrder>();
-            DependencyManager.Instance.RegisterType<FormPastry>();
-            DependencyManager.Instance.RegisterType<FormPastryComponent>();
-            DependencyManager.Instance.RegisterType<FormPastrys>();
-            DependencyManager.Instance.RegisterType<FormReportPastryComponents>();
-            DependencyManager.Instance.RegisterType<FormReportOrders>();
-			DependencyManager.Instance.RegisterType<FormClients>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormMail>();
-
-			DependencyManager.Instance.RegisterType<EntityFrameworkDesignServicesBuilder>();
+			services.AddTransient<EntityFrameworkDesignServicesBuilder>();
 		}
-		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
 	}
 }