andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed vulnerability issue and upgraded to discord.net 3.18

Browse Source
This commit is contained in:
Andrei Tudor
2025-10-12 22:14:39 +03:00
parent b8a3f189a9
commit fae4b37ef9
9 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscordBotCore.Configuration/DiscordBotCore.Configuration.csproj
View File

@@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
DiscordBotCore.Database.Sqlite/DiscordBotCore.Database.Sqlite.csproj
View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.3" /> <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.9" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
DiscordBotCore.Logging/Logger.cs
View File

@@ -24,6 +24,13 @@ public sealed class Logger : ILogger
LogMessages = new List<ILogMessage>(); LogMessages = new List<ILogMessage>();
} }
public void Log(string message) => Log(new LogMessage(message, string.Empty, LogType.Info));
public void Log(string message, LogType logType) => Log(new LogMessage(message, logType));
public void Log(string message, object sender) => Log(new LogMessage(message, sender));
public void Log(string message, object sender, LogType type) => Log(new LogMessage(message, sender, type));
public void LogException(Exception exception, object sender, bool logFullStack = false) => Log(LogMessage.CreateFromException(exception, sender, logFullStack));
private string GenerateLogMessage(ILogMessage message) private string GenerateLogMessage(ILogMessage message)
{ {
string messageAsString = new string(_LogMessageFormat); string messageAsString = new string(_LogMessageFormat);
@@ -54,9 +61,4 @@ public sealed class Logger : ILogger
await LogToFile(messageAsString); await LogToFile(messageAsString);
} }
public void Log(string message) => Log(new LogMessage(message, string.Empty, LogType.Info));
public void Log(string message, LogType logType) => Log(new LogMessage(message, logType));
public void Log(string message, object sender) => Log(new LogMessage(message, sender));
public void Log(string message, object sender, LogType type) => Log(new LogMessage(message, sender, type));
public void LogException(Exception exception, object sender, bool logFullStack = false) => Log(LogMessage.CreateFromException(exception, sender, logFullStack));
} }

2
DiscordBotCore.PluginCore/DiscordBotCore.PluginCore.csproj
View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.17.2" /> <PackageReference Include="Discord.Net" Version="3.18.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
DiscordBotCore/DiscordBotCore.csproj
View File

@@ -6,8 +6,8 @@
<Platforms>AnyCPU;x64;ARM64</Platforms> <Platforms>AnyCPU;x64;ARM64</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.17.2" /> <PackageReference Include="Discord.Net" Version="3.18.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DiscordBotCore.Configuration\DiscordBotCore.Configuration.csproj" /> <ProjectReference Include="..\DiscordBotCore.Configuration\DiscordBotCore.Configuration.csproj" />

14
Tests/Tests.DiscordBotCore.Configuration/Tests.DiscordBotCore.Configuration.csproj
View File

@@ -10,11 +10,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0"/> <PackageReference Include="coverlet.collector" Version="6.0.4">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Moq" Version="4.20.72" /> <PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.5.3"/> <PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/> <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
Tests/Tests.DiscordBotCore.Logging/Tests.DiscordBotCore.Logging.csproj
View File

@@ -11,10 +11,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0"/> <PackageReference Include="coverlet.collector" Version="6.0.4">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/> <PrivateAssets>all</PrivateAssets>
<PackageReference Include="xunit" Version="2.5.3"/> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/> </PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

29
WebUI/Program.cs
View File

@@ -39,24 +39,21 @@ static Assembly? LoadFromSameFolder(object? sender, ResolveEventArgs args, strin
string assemblyPath = Path.Combine(librariesFolder, assemblyFileName); string assemblyPath = Path.Combine(librariesFolder, assemblyFileName);
Console.WriteLine($"Attempting to load from: {assemblyPath}"); Console.WriteLine($"Attempting to load from: {assemblyPath}");
if (File.Exists(assemblyPath)) if (!File.Exists(assemblyPath))
{
try
{
var fileAssembly = Assembly.LoadFrom(assemblyPath);
Console.WriteLine($"Successfully loaded Assembly: {fileAssembly.FullName}");
return fileAssembly;
}
catch (Exception ex)
{
Console.WriteLine($"Error loading assembly from '{assemblyPath}': {ex.Message}");
// Optionally log the full exception for debugging
}
}
else
{ {
Console.WriteLine($"File not found: {assemblyPath}"); Console.WriteLine($"File not found: {assemblyPath}");
continue;
}
try
{
Assembly assembly = Assembly.LoadFrom(assemblyPath);
return assembly;
}
catch (Exception ex)
{
Console.WriteLine($"Failed to load assembly: {assemblyPath}. Error message: {ex.Message}");
} }
} }

7
global.json Normal file
View File

@@ -0,0 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": false
}
}