diff --git a/CHANGELIST.md b/CHANGELIST.md index 608e01bd..1985b0fc 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -66,6 +66,7 @@ - Repair incomplete SS files - Cleanup of processing code - Options helper cleanup +- Miscellaneous formatting cleanup ### 3.6.0 (2025-11-28) diff --git a/MPF.Frontend/ComboBoxItems/RedumpSystemComboBoxItem.cs b/MPF.Frontend/ComboBoxItems/RedumpSystemComboBoxItem.cs index 8374a315..c83c7a2a 100644 --- a/MPF.Frontend/ComboBoxItems/RedumpSystemComboBoxItem.cs +++ b/MPF.Frontend/ComboBoxItems/RedumpSystemComboBoxItem.cs @@ -61,7 +61,7 @@ namespace MPF.Frontend.ComboBoxItems #if NET20 // The resulting dictionary does not have ordered value lists - var mapping = new Dictionary>(); + Dictionary> mapping = []; foreach (var knownSystem in knownSystems) { var category = knownSystem.GetCategory(); diff --git a/MPF.Processors/Aaru.cs b/MPF.Processors/Aaru.cs index cc72daa2..f6b1ba50 100644 --- a/MPF.Processors/Aaru.cs +++ b/MPF.Processors/Aaru.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -#if NET35_OR_GREATER || NETCOREAPP +#if NET462_OR_GREATER || NETCOREAPP using System.Linq; #endif using System.Text; diff --git a/MPF.Processors/DiscImageCreator.cs b/MPF.Processors/DiscImageCreator.cs index d7c12f2e..fd796abe 100644 --- a/MPF.Processors/DiscImageCreator.cs +++ b/MPF.Processors/DiscImageCreator.cs @@ -378,7 +378,7 @@ namespace MPF.Processors File.Copy(xgd1SSPath, xgd1RawSSPath); } catch { } - + // Repair, clean, and validate SS before adding hash to submission info if (ProcessingTool.FixSS(xgd1SSPath, xgd1SSPath)) { @@ -443,7 +443,7 @@ namespace MPF.Processors File.Copy(xgd2SSPath, xgd2RawSSPath); } catch { } - + // Repair, clean, and validate SS before adding hash to submission info if (ProcessingTool.FixSS(xgd2SSPath, xgd2SSPath)) { @@ -834,7 +834,7 @@ namespace MPF.Processors ? OutputFileFlags.Required | OutputFileFlags.Binary | OutputFileFlags.Zippable : OutputFileFlags.Binary | OutputFileFlags.Zippable, "ss"), - new($"{outputFilename}_RawSS.bin", + new($"{outputFilename}_RawSS.bin", OutputFileFlags.Binary | OutputFileFlags.Zippable, "raw_ss"), ]; diff --git a/MPF.Processors/ProcessingTool.cs b/MPF.Processors/ProcessingTool.cs index 3b480aa0..aa0b9317 100644 --- a/MPF.Processors/ProcessingTool.cs +++ b/MPF.Processors/ProcessingTool.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -#if NET35_OR_GREATER || NETCOREAPP -using System.Linq; -#endif using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; diff --git a/MPF.Processors/Redumper.cs b/MPF.Processors/Redumper.cs index 25a30362..77ebbaee 100644 --- a/MPF.Processors/Redumper.cs +++ b/MPF.Processors/Redumper.cs @@ -324,7 +324,7 @@ namespace MPF.Processors string? pfiCrc = HashTool.GetFileHash($"{basePath}.pfi", HashType.CRC32); if (pfiCrc is not null) info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = pfiCrc.ToUpperInvariant(); - + // Only record SS hash if it is valid if (ProcessingTool.IsFixedSS($"{basePath}.ss")) {