From b5cdc0afeb891549a0f63db37792255be221083f Mon Sep 17 00:00:00 2001
From: Tudor Andrei <tudor.andrei.707@gmail.com>
Date: Sun, 22 Oct 2023 13:38:40 +0300
Subject: [PATCH] Merged errors with logs

---
 DiscordBot/DiscordBot.csproj       | 10 +++++++---
 PluginManager/Config.cs            |  5 ++---
 PluginManager/PluginManager.csproj |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj
index fa3c2ed..82c846f 100644
--- a/DiscordBot/DiscordBot.csproj
+++ b/DiscordBot/DiscordBot.csproj
@@ -2,12 +2,13 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
-        <Nullable>disable</Nullable>
+        <Nullable>enable</Nullable>
         <ApplicationIcon/>
         <StartupObject/>
         <SignAssembly>False</SignAssembly>
         <IsPublishable>True</IsPublishable>
-        <AssemblyVersion>1.0.3.1</AssemblyVersion>
+        <AssemblyVersion>1.0.3.2</AssemblyVersion>
+        <LangVersion>10</LangVersion>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DebugType>none</DebugType>
@@ -19,11 +20,13 @@
         <Compile Remove="Data\**"/>
         <Compile Remove="obj\**"/>
         <Compile Remove="Output\**"/>
+        <Compile Remove="publish\**" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Remove="Data\**"/>
         <EmbeddedResource Remove="obj\**"/>
         <EmbeddedResource Remove="Output\**"/>
+        <EmbeddedResource Remove="publish\**" />
     </ItemGroup>
     <ItemGroup>
         <None Remove="Data\**"/>
@@ -31,9 +34,10 @@
         <None Remove="Output\**"/>
         <None Remove="builder.bat" />
         <None Remove="builder.sh" />
+        <None Remove="publish\**" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.11.0"/>
+        <PackageReference Include="Discord.Net" Version="3.12.0" />
         <PackageReference Include="pythonnet" Version="3.0.1" />
         <PackageReference Include="Spectre.Console" Version="0.47.0" />
     </ItemGroup>
diff --git a/PluginManager/Config.cs b/PluginManager/Config.cs
index 021966b..6a8ba12 100644
--- a/PluginManager/Config.cs
+++ b/PluginManager/Config.cs
@@ -24,12 +24,11 @@ public class Config
         Directory.CreateDirectory("./Data/Resources");
         Directory.CreateDirectory("./Data/Plugins");
         Directory.CreateDirectory("./Data/PAKS");
-        Directory.CreateDirectory("./Data/Logs/Logs");
-        Directory.CreateDirectory("./Data/Logs/Errors");
+        Directory.CreateDirectory("./Data/Logs");
 
         AppSettings = new SettingsDictionary<string, string>("./Data/Resources/config.json");
 
-        AppSettings["LogFolder"]   = "./Data/Logs/Logs";
+        AppSettings["LogFolder"]   = "./Data/Logs";
 
         Logger = new Logger(false, true);
 
diff --git a/PluginManager/PluginManager.csproj b/PluginManager/PluginManager.csproj
index bc8dbce..b627f74 100644
--- a/PluginManager/PluginManager.csproj
+++ b/PluginManager/PluginManager.csproj
@@ -12,7 +12,7 @@
         <None Remove="BlankWindow1.xaml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.11.0" />
+        <PackageReference Include="Discord.Net" Version="3.12.0" />
         <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
     </ItemGroup>
 </Project>
\ No newline at end of file