diff --git a/CHANGELIST.md b/CHANGELIST.md index 3738dc10..9b9e6128 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -140,6 +140,7 @@ - Move ProgramSupportsMedia to MainViewModel - Rename Tools to VersionTool - Move VersionTool to root of Core +- Move InfoTool to root of Core ### 3.1.9a (2024-05-21) diff --git a/MPF.Core/Drive.cs b/MPF.Core/Drive.cs index 747a8885..471fb8a8 100644 --- a/MPF.Core/Drive.cs +++ b/MPF.Core/Drive.cs @@ -328,7 +328,7 @@ namespace MPF.Core .Replace(".", string.Empty); // Get the region, if possible - region = Utilities.InfoTool.GetPlayStationRegion(exeName); + region = InfoTool.GetPlayStationRegion(exeName); // Now that we have the EXE name, try to get the fileinfo for it string exePath = Path.Combine(Name, exeName); diff --git a/MPF.Core/Utilities/InfoTool.cs b/MPF.Core/InfoTool.cs similarity index 99% rename from MPF.Core/Utilities/InfoTool.cs rename to MPF.Core/InfoTool.cs index 89b8a1d5..cbeaa1a2 100644 --- a/MPF.Core/Utilities/InfoTool.cs +++ b/MPF.Core/InfoTool.cs @@ -6,7 +6,7 @@ using SabreTools.RedumpLib.Data; #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'. -namespace MPF.Core.Utilities +namespace MPF.Core { public static class InfoTool { diff --git a/MPF.Frontend/DumpEnvironment.cs b/MPF.Frontend/DumpEnvironment.cs index 177852b7..fd25edbf 100644 --- a/MPF.Frontend/DumpEnvironment.cs +++ b/MPF.Frontend/DumpEnvironment.cs @@ -9,7 +9,6 @@ using BinaryObjectScanner; using MPF.ExecutionContexts; using MPF.Processors; using MPF.Core; -using MPF.Core.Utilities; using Newtonsoft.Json; using SabreTools.RedumpLib; using SabreTools.RedumpLib.Data; diff --git a/MPF.Frontend/SubmissionGenerator.cs b/MPF.Frontend/SubmissionGenerator.cs index fc43d501..5fd363e6 100644 --- a/MPF.Frontend/SubmissionGenerator.cs +++ b/MPF.Frontend/SubmissionGenerator.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using BinaryObjectScanner; using MPF.Processors; using MPF.Core; -using MPF.Core.Utilities; using SabreTools.RedumpLib; using SabreTools.RedumpLib.Data; using SabreTools.RedumpLib.Web; diff --git a/MPF.Frontend/ViewModels/CreateIRDViewModel.cs b/MPF.Frontend/ViewModels/CreateIRDViewModel.cs index 81ce3e2e..a9a617b3 100644 --- a/MPF.Frontend/ViewModels/CreateIRDViewModel.cs +++ b/MPF.Frontend/ViewModels/CreateIRDViewModel.cs @@ -2,7 +2,6 @@ using System.ComponentModel; using System.IO; using MPF.Core; -using MPF.Core.Utilities; using MPF.Processors; namespace MPF.Frontend.ViewModels diff --git a/MPF.Frontend/ViewModels/DiscInformationViewModel.cs b/MPF.Frontend/ViewModels/DiscInformationViewModel.cs index 8b9018d5..1fa68504 100644 --- a/MPF.Frontend/ViewModels/DiscInformationViewModel.cs +++ b/MPF.Frontend/ViewModels/DiscInformationViewModel.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using MPF.Core; -using MPF.Core.Utilities; using MPF.Frontend.ComboBoxItems; using SabreTools.RedumpLib.Data; diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs index 4d43defb..c3b48376 100644 --- a/MPF.Frontend/ViewModels/MainViewModel.cs +++ b/MPF.Frontend/ViewModels/MainViewModel.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using BinaryObjectScanner; using MPF.Frontend.ComboBoxItems; using MPF.Core; -using MPF.Core.Utilities; using SabreTools.IO; using SabreTools.RedumpLib.Data; diff --git a/MPF.Test/Core/Converters/EnumConverterTests.cs b/MPF.Test/Core/Converters/EnumConverterTests.cs index 019273e4..e9821bc6 100644 --- a/MPF.Test/Core/Converters/EnumConverterTests.cs +++ b/MPF.Test/Core/Converters/EnumConverterTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using MPF.Core; -using MPF.Core.Utilities; using Xunit; namespace MPF.Test.Core.Converters diff --git a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs b/MPF.Test/Core/Utilities/EnumExtensionsTests.cs index 41943d29..c9d109e3 100644 --- a/MPF.Test/Core/Utilities/EnumExtensionsTests.cs +++ b/MPF.Test/Core/Utilities/EnumExtensionsTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using MPF.Core; -using MPF.Core.Utilities; using SabreTools.RedumpLib.Data; using Xunit; diff --git a/MPF.Test/Library/InfoToolTests.cs b/MPF.Test/Library/InfoToolTests.cs index d01c3946..8d0589a9 100644 --- a/MPF.Test/Library/InfoToolTests.cs +++ b/MPF.Test/Library/InfoToolTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.IO; -using MPF.Core.Utilities; +using MPF.Core; using SabreTools.RedumpLib; using SabreTools.RedumpLib.Data; using Xunit; diff --git a/MPF.UI/Windows/DiscInformationWindow.xaml.cs b/MPF.UI/Windows/DiscInformationWindow.xaml.cs index aedc4f17..fe1411c2 100644 --- a/MPF.UI/Windows/DiscInformationWindow.xaml.cs +++ b/MPF.UI/Windows/DiscInformationWindow.xaml.cs @@ -3,7 +3,6 @@ using System.Windows; using System.Windows.Controls; using MPF.Core; using MPF.Frontend.ViewModels; -using MPF.Core.Utilities; using MPF.UI.UserControls; using SabreTools.RedumpLib.Data;