diff --git a/CHANGELIST.md b/CHANGELIST.md index 662eab89..dfd58c5a 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,4 +1,4 @@ -### WIP (xxxx-xx-xx) +### 2.6 (2023-07-xx) - Update README - Add warning to login tab @@ -90,6 +90,7 @@ - Reduce pulled information for Xbox and X360 - Ensure we found the tags we're skipping - Omit pulling universal hash +- Update Nuget packages to newest stable ### 2.5 (2023-03-12) diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index 6ee23a22..0937fb4c 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -28,7 +28,7 @@ - + runtime; compile; build; native; analyzers; buildtransitive diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs index c587dfb0..80d4a030 100644 --- a/MPF.Check/Program.cs +++ b/MPF.Check/Program.cs @@ -24,7 +24,7 @@ namespace MPF.Check return; // Loop through and process options - (Options options, string path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2); + (Core.Data.Options options, string path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2); // Make new Progress objects var resultProgress = new Progress(); diff --git a/MPF.Core/MPF.Core.csproj b/MPF.Core/MPF.Core.csproj index 0d26a21c..3952f570 100644 --- a/MPF.Core/MPF.Core.csproj +++ b/MPF.Core/MPF.Core.csproj @@ -47,7 +47,7 @@ - + diff --git a/MPF.Library/DumpEnvironment.cs b/MPF.Library/DumpEnvironment.cs index 5deed256..7af5545b 100644 --- a/MPF.Library/DumpEnvironment.cs +++ b/MPF.Library/DumpEnvironment.cs @@ -50,7 +50,7 @@ namespace MPF.Library /// /// Options object representing user-defined options /// - public Options Options { get; private set; } + public Core.Data.Options Options { get; private set; } /// /// Parameters object representing what to send to the internal program @@ -93,7 +93,7 @@ namespace MPF.Library /// /// /// - public DumpEnvironment(Options options, + public DumpEnvironment(Core.Data.Options options, string outputPath, Drive drive, RedumpSystem? system, diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 2670935d..3c2b8c8a 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -40,7 +40,7 @@ namespace MPF.Library Drive drive, RedumpSystem? system, MediaType? mediaType, - Options options, + Core.Data.Options options, BaseParameters parameters, IProgress resultProgress = null, IProgress protectionProgress = null) @@ -466,7 +466,7 @@ namespace MPF.Library /// Options object that determines what to scan /// Optional progress callback /// Detected copy protection(s) if possible, null on error - private static async Task<(string, Dictionary>)> GetCopyProtection(Drive drive, Options options, IProgress progress = null) + private static async Task<(string, Dictionary>)> GetCopyProtection(Drive drive, Core.Data.Options options, IProgress progress = null) { if (options.ScanForProtection && drive != null) { @@ -646,7 +646,7 @@ namespace MPF.Library /// Information object that should contain normalized values /// Options object representing user-defined options /// List of strings representing each line of an output file, null on error - public static (List, string) FormatOutputData(SubmissionInfo info, Options options) + public static (List, string) FormatOutputData(SubmissionInfo info, Core.Data.Options options) { // Check to see if the inputs are valid if (info == null) @@ -2217,9 +2217,9 @@ namespace MPF.Library /// Existing SubmissionInfo object to fill /// Optional result progress callback #if NET48 || NETSTANDARD2_1 - private static bool FillFromRedump(Options options, SubmissionInfo info, IProgress resultProgress = null) + private static bool FillFromRedump(Core.Data.Options options, SubmissionInfo info, IProgress resultProgress = null) #else - private async static Task FillFromRedump(Options options, SubmissionInfo info, IProgress resultProgress = null) + private async static Task FillFromRedump(Core.Data.Options options, SubmissionInfo info, IProgress resultProgress = null) #endif { // Set the current dumper based on username diff --git a/MPF.Library/MPF.Library.csproj b/MPF.Library/MPF.Library.csproj index 8f2b40dd..d1762712 100644 --- a/MPF.Library/MPF.Library.csproj +++ b/MPF.Library/MPF.Library.csproj @@ -28,10 +28,10 @@ - + runtime; compile; build; native; analyzers; buildtransitive - + diff --git a/MPF.Library/Protection.cs b/MPF.Library/Protection.cs index e2772a1d..9d07748b 100644 --- a/MPF.Library/Protection.cs +++ b/MPF.Library/Protection.cs @@ -4,9 +4,8 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using BinaryObjectScanner.Protection; using BurnOutSharp; -using BurnOutSharp.ProtectionType; -using MPF.Core.Data; using psxt001z; namespace MPF.Library @@ -20,7 +19,7 @@ namespace MPF.Library /// Options object that determines what to scan /// Optional progress callback /// Set of all detected copy protections with an optional error string - public static async Task<(Dictionary>, string)> RunProtectionScanOnPath(string path, Options options, IProgress progress = null) + public static async Task<(Dictionary>, string)> RunProtectionScanOnPath(string path, Core.Data.Options options, IProgress progress = null) { try { @@ -29,6 +28,7 @@ namespace MPF.Library var scanner = new Scanner( options.ScanArchivesForProtection, scanContents: true, // Hardcoded value to avoid issues + scanGameEngines: false, // Hardcoded value to avoid issues options.ScanPackersForProtection, scanPaths: true, // Hardcoded value to avoid issues options.IncludeDebugProtectionInformation, diff --git a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs b/MPF.Test/Core/Utilities/EnumExtensionsTests.cs index 4ed78ef3..dbbe865d 100644 --- a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs +++ b/MPF.Test/Core/Utilities/EnumExtensionsTests.cs @@ -59,6 +59,7 @@ namespace MPF.Test.Core.Utilities RedumpSystem.SonyPlayStation2, RedumpSystem.SonyPlayStation3, RedumpSystem.SonyPlayStation4, + RedumpSystem.SonyPlayStationPortable, }; /// diff --git a/MPF.Test/MPF.Test.csproj b/MPF.Test/MPF.Test.csproj index f3ab83f2..448c85fb 100644 --- a/MPF.Test/MPF.Test.csproj +++ b/MPF.Test/MPF.Test.csproj @@ -34,21 +34,21 @@ - - - - + + + + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj index 57346631..5849826a 100644 --- a/MPF/MPF.csproj +++ b/MPF/MPF.csproj @@ -27,7 +27,7 @@ - + runtime; compile; build; native; analyzers; buildtransitive diff --git a/MPF/ViewModels/MainViewModel.cs b/MPF/ViewModels/MainViewModel.cs index ab6a2687..f7ab4828 100644 --- a/MPF/ViewModels/MainViewModel.cs +++ b/MPF/ViewModels/MainViewModel.cs @@ -527,7 +527,7 @@ namespace MPF.UI.ViewModels { if (optionsWindow?.OptionsViewModel.SavedSettings == true) { - App.Options = optionsWindow.OptionsViewModel.Options.Clone() as Options; + App.Options = optionsWindow.OptionsViewModel.Options.Clone() as MPF.Core.Data.Options; InitializeUIValues(removeEventHandlers: true, rescanDrives: true); } } diff --git a/RedumpLib/RedumpLib.csproj b/RedumpLib/RedumpLib.csproj index 27d5222b..a78e0667 100644 --- a/RedumpLib/RedumpLib.csproj +++ b/RedumpLib/RedumpLib.csproj @@ -7,7 +7,7 @@ - +