laba 0/laba 0/MotorBoat.csproj

@@ -10,8 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

laba 0/laba 0/Program.cs

@@ -1,14 +1,14 @@
-using System.Drawing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Serilog;
 
 namespace MotorBoat
 {
     internal static class Program
     {
         /// <summary>
-        /// The main entry point for the application.
+        ///  The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
@@ -16,25 +16,30 @@ namespace MotorBoat
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-
-            ServiceCollection services = new();
+            var services = new ServiceCollection();
             ConfigureServices(services);
-            using ServiceProvider serviceProvider = services.BuildServiceProvider();
-            Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+            }
         }
-
-        /// <summary>
-        /// Êîíôèãóðàöèÿ ñåðâèñà DI
-        /// </summary>
-        /// <param name="services"></param>
         private static void ConfigureServices(ServiceCollection services)
         {
             services.AddSingleton<FormBoatCollection>()
-                    .AddLogging(option =>
-                    {
-                        option.SetMinimumLevel(LogLevel.Information);
-                        option.AddNLog("nlog.config");
-                    });
+            .AddLogging(option =>
+            {
+                var configuration = new ConfigurationBuilder()
+                    .SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: "C:\\Users\\Àííà\\Desktop\\Ôàéë ñ äàííûìè.txt", optional: false, reloadOnChange: true)
+                    .Build();
+
+                var logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .CreateLogger();
+
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
         }
     }
-}
+}

laba 0/laba 0/appSetting.json

@@ -0,0 +1,20 @@
+{
+    "Serilog": {
+        "Using": [ "Serilog.Sinks.File" ],
+        "MinimumLevel": "Information",
+        "WriteTo": [
+            {
+                "Name": "File",
+                "Args": {
+                    "path": "Logs/log_.log",
+                    "rollingInterval": "Day",
+                    "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+                }
+            }
+        ],
+        "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+        "Properties": {
+            "Application": "Battleship"
+        }
+    }
+}

laba 0/laba 0/nlog.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 autoReload="true" internalLogLevel="Info">
-		<targets>
-			<target xsi:type="File" name="tofile" fileName="carlog-
-${shortdate}.log" />
-		</targets>
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile" />
-		</rules>
-	</nlog>
-</configuration>