aleyckin/PIbd-22_Aleikin_A.M._AirBomber._Base
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

7 лабу сдал

Browse Source
This commit is contained in:
1yuee 2022-11-30 10:24:06 +04:00
parent e367b85072
commit a4a89b5f21
7 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AirBomber/AirBomber/AirBomber.csproj
View File

@ -17,22 +17,25 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="nlog.config" /> <None Remove="serilog.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="nlog.config"> <EmbeddedResource Include="serilog.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
<PackageReference Include="Serilog" Version="2.12.0" /> <PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup> </ItemGroup>

4
AirBomber/AirBomber/FormAirBomberConfig.cs
View File

@ -12,9 +12,10 @@ namespace AirBomber
{ {
public partial class FormAirBomberConfig : Form public partial class FormAirBomberConfig : Form
{ {
DrawningBomber _airBomber = null; static DrawningBomber _airBomber = null;
private Action<DrawningBomber> EventAddAirBomber; private Action<DrawningBomber> EventAddAirBomber;
public FormAirBomberConfig() public FormAirBomberConfig()
{ {
InitializeComponent(); InitializeComponent();
@ -51,6 +52,7 @@ namespace AirBomber
} }
} }
private void LabelObject_MouseDown(object sender, MouseEventArgs e) private void LabelObject_MouseDown(object sender, MouseEventArgs e)
{ {
(sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);

3
AirBomber/AirBomber/MapsCollection.cs
View File

@ -56,8 +56,7 @@ namespace AirBomber
sw.Write($"MapsCollection{Environment.NewLine}"); sw.Write($"MapsCollection{Environment.NewLine}");
foreach (var storage in _mapStorages) foreach (var storage in _mapStorages)
{ {
sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
separatorData)}{Environment.NewLine}");
} }
} }
} }

13
AirBomber/AirBomber/Program.cs
View File

@ -1,6 +1,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using Serilog; using Serilog;
using System.ServiceProcess; using System.ServiceProcess;
@ -27,13 +27,18 @@ namespace AirBomber
private static void ConfigureServices(ServiceCollection services) private static void ConfigureServices(ServiceCollection services)
{ {
var serilogLogger = new LoggerConfiguration().WriteTo.File("seriallog.txt").CreateLogger();
services.AddSingleton<FormMapWithSetAirBomber>() services.AddSingleton<FormMapWithSetAirBomber>()
.AddLogging(option => .AddLogging(option =>
{ {
var config = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("serilog.json")
.Build();
Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(config).CreateLogger();
option.SetMinimumLevel(LogLevel.Information); option.SetMinimumLevel(LogLevel.Information);
option.AddSerilog(logger: serilogLogger, dispose: true); option.AddSerilog();
}); });
} }
} }

13
AirBomber/AirBomber/nlog.config
View File

@ -1,13 +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="airBomberlog-${shortdate}.log" />
</targets>
<rules>
<logger name="*" minlevel="Debug" writeTo="tofile" />
</rules>
</nlog>
</configuration>

17
AirBomber/AirBomber/serilog.json Normal file
View File

@ -0,0 +1,17 @@
{
"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}"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
}
}