clean up compiler warnings

RPCS3 · Jun 20, 2024 · d6688fd · d6688fd
1 parent 7d4d3ed
commit d6688fd
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/CompatBot/Commands/Sudo.Bot.cs b/CompatBot/Commands/Sudo.Bot.cs
@@ -12,6 +12,7 @@
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
 using Microsoft.EntityFrameworkCore;
+using NLog;
 
 namespace CompatBot.Commands;
 
@@ -248,7 +249,7 @@ internal static void RestartNoSaving()
             if (SandboxDetector.Detect() != SandboxType.Docker)
             {
                 Config.Log.Info("Restarting...");
-                Config.Log.Factory.Flush();
+                LogManager.LogFactory.Flush();
                 using var self = new Process {StartInfo = RestartInfo};
                 self.Start();
                 Config.InMemorySettings["shutdown"] = "true";

diff --git a/CompatBot/Commands/Sudo.cs b/CompatBot/Commands/Sudo.cs
@@ -16,6 +16,7 @@
 using DSharpPlus.Entities;
 using DSharpPlus.Interactivity.Extensions;
 using Microsoft.EntityFrameworkCore;
+using NLog;
 using SharpCompress.Common;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
@@ -134,7 +135,7 @@ public async Task Log(CommandContext ctx, [Description("Specific date")]string d
     {
         try
         {
-            Config.Log.Factory.Flush();
+            LogManager.LogFactory.Flush();
             string[] logPaths = [Config.CurrentLogPath];
             if (DateTime.TryParse(date, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var logDate))
             {

diff --git a/CompatBot/Database/DbImporter.cs b/CompatBot/Database/DbImporter.cs
@@ -75,8 +75,10 @@ private static async Task ImportAsync(BotDb dbContext, CancellationToken cancell
         {
             // __EFMigrationsHistory table will be already created by the failed migration attempt
 #pragma warning disable EF1001 // Internal EF Core API usage.
+#pragma warning disable EF1002 // Using raw sql
             await db.ExecuteSqlRawAsync($"INSERT INTO `__EFMigrationsHistory`(`MigrationId`,`ProductVersion`) VALUES ({new InitialCreate().GetId()},'manual')", cancellationToken);
             await db.ExecuteSqlRawAsync($"INSERT INTO `__EFMigrationsHistory`(`MigrationId`,`ProductVersion`) VALUES ({new Explanations().GetId()},'manual')", cancellationToken);
+#pragma warning restore EF1002
 #pragma warning restore EF1001 // Internal EF Core API usage.
             // create constraints on moderator
             await db.ExecuteSqlRawAsync(@"CREATE TABLE `temp_new_moderator` (

diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/RarHandler.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/RarHandler.cs
@@ -40,7 +40,7 @@ public async Task FillPipeAsync(Stream sourceStream, PipeWriter writer, Cancella
             while (rarReader.MoveToNextEntry())
             {
                 if (!rarReader.Entry.IsDirectory
-                    && rarReader.Entry.Key.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
+                    && rarReader.Entry.Key!.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
                     && !rarReader.Entry.Key.Contains("tty.log", StringComparison.InvariantCultureIgnoreCase))
                 {
                     LogSize = rarReader.Entry.Size;

diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/SevenZipHandler.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/SevenZipHandler.cs
@@ -40,7 +40,7 @@ public async Task FillPipeAsync(Stream sourceStream, PipeWriter writer, Cancella
             using var zipReader = zipArchive.ExtractAllEntries();
             while (zipReader.MoveToNextEntry())
                 if (!zipReader.Entry.IsDirectory
-                    && zipReader.Entry.Key.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
+                    && zipReader.Entry.Key!.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
                     && !zipReader.Entry.Key.Contains("tty.log", StringComparison.InvariantCultureIgnoreCase))
                 {
                     LogSize = zipReader.Entry.Size;

diff --git a/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/ZipHandler.cs b/CompatBot/EventHandlers/LogParsing/ArchiveHandlers/ZipHandler.cs
@@ -41,7 +41,7 @@ public async Task FillPipeAsync(Stream sourceStream, PipeWriter writer, Cancella
             while (zipReader.MoveToNextEntry())
             {
                 if (!zipReader.Entry.IsDirectory
-                    && zipReader.Entry.Key.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
+                    && zipReader.Entry.Key!.EndsWith(".log", StringComparison.InvariantCultureIgnoreCase)
                     && !zipReader.Entry.Key.Contains("tty.log", StringComparison.InvariantCultureIgnoreCase))
                 {
                     LogSize = zipReader.Entry.Size;

diff --git a/CompatBot/Utils/ColorGetter.cs b/CompatBot/Utils/ColorGetter.cs
@@ -50,7 +50,7 @@ public static SixLabors.ImageSharp.Color GetDominentColor(SixLabors.ImageSharp.I
                 return defaultColor;
 
             // TODO .net6 breaks this for linux
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (!OperatingSystem.IsWindowsVersionAtLeast(6, 1))
                 return defaultColor;
 
             var analyzer = new ColorThief();

diff --git a/CompatBot/Utils/Extensions/AzureDevOpsClientExtensions.cs b/CompatBot/Utils/Extensions/AzureDevOpsClientExtensions.cs
@@ -218,7 +218,7 @@ public static async Task<BuildInfo> GetArtifactsInfoAsync(this BuildHttpClient a
                     using var zipStream = ReaderFactory.Open(stream);
                     while (zipStream.MoveToNextEntry() && !cancellationToken.IsCancellationRequested)
                     {
-                        if (zipStream.Entry.Key.EndsWith(".7z", StringComparison.InvariantCultureIgnoreCase))
+                        if (zipStream.Entry.Key?.EndsWith(".7z", StringComparison.InvariantCultureIgnoreCase) is true)
                         {
                             result = result with {WindowsFilename = Path.GetFileName(zipStream.Entry.Key)};
                             break;
@@ -248,7 +248,7 @@ public static async Task<BuildInfo> GetArtifactsInfoAsync(this BuildHttpClient a
                     using var zipStream = ReaderFactory.Open(stream);
                     while (zipStream.MoveToNextEntry() && !cancellationToken.IsCancellationRequested)
                     {
-                        if (zipStream.Entry.Key.EndsWith(".AppImage", StringComparison.InvariantCultureIgnoreCase))
+                        if (zipStream.Entry.Key?.EndsWith(".AppImage", StringComparison.InvariantCultureIgnoreCase) is true)
                         {
                             result = result with {LinuxFilename = Path.GetFileName(zipStream.Entry.Key)};
                             break;
@@ -275,7 +275,7 @@ public static async Task<BuildInfo> GetArtifactsInfoAsync(this BuildHttpClient a
                     using var zipStream = ReaderFactory.Open(stream);
                     while (zipStream.MoveToNextEntry() && !cancellationToken.IsCancellationRequested)
                     {
-                        if (zipStream.Entry.Key.EndsWith(".dmg", StringComparison.InvariantCultureIgnoreCase))
+                        if (zipStream.Entry.Key?.EndsWith(".dmg", StringComparison.InvariantCultureIgnoreCase) is true)
                         {
                             result = result with { MacFilename = Path.GetFileName(zipStream.Entry.Key) };
                             break;