Bump version

* Set UDF CD threshold at 800MB

* Condense DriveFormat checks

.github/ISSUE_TEMPLATE/feature-request.md

@@ -10,7 +10,6 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the feature already exists.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET 6.0 has known limitations, so make sure that what you're asking for isn't already in another build.
 - Check [previous issues](https://github.com/SabreTools/MPF/issues) to see if any of those are related to what you're about to ask for.
 
 If none of those apply, then continue...

.github/ISSUE_TEMPLATE/informational.md

@@ -10,7 +10,6 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the feature already exists.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET 6.0 has known limitations, so make sure that what you're giving information on isn't already in another build.
 - Check [previous issues](https://github.com/SabreTools/MPF/issues) to see if any of those are related to what you're about to ask for.
 
 If none of those apply, then continue...

.github/ISSUE_TEMPLATE/issue-report.md

@@ -10,7 +10,6 @@ assignees: mnadareski
 **Before You Submit**
 - Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/mpf/build/artifacts) to see if the issue has already been addressed.
 - Is it copy protection related? If so, report the issue [here](https://github.com/mnadareski/BurnOutSharp/issues) instead.
-- .NET 6.0 has known issues, please try using another build to reproduce the error
 - Check multiple discs to help narrow down the issue
 - Check the Options to see if changing any of those affects your issue.
 
@@ -27,6 +26,7 @@ What runtime version are you using?
 
 - [ ] .NET Framework 4.8 running on (Operating System)
 - [ ] .NET 6.0 running on (Operating System)
+- [ ] .NET 7.0 running on (Operating System)
 
 **Describe the issue**
 A clear and concise description of what the bug is.

.vscode/tasks.json

@@ -3,22 +3,11 @@
     "tasks": [
         {
             "label": "build",
-            "command": "msbuild",
+            "command": "dotnet",
             "type": "process",
             "args": [
+                "build",
                 "${workspaceFolder}/MPF.sln",
-                "-property:RuntimeIdentifiers=win7-x64"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "msbuild",
-            "type": "process",
-            "args": [
-                "${workspaceFolder}/MPF/MPF.csproj",
-                "-target:Publish",
-                "-property:RuntimeIdentifiers=win7-x64"
             ],
             "problemMatcher": "$msCompile"
         },

CHANGELIST.md

@@ -1,3 +1,201 @@
+### 2.7.4 (2023-10-31)
+
+- Move Hash enum and simplify
+- Add other non-cryptographic hashes
+- Avoid unncessary allocation in hashing
+- Make Hasher more consistent
+- Move all hashing to Hasher
+- Separate out static hashing
+- Remove unncessary summary
+- Version-gate new switch statement
+- Ignore empty protection results
+- Remove and Sort Usings
+- Update Redumper to build 244
+- Enable Bluray dumping with Redumper
+- Add Bluray layerbreak support for Redumper
+- Remove now-obsolete notes
+- Compile most regex statements
+- Handle a couple of messages
+- Remove .manufacturer for Bluray
+- Fix typo that disables DIC during media check (Deterous)
+- Fix build
+- Remove duplicate check
+- Add PIC output for Redumper
+- Update Redumper to build 246
+- Enable HD-DVD for Redumper in UI
+- Attempt to fix window owner issue
+
+### 2.7.3 (2023-10-26)
+
+- Split InfoTool into 2 classes
+- Add path variants for PlayStation info
+- Convert Drive to use paths internally
+- Create skeleton for first-run
+- Show options window on first run
+- Fix drive letter issue in UI
+- Add first-run Options title, fix saving bug
+- Fix multiple handler invocation
+- Create method for applying theme
+- Fix drive letter check
+- Simply theme application
+- Add framework for deleteable files
+- Add deleteable file lists for Redumper and DIC
+- Add optional file deletion
+- Rearrange OptionsWindow to be easier to navigate
+- Fix up DumpEnvironment a bit
+- Add filename suffix setting (nw)
+- Wire through filename suffix
+- Expose suffix setting
+- Set UDF CD threshold at 800MB (Deterous)
+- Update package versions
+- Attempt to parse out PS5 params.json
+- Fix CRC32 hashing
+- Update XUnit packages
+- Update to BurnOutSharp 2.9.0
+- Update to MMI 3.0.0-preview.4
+- Fix two small nullability issues
+- Use Array.Empty in hasher
+- Always use relative path internally (Deterous)
+
+### 2.7.2 (2023-10-17)
+
+- Fix options loading for Check
+- Cleanup and gated code
+- Gate some switch expressions
+- Suppress some unnecessary messages
+- Disable dumping button when Redumper selected with unsupported media type (Deterous)
+- Improve check for which program supports which media (Deterous)
+- Remove code for getting Universal Hash from DIC logs (Deterous)
+- Fix Redumper retry count not showing
+- Enable parameters checkbox by default
+- Update Redumper to build 230
+- Fix GetPVD in dic (fuzz6001)
+- Get SecuROM data from Redumper
+- Clean up issue templates
+- Support Redumper 231 outputs
+
+### 2.7.1 (2023-10-11)
+
+- Add pull-all flag for Check
+- Fix errant version detection issue
+- Allow user-supplied information in Check
+- Add BE read flag for Redumper
+- Add generic drive flag for Redumper
+- Handle numeric disc titles as issue numbers
+- Unify handling of enable/disable events
+- Enable nullability in Check
+- Remove all but .NET 6 for AppVeyor packaging
+- Place message boxes at center of main window (Deterous)
+- Enable nullability in MPF
+- Enable nullability in MPF.UI.Core
+- Enable nullability in MPF.Test
+- Handle some suggested changes
+- Var-ify many instances
+- Version-gate some newer syntax
+- Fix Check always showing Help text
+- Version-gate some more newer syntax
+- Enable path browse button by default
+- Remove unnecessary namespacing
+
+### 2.7.0 (2023-10-11)
+
+- Attempt to replace NRT
+- Try alternate archive naming
+- Publish, but don't package, release builds
+- Add note about git being required
+- Try out using version number in AppVeyor
+- Job number not build ID
+- Fix errant space in variable name
+- Build number not job number
+- Use System.IO.Hashing for CRC32
+- Don't reverse the CRC32 output
+- Add submission info preamble
+- Fix missing comma
+- Remove IMAPI2 with no substitution
+- Remove framework exceptions
+- Slight reorganization of code
+- Update README with support information
+- Remove msbuild-specific AppVeyor items
+- Be trickier when it comes to type from size
+- Fix "detected" message
+- Be smarter about media type based on system
+- Consolidate into MPF.Core
+- Fix failing tests
+- Remove debug symbols in release builds (Deterous)
+- Allow nullability for modern .NET
+- Fix failing tests
+- Remove unnecessary include
+- Move element items to Core
+- Move LogLevel enumeration
+- Split logging code a bit more
+- Split info window code a bit more
+- Clarify build instructions in README (Deterous)
+- Split options window code a bit more
+- Use binding for more disc info textboxes
+- Handle Redump password changing better
+- Refine options window bindings
+- Refine options window bindings further
+- Refine info window bindings further
+- Move decoupled view models
+- Fix log output
+- Start migrating MainViewModel
+- Perform most of MainViewModel changes
+- Small updtes to MainViewModel
+- Remove MainWindow from MainViewModel
+- Use callback for logging, fix Options window
+- Remove WinForms from MainViewModel
+- Remove some message boxes from MainViewModel
+- Remove more Windows from MainViewModel
+- Fix null reference exception in disc type
+- Detected type and selected type are different
+- Remove message boxes from MainViewModel
+- Move MainViewModel to Core
+- Remove LogOutputViewModel
+- Consolidate some constants
+- Fix media type ordering
+- Fix dumping button not enabling
+- Recentralize some Check functionality
+- Fix media combobox not updating (Deterous)
+
+### 2.6.6 (2023-10-04)
+
+- Update Nuget packages
+- Update to MMI 3.0.0-preview.2
+- Remove errant character from script
+- Add placeholders for release builds
+- Fully sync AppVeyor build with script
+- Stop compiling Chime finally
+- Address some warnings and infos
+- Add setting for pulling comment/contents
+- Move to config.json
+- Omit track 0.2 and 00.2 from hash search
+- Tweak README again
+- Fix redumper EDC detection output
+- Fix XGD4 PIC reading
+- Ensure popups are topmost
+- Try out more UI functionality
+- Skip system detection on inactive drives
+- Fix path tests
+- Clean up csproj files
+- Update redumper to build 221
+- Ensure multisession info is populated
+- Be clearer with protection outputs
+
+### 2.6.5 (2023-09-27)
+
+- Normalize Redumper CSS output
+- Update redumper to build 219
+- Add .NET 7 to build scripts
+- Disable subdump download in AppVeyor
+- Normalize publish scripts
+- Update AppVeyor to match scripts
+- Add release publish scripts
+- Handle invalid characters when changing program
+- Fix options not saving on update
+- Combine build scripts
+- Force information window to top
+- Reset debug option to false
+
 ### 2.6.4 (2023-09-25)
 
 - Add CD Projekt ID field

MPF.Check/MPF.Check.csproj

@@ -2,23 +2,17 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <Title>MPF Check</Title>
-    <AssemblyName>MPF.Check</AssemblyName>
     <Description>Validator for various dumping programs</Description>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
+    <VersionPrefix>2.7.4</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
+  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,18 +21,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.9.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>

MPF.Check/Program.cs

@@ -1,10 +1,9 @@
 using System;
 using System.IO;
-using BurnOutSharp;
-using MPF.Core.Converters;
+using BinaryObjectScanner;
+using MPF.Core;
 using MPF.Core.Data;
 using MPF.Core.Utilities;
-using MPF.Library;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
 
@@ -15,16 +14,24 @@ namespace MPF.Check
         public static void Main(string[] args)
         {
             // Try processing the standalone arguments
-            if (ProcessStandaloneArguments(args))
+            bool? standaloneProcessed = OptionsLoader.ProcessStandaloneArguments(args);
+            if (standaloneProcessed != false)
+            {
+                if (standaloneProcessed == null)
+                    DisplayHelp();
                 return;
+            }
 
             // Try processing the common arguments
-            (bool success, MediaType mediaType, RedumpSystem? knownSystem) = ProcessCommonArguments(args);
+            (bool success, MediaType mediaType, RedumpSystem? knownSystem, var error) = OptionsLoader.ProcessCommonArguments(args);
             if (!success)
+            {
+                DisplayHelp(error);
                 return;
+            }
 
             // Loop through and process options
-            (Core.Data.Options options, string path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2);
+            (var options, var seedInfo, var path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2);
             if (options.InternalProgram == InternalProgram.NONE)
             {
                 DisplayHelp("A program name needs to be provided");
@@ -33,15 +40,15 @@ namespace MPF.Check
 
             // Make new Progress objects
             var resultProgress = new Progress<Result>();
-            resultProgress.ProgressChanged += ProgressUpdated;
+            resultProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
             var protectionProgress = new Progress<ProtectionProgress>();
-            protectionProgress.ProgressChanged += ProgressUpdated;
+            protectionProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
 
             // Validate the supplied credentials
 #if NET48
             (bool? _, string message) = RedumpWebClient.ValidateCredentials(options?.RedumpUsername, options?.RedumpPassword);
 #else
-            (bool? _, string message) = RedumpHttpClient.ValidateCredentials(options?.RedumpUsername, options?.RedumpPassword).ConfigureAwait(false).GetAwaiter().GetResult();
+            (bool? _, string? message) = RedumpHttpClient.ValidateCredentials(options.RedumpUsername ?? string.Empty, options.RedumpPassword ?? string.Empty).ConfigureAwait(false).GetAwaiter().GetResult();
 #endif
             if (!string.IsNullOrWhiteSpace(message))
                 Console.WriteLine(message);
@@ -60,7 +67,11 @@ namespace MPF.Check
                 string filepath = Path.GetFullPath(args[i].Trim('"'));
 
                 // Now populate an environment
+#if NET48
                 Drive drive = null;
+#else
+                Drive? drive = null;
+#endif
                 if (!string.IsNullOrWhiteSpace(path))
                     drive = Drive.Create(null, path);
 
@@ -76,7 +87,11 @@ namespace MPF.Check
         /// Display help for MPF.Check
         /// </summary>
         /// <param name="error">Error string to prefix the help text with</param>
+#if NET48
         private static void DisplayHelp(string error = null)
+#else
+        private static void DisplayHelp(string? error = null)
+#endif
         {
             if (error != null)
                 Console.WriteLine(error);
@@ -99,101 +114,5 @@ namespace MPF.Check
             }
             Console.WriteLine();
         }
-
-        /// <summary>
-        /// Process common arguments for all functionality
-        /// </summary>
-        /// <returns>True if all arguments pass, false otherwise</returns>
-        private static (bool, MediaType, RedumpSystem?) ProcessCommonArguments(string[] args)
-        {
-            // All other use requires at least 3 arguments
-            if (args.Length < 3)
-            {
-                DisplayHelp("Invalid number of arguments");
-                return (false, MediaType.NONE, null);
-            }
-
-            // Check the MediaType
-            var mediaType = EnumConverter.ToMediaType(args[0].Trim('"'));
-            if (mediaType == MediaType.NONE)
-            {
-                DisplayHelp($"{args[0]} is not a recognized media type");
-                return (false, MediaType.NONE, null);
-            }
-
-            // Check the RedumpSystem
-            var knownSystem = Extensions.ToRedumpSystem(args[1].Trim('"'));
-            if (knownSystem == null)
-            {
-                DisplayHelp($"{args[1]} is not a recognized system");
-                return (false, MediaType.NONE, null);
-            }
-
-            return (true, mediaType, knownSystem);
-        }
-
-        /// <summary>
-        /// Process any standalone arguments for the program
-        /// </summary>
-        /// <returns>True if one of the arguments was processed, false otherwise</returns>
-        private static bool ProcessStandaloneArguments(string[] args)
-        {
-            // Help options
-            if (args.Length == 0 || args[0] == "-h" || args[0] == "-?")
-            {
-                DisplayHelp();
-                return true;
-            }
-
-            // List options
-            if (args[0] == "-lm" || args[0] == "--listmedia")
-            {
-                Console.WriteLine("Supported Media Types:");
-                foreach (string mediaType in Extensions.ListMediaTypes())
-                {
-                    Console.WriteLine(mediaType);
-                }
-                Console.ReadLine();
-                return true;
-            }
-            else if (args[0] == "-lp" || args[0] == "--listprograms")
-            {
-                Console.WriteLine("Supported Programs:");
-                foreach (string program in EnumExtensions.ListPrograms())
-                {
-                    Console.WriteLine(program);
-                }
-                Console.ReadLine();
-                return true;
-            }
-            else if (args[0] == "-ls" || args[0] == "--listsystems")
-            {
-                Console.WriteLine("Supported Systems:");
-                foreach (string system in Extensions.ListSystems())
-                {
-                    Console.WriteLine(system);
-                }
-                Console.ReadLine();
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Simple process counter to write to console
-        /// </summary>
-        private static void ProgressUpdated(object sender, Result value)
-        {
-            Console.WriteLine(value.Message);
-        }
-
-        /// <summary>
-        /// Simple process counter to write to console
-        /// </summary>
-        private static void ProgressUpdated(object sender, ProtectionProgress value)
-        {
-            Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}");
-        }
     }
 }

MPF.Core/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// Anything marked as internal can be used by the test methods
-[assembly: InternalsVisibleTo("MPF.Test")]

MPF.Core/ConsoleLogger.cs

@@ -0,0 +1,33 @@
+using System;
+using BinaryObjectScanner;
+using MPF.Core.Data;
+
+namespace MPF.Core
+{
+    public static class ConsoleLogger
+    {
+        /// <summary>
+        /// Simple process counter to write to console
+        /// </summary>
+#if NET48
+        public static void ProgressUpdated(object sender, Result value)
+#else
+        public static void ProgressUpdated(object? sender, Result value)
+#endif
+        {
+            Console.WriteLine(value.Message);
+        }
+
+        /// <summary>
+        /// Simple process counter to write to console
+        /// </summary>
+#if NET48
+        public static void ProgressUpdated(object sender, ProtectionProgress value)
+#else
+        public static void ProgressUpdated(object? sender, ProtectionProgress value)
+#endif
+        {
+            Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}");
+        }
+    }
+}

MPF.Core/Converters/EnumConverter.cs

@@ -2,9 +2,6 @@
 using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
-#if NETFRAMEWORK
-using IMAPI2;
-#endif
 using MPF.Core.Data;
 using SabreTools.RedumpLib.Data;
 
@@ -34,47 +31,6 @@ namespace MPF.Core.Converters
             }
         }
 
-#if NETFRAMEWORK
-        /// <summary>
-        /// Convert IMAPI physical media type to a MediaType
-        /// </summary>
-        /// <param name="type">IMAPI_MEDIA_PHYSICAL_TYPE value to check</param>
-        /// <returns>MediaType if possible, null on error</returns>
-        public static MediaType? IMAPIToMediaType(this IMAPI_MEDIA_PHYSICAL_TYPE type)
-        {
-            switch (type)
-            {
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_UNKNOWN:
-                    return MediaType.NONE;
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDROM:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDR:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDRW:
-                    return MediaType.CDROM;
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDROM:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDRAM:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSR:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSRW:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSR_DUALLAYER:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHR:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHRW:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHR_DUALLAYER:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DISK:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSRW_DUALLAYER:
-                    return MediaType.DVD;
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDROM:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDR:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDRAM:
-                    return MediaType.HDDVD;
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDROM:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDR:
-                case IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDRE:
-                    return MediaType.BluRay;
-                default:
-                    return null;
-            }
-        }
-#endif
-
         #endregion
 
         #region Convert to Long Name
@@ -82,7 +38,11 @@ namespace MPF.Core.Converters
         /// <summary>
         /// Long name method cache
         /// </summary>
+#if NET48
         private static readonly ConcurrentDictionary<Type, MethodInfo> LongNameMethods = new ConcurrentDictionary<Type, MethodInfo>();
+#else
+        private static readonly ConcurrentDictionary<Type, MethodInfo?> LongNameMethods = new ConcurrentDictionary<Type, MethodInfo?>();
+#endif
 
         /// <summary>
         /// Get the string representation of a generic enumerable value
@@ -93,12 +53,12 @@ namespace MPF.Core.Converters
         {
             try
             {
-                var sourceType = value?.GetType();
+                var sourceType = value.GetType();
                 sourceType = Nullable.GetUnderlyingType(sourceType) ?? sourceType;
 
-                if (!LongNameMethods.TryGetValue(sourceType, out MethodInfo method))
+                if (!LongNameMethods.TryGetValue(sourceType, out var method))
                 {
-                    method = typeof(SabreTools.RedumpLib.Data.Extensions).GetMethod("LongName", new[] { typeof(Nullable<>).MakeGenericType(sourceType) });
+                    method = typeof(Extensions).GetMethod("LongName", new[] { typeof(Nullable<>).MakeGenericType(sourceType) });
                     if (method == null)
                         method = typeof(EnumConverter).GetMethod("LongName", new[] { typeof(Nullable<>).MakeGenericType(sourceType) });
 
@@ -106,7 +66,7 @@ namespace MPF.Core.Converters
                 }
 
                 if (method != null)
-                    return method.Invoke(null, new[] { value }) as string;
+                    return method.Invoke(null, new[] { value }) as string ?? string.Empty;
                 else
                     return string.Empty;
             }
@@ -133,7 +93,7 @@ namespace MPF.Core.Converters
                 case InternalProgram.DiscImageCreator:
                     return "DiscImageCreator";
                 case InternalProgram.Redumper:
-                    return "redumper";
+                    return "Redumper";
 
                 #endregion
 
@@ -156,7 +116,7 @@ namespace MPF.Core.Converters
             }
         }
 
-        #endregion
+#endregion
 
         #region Convert From String
 
@@ -165,9 +125,13 @@ namespace MPF.Core.Converters
         /// </summary>
         /// <param name="internalProgram">String value to convert</param>
         /// <returns>InternalProgram represented by the string, if possible</returns>
+#if NET48
         public static InternalProgram ToInternalProgram(string internalProgram)
+#else
+        public static InternalProgram ToInternalProgram(string? internalProgram)
+#endif
         {
-            switch (internalProgram.ToLowerInvariant())
+            switch (internalProgram?.ToLowerInvariant())
             {
                 // Dumping support
                 case "aaru":

MPF.Core/Data/Constants.cs

@@ -16,12 +16,12 @@ namespace MPF.Core.Data
         // Byte arrays for signatures
         public static readonly byte[] SaturnSectorZeroStart = new byte[] { 0x53, 0x45, 0x47, 0x41, 0x20, 0x53, 0x45, 0x47, 0x41, 0x53, 0x41, 0x54, 0x55, 0x52, 0x4E, 0x20 };
 
-        // Private lists of known drive speed ranges
-        private static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
-        private static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
-        private static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
-        private static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
-        private static IReadOnlyList<int> Unknown { get; } = new List<int> { 1 };
+        // Lists of known drive speed ranges
+        public static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
+        public static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
+        public static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
+        public static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
+        public static IReadOnlyList<int> Unknown { get; } = new List<int> { 1 };
 
         /// <summary>
         /// Get list of all drive speeds for a given MediaType

MPF.Core/Data/Drive.cs

@@ -5,11 +5,7 @@ using System.Linq;
 using Microsoft.Management.Infrastructure;
 using Microsoft.Management.Infrastructure.Generic;
 using MPF.Core.Converters;
-using MPF.Core.Utilities;
 using SabreTools.RedumpLib.Data;
-#if NETFRAMEWORK
-using IMAPI2;
-#endif
 
 namespace MPF.Core.Data
 {
@@ -17,7 +13,6 @@ namespace MPF.Core.Data
     /// Represents information for a single drive
     /// </summary>
     /// <remarks>
-    /// TODO: This needs to be less Windows-centric. Devices do not always have a single letter that can be used.
     /// TODO: Can the Aaru models be used instead of the ones I've created here?
     /// </remarks>
     public class Drive
@@ -32,12 +27,20 @@ namespace MPF.Core.Data
         /// <summary>
         /// Drive partition format
         /// </summary>
+#if NET48
         public string DriveFormat { get; private set; } = null;
+#else
+        public string? DriveFormat { get; private set; } = null;
+#endif
 
         /// <summary>
         /// Windows drive path
         /// </summary>
+#if NET48
         public string Name { get; private set; } = null;
+#else
+        public string? Name { get; private set; } = null;
+#endif
 
         /// <summary>
         /// Represents if Windows has marked the drive as active
@@ -53,7 +56,11 @@ namespace MPF.Core.Data
         /// Media label as read by Windows
         /// </summary>
         /// <remarks>The try/catch is needed because Windows will throw an exception if the drive is not marked as active</remarks>
+#if NET48
         public string VolumeLabel { get; private set; } = null;
+#else
+        public string? VolumeLabel { get; private set; } = null;
+#endif
 
         #endregion
 
@@ -62,7 +69,11 @@ namespace MPF.Core.Data
         /// <summary>
         /// Media label as read by Windows, formatted to avoid odd outputs
         /// </summary>
+#if NET48
         public string FormattedVolumeLabel
+#else
+        public string? FormattedVolumeLabel
+#endif
         {
             get
             {
@@ -83,9 +94,10 @@ namespace MPF.Core.Data
         }
 
         /// <summary>
-        /// Windows drive letter
+        /// Read-only access to the drive letter
         /// </summary>
-        public char Letter => this.Name == null || this.Name.Length == 0 ? '\0' : this.Name[0];
+        /// <remarks>Should only be used in UI applications</remarks>
+        public char? Letter => this.Name?[0] ?? '\0';
 
         #endregion
 
@@ -99,7 +111,11 @@ namespace MPF.Core.Data
         /// </summary>
         /// <param name="driveType">InternalDriveType value representing the drive type</param>
         /// <param name="devicePath">Path to the device according to the local machine</param>
+#if NET48
         public static Drive Create(InternalDriveType? driveType, string devicePath)
+#else
+        public static Drive? Create(InternalDriveType? driveType, string devicePath)
+#endif
         {
             // Create a new, empty drive object
             var drive = new Drive()
@@ -113,7 +129,11 @@ namespace MPF.Core.Data
 
             // Sanitize a Windows-formatted long device path
             if (devicePath.StartsWith("\\\\.\\"))
+#if NET48
                 devicePath = devicePath.Substring("\\\\.\\".Length);
+#else
+                devicePath = devicePath["\\\\.\\".Length..];
+#endif
 
             // Create and validate the drive info object
             var driveInfo = new DriveInfo(devicePath);
@@ -130,7 +150,11 @@ namespace MPF.Core.Data
         /// Populate all fields from a DriveInfo object
         /// </summary>
         /// <param name="driveInfo">DriveInfo object to populate from</param>
+#if NET48
         private void PopulateFromDriveInfo(DriveInfo driveInfo)
+#else
+        private void PopulateFromDriveInfo(DriveInfo? driveInfo)
+#endif
         {
             // If we have an invalid DriveInfo, just return
             if (driveInfo == null || driveInfo == default)
@@ -163,91 +187,90 @@ namespace MPF.Core.Data
         public static List<Drive> CreateListOfDrives(bool ignoreFixedDrives)
         {
             var drives = GetDriveList(ignoreFixedDrives);
-            drives = drives?.OrderBy(i => i.Letter)?.ToList();
+            drives = drives.OrderBy(i => i == null ? "\0" : i.Name).ToList();
             return drives;
         }
 
         /// <summary>
         /// Get the current media type from drive letter
         /// </summary>
+        /// <param name="system"></param>
         /// <returns></returns>
-        public (MediaType?, string) GetMediaType()
+#if NET48
+        public (MediaType?, string) GetMediaType(RedumpSystem? system)
+#else
+        public (MediaType?, string?) GetMediaType(RedumpSystem? system)
+#endif
         {
             // Take care of the non-optical stuff first
-            // TODO: See if any of these can be more granular, like Optical is
-            if (this.InternalDriveType == Data.InternalDriveType.Floppy)
-                return (MediaType.FloppyDisk, null);
-            else if (this.InternalDriveType == Data.InternalDriveType.HardDisk)
-                return (MediaType.HardDisk, null);
-            else if (this.InternalDriveType == Data.InternalDriveType.Removable)
-                return (MediaType.FlashDrive, null);
-#if NET6_0_OR_GREATER
-            else
-                return GetMediaTypeFromSize();
-#endif
-
-            // Get the current drive information
-            string deviceId = null;
-            bool loaded = false;
-            try
+            switch (this.InternalDriveType)
             {
-                // Get the device ID first
-                CimSession session = CimSession.Create(null);
-                var collection = session.QueryInstances("root\\CIMV2", "WQL", $"SELECT * FROM Win32_CDROMDrive WHERE Id = '{this.Letter}:\'");
-
-                foreach (CimInstance instance in collection)
-                {
-                    CimKeyedCollection<CimProperty> properties = instance.CimInstanceProperties;
-                    deviceId = (string)properties["DeviceID"]?.Value;
-                    loaded = (bool)properties["MediaLoaded"]?.Value;
-                }
-
-                // If we got no valid device, we don't care and just return
-                if (deviceId == null)
-                    return (null, "Device could not be found");
-                else if (!loaded)
-                    return (null, "Device is not reporting media loaded");
-
-#if NETFRAMEWORK
-
-                MsftDiscMaster2 discMaster = new MsftDiscMaster2();
-                deviceId = deviceId.ToLower().Replace('\\', '#').Replace('/', '#');
-                string id = null;
-                foreach (var disc in discMaster)
-                {
-                    if (disc.ToString().Contains(deviceId))
-                        id = disc.ToString();
-                }
-
-                // If we couldn't find the drive, we don't care and return
-                if (id == null)
-                    return (null, "Device ID could not be found");
-
-                // Create the required objects for reading from the drive
-                MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
-                recorder.InitializeDiscRecorder(id);
-                MsftDiscFormat2Data dataWriter = new MsftDiscFormat2Data();
-
-                // If the recorder is not supported, just return
-                if (!dataWriter.IsRecorderSupported(recorder))
-                    return (null, "IMAPI2 recorder not supported");
-
-                // Otherwise, set the recorder to get information from
-                dataWriter.Recorder = recorder;
-
-                var media = dataWriter.CurrentPhysicalMediaType;
-                return (media.IMAPIToMediaType(), null);
-
-#else
-
-                return (null, "IMAPI2 recorder not supported");
-
-#endif
+                case Data.InternalDriveType.Floppy:
+                    return (MediaType.FloppyDisk, null);
+                case Data.InternalDriveType.HardDisk:
+                    return (MediaType.HardDisk, null);
+                case Data.InternalDriveType.Removable:
+                    return (MediaType.FlashDrive, null);
             }
-            catch (Exception ex)
+
+            // Some systems should default to certain media types
+            switch (system)
             {
-                return (null, ex.Message);
+                // CD
+                case RedumpSystem.Panasonic3DOInteractiveMultiplayer:
+                case RedumpSystem.PhilipsCDi:
+                case RedumpSystem.SegaDreamcast:
+                case RedumpSystem.SegaSaturn:
+                case RedumpSystem.SonyPlayStation:
+                case RedumpSystem.VideoCD:
+                    return (MediaType.CDROM, null);
+
+                // DVD
+                case RedumpSystem.DVDAudio:
+                case RedumpSystem.DVDVideo:
+                case RedumpSystem.MicrosoftXbox:
+                case RedumpSystem.MicrosoftXbox360:
+                    return (MediaType.DVD, null);
+
+                // HD-DVD
+                case RedumpSystem.HDDVDVideo:
+                    return (MediaType.HDDVD, null);
+
+                // Blu-ray
+                case RedumpSystem.BDVideo:
+                case RedumpSystem.MicrosoftXboxOne:
+                case RedumpSystem.MicrosoftXboxSeriesXS:
+                case RedumpSystem.SonyPlayStation3:
+                case RedumpSystem.SonyPlayStation4:
+                case RedumpSystem.SonyPlayStation5:
+                    return (MediaType.BluRay, null);
+
+                // GameCube
+                case RedumpSystem.NintendoGameCube:
+                    return (MediaType.NintendoGameCubeGameDisc, null);
+
+                // Wii
+                case RedumpSystem.NintendoWii:
+                    return (MediaType.NintendoWiiOpticalDisc, null);
+
+                // WiiU
+                case RedumpSystem.NintendoWiiU:
+                    return (MediaType.NintendoWiiUOpticalDisc, null);
+
+                // PSP
+                case RedumpSystem.SonyPlayStationPortable:
+                    return (MediaType.UMD, null);
             }
+
+            // Handle optical media by size and filesystem
+            if (this.TotalSize >= 0 && this.TotalSize <= 800_000_000 && (this.DriveFormat == "CDFS" || this.DriveFormat == "UDF"))
+                return (MediaType.CDROM, null);
+            else if (this.TotalSize > 800_000_000 && this.TotalSize <= 8_540_000_000 && (this.DriveFormat == "CDFS" || this.DriveFormat == "UDF"))
+                return (MediaType.DVD, null);
+            else if (this.TotalSize > 8_540_000_000)
+                return (MediaType.BluRay, null);
+
+            return (null, "Could not determine media type!");
         }
 
         /// <summary>
@@ -257,14 +280,11 @@ namespace MPF.Core.Data
         /// <returns></returns>
         public RedumpSystem? GetRedumpSystem(RedumpSystem? defaultValue)
         {
-            string drivePath = $"{this.Letter}:\\";
-
             // If we can't read the media in that drive, we can't do anything
-            if (!Directory.Exists(drivePath))
+            if (!Directory.Exists(this.Name))
                 return defaultValue;
 
             // We're going to assume for floppies, HDDs, and removable drives
-            // TODO: Try to be smarter about this
             if (this.InternalDriveType != Data.InternalDriveType.Optical)
                 return RedumpSystem.IBMPCcompatible;
 
@@ -279,7 +299,7 @@ namespace MPF.Core.Data
             // Bandai Playdia Quick Interactive System
             try
             {
-                List<string> files = Directory.EnumerateFiles(drivePath, "*", SearchOption.TopDirectoryOnly).ToList();
+                List<string> files = Directory.EnumerateFiles(this.Name, "*", SearchOption.TopDirectoryOnly).ToList();
 
                 if (files.Any(f => f.EndsWith(".AJS", StringComparison.OrdinalIgnoreCase))
                     && files.Any(f => f.EndsWith(".GLB", StringComparison.OrdinalIgnoreCase)))
@@ -290,7 +310,7 @@ namespace MPF.Core.Data
             catch { }
 
             // Mattel Fisher-Price iXL
-            if (File.Exists(Path.Combine(drivePath, "iXL", "iXLUpdater.exe")))
+            if (File.Exists(Path.Combine(this.Name, "iXL", "iXLUpdater.exe")))
             {
                 return RedumpSystem.MattelFisherPriceiXL;
             }
@@ -298,8 +318,8 @@ namespace MPF.Core.Data
             // Microsoft Xbox 360
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "$SystemUpdate"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "$SystemUpdate")).Any()
+                if (Directory.Exists(Path.Combine(this.Name, "$SystemUpdate"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "$SystemUpdate")).Any()
                     && this.TotalSize <= 500_000_000)
                 {
                     return RedumpSystem.MicrosoftXbox360;
@@ -310,8 +330,8 @@ namespace MPF.Core.Data
             // Microsoft Xbox One
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "MSXC"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "MSXC")).Any())
+                if (Directory.Exists(Path.Combine(this.Name, "MSXC"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "MSXC")).Any())
                 {
                     return RedumpSystem.MicrosoftXboxOne;
                 }
@@ -319,35 +339,23 @@ namespace MPF.Core.Data
             catch { }
 
             // Sega Dreamcast
-            if (File.Exists(Path.Combine(drivePath, "IP.BIN")))
+            if (File.Exists(Path.Combine(this.Name, "IP.BIN")))
             {
                 return RedumpSystem.SegaDreamcast;
             }
 
             // Sega Mega-CD / Sega-CD
-            if (File.Exists(Path.Combine(drivePath, "_BOOT", "IP.BIN"))
-                || File.Exists(Path.Combine(drivePath, "_BOOT", "SP.BIN"))
-                || File.Exists(Path.Combine(drivePath, "_BOOT", "SP_AS.BIN"))
-                || File.Exists(Path.Combine(drivePath, "FILESYSTEM.BIN")))
+            if (File.Exists(Path.Combine(this.Name, "_BOOT", "IP.BIN"))
+                || File.Exists(Path.Combine(this.Name, "_BOOT", "SP.BIN"))
+                || File.Exists(Path.Combine(this.Name, "_BOOT", "SP_AS.BIN"))
+                || File.Exists(Path.Combine(this.Name, "FILESYSTEM.BIN")))
             {
                 return RedumpSystem.SegaMegaCDSegaCD;
             }
 
-            // Sega Saturn
-            try
-            {
-                byte[] sector = ReadSector(0);
-                if (sector != null)
-                {
-                    if (sector.StartsWith(Interface.SaturnSectorZeroStart))
-                        return RedumpSystem.SegaSaturn;
-                }
-            }
-            catch { }
-
             // Sony PlayStation and Sony PlayStation 2
-            string psxExePath = Path.Combine(drivePath, "PSX.EXE");
-            string systemCnfPath = Path.Combine(drivePath, "SYSTEM.CNF");
+            string psxExePath = Path.Combine(this.Name, "PSX.EXE");
+            string systemCnfPath = Path.Combine(this.Name, "SYSTEM.CNF");
             if (File.Exists(systemCnfPath))
             {
                 // Check for either BOOT or BOOT2
@@ -365,9 +373,9 @@ namespace MPF.Core.Data
             // Sony PlayStation 3
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "PS3_GAME"))
-                    || Directory.Exists(Path.Combine(drivePath, "PS3_UPDATE"))
-                    || File.Exists(Path.Combine(drivePath, "PS3_DISC.SFB")))
+                if (Directory.Exists(Path.Combine(this.Name, "PS3_GAME"))
+                    || Directory.Exists(Path.Combine(this.Name, "PS3_UPDATE"))
+                    || File.Exists(Path.Combine(this.Name, "PS3_DISC.SFB")))
                 {
                     return RedumpSystem.SonyPlayStation3;
                 }
@@ -386,13 +394,13 @@ namespace MPF.Core.Data
             //        Is used as an on-disc update for the base game app without needing to get update from the internet.
             //    "/addcont/GAME_SERIAL/CONTENT_ID/ac.pkg" can be found in Redump entry 97619.
             //        Originally on disc as "/addcont/CUSA00288/FFXIVEXPS400001A/ac.pkg".
-            if (File.Exists(Path.Combine(drivePath, "PS4", "UPDATE", "PS4UPDATE.PUP")))
+            if (File.Exists(Path.Combine(this.Name, "PS4", "UPDATE", "PS4UPDATE.PUP")))
             {
                 return RedumpSystem.SonyPlayStation4;
             }
 
             // V.Tech V.Flash / V.Smile Pro
-            if (File.Exists(Path.Combine(drivePath, "0SYSTEM")))
+            if (File.Exists(Path.Combine(this.Name, "0SYSTEM")))
             {
                 return RedumpSystem.VTechVFlashVSmilePro;
             }
@@ -402,7 +410,7 @@ namespace MPF.Core.Data
             #region Computers
 
             // Sharp X68000
-            if (File.Exists(Path.Combine(drivePath, "COMMAND.X")))
+            if (File.Exists(Path.Combine(this.Name, "COMMAND.X")))
             {
                 return RedumpSystem.SharpX68000;
             }
@@ -412,7 +420,7 @@ namespace MPF.Core.Data
             #region Video Formats
 
             // BD-Video
-            if (Directory.Exists(Path.Combine(drivePath, "BDMV")))
+            if (Directory.Exists(Path.Combine(this.Name, "BDMV")))
             {
                 // Technically BD-Audio has this as well, but it's hard to split that out right now
                 return RedumpSystem.BDVideo;
@@ -421,14 +429,14 @@ namespace MPF.Core.Data
             // DVD-Audio and DVD-Video
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "AUDIO_TS"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "AUDIO_TS")).Any())
+                if (Directory.Exists(Path.Combine(this.Name, "AUDIO_TS"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "AUDIO_TS")).Any())
                 {
                     return RedumpSystem.DVDAudio;
                 }
 
-                else if (Directory.Exists(Path.Combine(drivePath, "VIDEO_TS"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "VIDEO_TS")).Any())
+                else if (Directory.Exists(Path.Combine(this.Name, "VIDEO_TS"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "VIDEO_TS")).Any())
                 {
                     return RedumpSystem.DVDVideo;
                 }
@@ -438,8 +446,8 @@ namespace MPF.Core.Data
             // HD-DVD-Video
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "HVDVD_TS"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "HVDVD_TS")).Any())
+                if (Directory.Exists(Path.Combine(this.Name, "HVDVD_TS"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "HVDVD_TS")).Any())
                 {
                     return RedumpSystem.HDDVDVideo;
                 }
@@ -449,8 +457,8 @@ namespace MPF.Core.Data
             // VCD
             try
             {
-                if (Directory.Exists(Path.Combine(drivePath, "VCD"))
-                    && Directory.EnumerateFiles(Path.Combine(drivePath, "VCD")).Any())
+                if (Directory.Exists(Path.Combine(this.Name, "VCD"))
+                    && Directory.EnumerateFiles(Path.Combine(this.Name, "VCD")).Any())
                 {
                     return RedumpSystem.VideoCD;
                 }
@@ -514,48 +522,6 @@ namespace MPF.Core.Data
             return null;
         }
 
-        /// <summary>
-        /// Read a sector with a specified size from the drive
-        /// </summary>
-        /// <param name="num">Sector number, non-negative</param>
-        /// <param name="size">Size of a sector in bytes</param>
-        /// <returns>Byte array representing the sector, null on error</returns>
-        public byte[] ReadSector(long num, int size = 2048)
-        {
-            // Missing drive leter is not supported
-            if (string.IsNullOrEmpty(this.Name))
-                return null;
-
-            // We don't support negative sectors
-            if (num < 0)
-                return null;
-
-            // Wrap the following in case of device access errors
-            Stream fs = null;
-            try
-            {
-                // Open the drive as a device
-                fs = File.OpenRead($"\\\\?\\{this.Letter}:");
-
-                // Seek to the start of the sector, if possible
-                long start = num * size;
-                fs.Seek(start, SeekOrigin.Begin);
-
-                // Read and return the sector
-                byte[] buffer = new byte[size];
-                fs.Read(buffer, 0, size);
-                return buffer;
-            }
-            catch
-            {
-                return null;
-            }
-            finally
-            {
-                fs?.Dispose();
-            }
-        }
-
         /// <summary>
         /// Refresh the current drive information based on path
         /// </summary>
@@ -569,20 +535,6 @@ namespace MPF.Core.Data
 
         #region Helpers
 
-        /// <summary>
-        /// Get the media type for a device path based on size
-        /// </summary>
-        /// <returns>MediaType, null on error</returns>
-        private (MediaType?, string) GetMediaTypeFromSize()
-        {
-            if (this.TotalSize >= 0 && this.TotalSize < 800_000_000 && this.DriveFormat == "CDFS")
-                return (MediaType.CDROM, null);
-            else if (this.TotalSize >= 400_000_000 && this.TotalSize <= 8_540_000_000 && this.DriveFormat == "UDF")
-                return (MediaType.DVD, null);
-            else
-                return (MediaType.BluRay, null);
-        }
-
         /// <summary>
         /// Get all current attached Drives
         /// </summary>
@@ -605,14 +557,14 @@ namespace MPF.Core.Data
             // https://github.com/aaru-dps/Aaru/blob/5164a154e2145941472f2ee0aeb2eff3338ecbb3/Aaru.Devices/Windows/ListDevices.cs#L66
 
             // Create an output drive list
-            List<Drive> drives = new List<Drive>();
+            var drives = new List<Drive>();
 
             // Get all standard supported drive types
             try
             {
                 drives = DriveInfo.GetDrives()
                     .Where(d => desiredDriveTypes.Contains(d.DriveType))
-                    .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
+                    .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name) ?? new Drive())
                     .ToList();
             }
             catch
@@ -632,8 +584,8 @@ namespace MPF.Core.Data
                     uint? mediaType = properties["MediaType"]?.Value as uint?;
                     if (mediaType != null && ((mediaType > 0 && mediaType < 11) || (mediaType > 12 && mediaType < 22)))
                     {
-                        char devId = (properties["Caption"].Value as string)[0];
-                        drives.ForEach(d => { if (d.Letter == devId) { d.InternalDriveType = Data.InternalDriveType.Floppy; } });
+                        char devId = (properties["Caption"].Value as string ?? string.Empty)[0];
+                        drives.ForEach(d => { if (d?.Name != null && d.Name[0] == devId) { d.InternalDriveType = Data.InternalDriveType.Floppy; } });
                     }
                 }
             }

MPF.Core/Data/Enumerations.cs

@@ -1,5 +1,21 @@
 namespace MPF.Core.Data
 {
+    /// <summary>
+    /// Available hashing types
+    /// </summary>
+    public enum Hash
+    {
+        CRC32,
+        CRC64,
+        MD5,
+        SHA1,
+        SHA256,
+        SHA384,
+        SHA512,
+        XxHash32,
+        XxHash64,
+    }
+
     /// <summary>
     /// Drive type for dumping
     /// </summary>
@@ -28,4 +44,15 @@
         DCDumper,
         UmdImageCreator,
     }
+
+    /// <summary>
+    /// Log level for output
+    /// </summary>
+    public enum LogLevel
+    {
+        USER,
+        VERBOSE,
+        ERROR,
+        SECRET,
+    }
 }

MPF.Core/Data/IniFile.cs

@@ -8,25 +8,37 @@ namespace MPF.Core.Data
 {
     public class IniFile : IDictionary<string, string>
     {
+#if NET48
         private Dictionary<string, string> _keyValuePairs = new Dictionary<string, string>();
+#else
+        private Dictionary<string, string> _keyValuePairs = new();
+#endif
 
         public string this[string key]
         {
             get
             {
+#if NET48
                 if (_keyValuePairs == null)
                     _keyValuePairs = new Dictionary<string, string>();
+#else
+                _keyValuePairs ??= new Dictionary<string, string>();
+#endif
 
                 key = key.ToLowerInvariant();
                 if (_keyValuePairs.ContainsKey(key))
                     return _keyValuePairs[key];
 
-                return null;
+                return string.Empty;
             }
             set
             {
+#if NET48
                 if (_keyValuePairs == null)
                     _keyValuePairs = new Dictionary<string, string>();
+#else
+                _keyValuePairs ??= new Dictionary<string, string>();
+#endif
 
                 key = key.ToLowerInvariant();
                 _keyValuePairs[key] = value;
@@ -99,15 +111,21 @@ namespace MPF.Core.Data
             // Keys are case-insensitive by default
             try
             {
-                using (StreamReader sr = new StreamReader(stream))
+                using (var sr = new StreamReader(stream))
                 {
                     string section = string.Empty;
                     while (!sr.EndOfStream)
                     {
-                        string line = sr.ReadLine().Trim();
+                        var line = sr.ReadLine()?.Trim();
+
+                        // Empty lines are skipped
+                        if (string.IsNullOrWhiteSpace(line))
+                        {
+                            // No-op, we don't process empty lines
+                        }
 
                         // Comments start with ';'
-                        if (line.StartsWith(";"))
+                        else if (line.StartsWith(";"))
                         {
                             // No-op, we don't process comments
                         }
@@ -119,7 +137,11 @@ namespace MPF.Core.Data
                         }
 
                         // Valid INI lines are in the format key=value
+#if NET48
                         else if (line.Contains("="))
+#else
+                        else if (line.Contains('='))
+#endif
                         {
                             // Split the line by '=' for key-value pairs
                             string[] data = line.Split('=');
@@ -179,7 +201,7 @@ namespace MPF.Core.Data
 
             try
             {
-                using (StreamWriter sw = new StreamWriter(stream))
+                using (var sw = new StreamWriter(stream))
                 {
                     // Order the dictionary by keys to link sections together
                     var orderedKeyValuePairs = _keyValuePairs.OrderBy(kvp => kvp.Key);
@@ -245,7 +267,9 @@ namespace MPF.Core.Data
 
         public bool TryGetValue(string key, out string value)
         {
-            return ((IDictionary<string, string>)_keyValuePairs).TryGetValue(key.ToLowerInvariant(), out value);
+            bool result = ((IDictionary<string, string>)_keyValuePairs).TryGetValue(key.ToLowerInvariant(), out var temp);
+            value = temp ?? string.Empty;
+            return result;
         }
 
         public void Add(KeyValuePair<string, string> item)

MPF.Core/Data/Options.cs

@@ -1,42 +1,68 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MPF.Core.Converters;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.Core.Data
 {
-    public class Options : IDictionary<string, string>
+    public class Options
     {
-        private Dictionary<string, string> _settings;
+        /// <summary>
+        /// All settings in the form of a dictionary
+        /// </summary>
+#if NET48
+        public Dictionary<string, string> Settings { get; private set; }
+#else
+        public Dictionary<string, string?> Settings { get; private set; }
+#endif
+
+        /// <summary>
+        /// Indicate if the program is being run with a clean configuration
+        /// </summary>
+        public bool FirstRun
+        {
+            get { return GetBooleanSetting(Settings, "FirstRun", true); }
+            set { Settings["FirstRun"] = value.ToString(); }
+        }
 
         #region Internal Program
 
         /// <summary>
         /// Path to Aaru
         /// </summary>
+#if NET48
         public string AaruPath
+#else
+        public string? AaruPath
+#endif
         {
-            get { return GetStringSetting(_settings, "AaruPath", "Programs\\Aaru\\Aaru.exe"); }
-            set { _settings["AaruPath"] = value; }
+            get { return GetStringSetting(Settings, "AaruPath", "Programs\\Aaru\\Aaru.exe"); }
+            set { Settings["AaruPath"] = value; }
         }
 
         /// <summary>
         /// Path to DiscImageCreator
         /// </summary>
+#if NET48
         public string DiscImageCreatorPath
+#else
+        public string? DiscImageCreatorPath
+#endif
         {
-            get { return GetStringSetting(_settings, "DiscImageCreatorPath", "Programs\\Creator\\DiscImageCreator.exe"); }
-            set { _settings["DiscImageCreatorPath"] = value; }
+            get { return GetStringSetting(Settings, "DiscImageCreatorPath", "Programs\\Creator\\DiscImageCreator.exe"); }
+            set { Settings["DiscImageCreatorPath"] = value; }
         }
 
         /// <summary>
         /// Path to Redumper
         /// </summary>
+#if NET48
         public string RedumperPath
+#else
+        public string? RedumperPath
+#endif
         {
-            get { return GetStringSetting(_settings, "RedumperPath", "Programs\\Redumper\\redumper.exe"); }
-            set { _settings["RedumperPath"] = value; }
+            get { return GetStringSetting(Settings, "RedumperPath", "Programs\\Redumper\\redumper.exe"); }
+            set { Settings["RedumperPath"] = value; }
         }
 
         /// <summary>
@@ -46,13 +72,13 @@ namespace MPF.Core.Data
         {
             get
             {
-                string valueString = GetStringSetting(_settings, "InternalProgram", InternalProgram.DiscImageCreator.ToString());
+                var valueString = GetStringSetting(Settings, "InternalProgram", InternalProgram.DiscImageCreator.ToString());
                 var valueEnum = EnumConverter.ToInternalProgram(valueString);
                 return valueEnum == InternalProgram.NONE ? InternalProgram.DiscImageCreator : valueEnum;
             }
             set
             {
-                _settings["InternalProgram"] = value.ToString();
+                Settings["InternalProgram"] = value.ToString();
             }
         }
 
@@ -65,8 +91,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool EnableDarkMode
         {
-            get { return GetBooleanSetting(_settings, "EnableDarkMode", false); }
-            set { _settings["EnableDarkMode"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "EnableDarkMode", false); }
+            set { Settings["EnableDarkMode"] = value.ToString(); }
         }
 
         /// <summary>
@@ -74,8 +100,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool CheckForUpdatesOnStartup
         {
-            get { return GetBooleanSetting(_settings, "CheckForUpdatesOnStartup", true); }
-            set { _settings["CheckForUpdatesOnStartup"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "CheckForUpdatesOnStartup", true); }
+            set { Settings["CheckForUpdatesOnStartup"] = value.ToString(); }
         }
 
         /// <summary>
@@ -83,17 +109,21 @@ namespace MPF.Core.Data
         /// </summary>
         public bool FastUpdateLabel
         {
-            get { return GetBooleanSetting(_settings, "FastUpdateLabel", false); }
-            set { _settings["FastUpdateLabel"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "FastUpdateLabel", false); }
+            set { Settings["FastUpdateLabel"] = value.ToString(); }
         }
 
         /// <summary>
         /// Default output path for dumps
         /// </summary>
+#if NET48
         public string DefaultOutputPath
+#else
+        public string? DefaultOutputPath
+#endif
         {
-            get { return GetStringSetting(_settings, "DefaultOutputPath", "ISO"); }
-            set { _settings["DefaultOutputPath"] = value; }
+            get { return GetStringSetting(Settings, "DefaultOutputPath", "ISO"); }
+            set { Settings["DefaultOutputPath"] = value; }
         }
 
         /// <summary>
@@ -103,13 +133,13 @@ namespace MPF.Core.Data
         {
             get
             {
-                string valueString = GetStringSetting(_settings, "DefaultSystem", null);
-                var valueEnum = Extensions.ToRedumpSystem(valueString);
+                var valueString = GetStringSetting(Settings, "DefaultSystem", null);
+                var valueEnum = Extensions.ToRedumpSystem(valueString ?? string.Empty);
                 return valueEnum;
             }
             set
             {
-                _settings["DefaultSystem"] = value.LongName();
+                Settings["DefaultSystem"] = value.LongName();
             }
         }
 
@@ -119,8 +149,8 @@ namespace MPF.Core.Data
         /// <remarks>This is a hidden setting</remarks>
         public bool ShowDebugViewMenuItem
         {
-            get { return GetBooleanSetting(_settings, "ShowDebugViewMenuItem", false); }
-            set { _settings["ShowDebugViewMenuItem"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ShowDebugViewMenuItem", false); }
+            set { Settings["ShowDebugViewMenuItem"] = value.ToString(); }
         }
 
         #endregion
@@ -132,8 +162,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedCD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedCD", 24); }
-            set { _settings["PreferredDumpSpeedCD"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "PreferredDumpSpeedCD", 24); }
+            set { Settings["PreferredDumpSpeedCD"] = value.ToString(); }
         }
 
         /// <summary>
@@ -141,8 +171,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedDVD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedDVD", 16); }
-            set { _settings["PreferredDumpSpeedDVD"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "PreferredDumpSpeedDVD", 16); }
+            set { Settings["PreferredDumpSpeedDVD"] = value.ToString(); }
         }
 
         /// <summary>
@@ -150,8 +180,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedHDDVD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedHDDVD", 8); }
-            set { _settings["PreferredDumpSpeedHDDVD"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "PreferredDumpSpeedHDDVD", 8); }
+            set { Settings["PreferredDumpSpeedHDDVD"] = value.ToString(); }
         }
 
         /// <summary>
@@ -159,8 +189,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedBD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedBD", 8); }
-            set { _settings["PreferredDumpSpeedBD"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "PreferredDumpSpeedBD", 8); }
+            set { Settings["PreferredDumpSpeedBD"] = value.ToString(); }
         }
 
         #endregion
@@ -172,8 +202,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool AaruEnableDebug
         {
-            get { return GetBooleanSetting(_settings, "AaruEnableDebug", false); }
-            set { _settings["AaruEnableDebug"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "AaruEnableDebug", false); }
+            set { Settings["AaruEnableDebug"] = value.ToString(); }
         }
 
         /// <summary>
@@ -181,8 +211,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool AaruEnableVerbose
         {
-            get { return GetBooleanSetting(_settings, "AaruEnableVerbose", false); }
-            set { _settings["AaruEnableVerbose"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "AaruEnableVerbose", false); }
+            set { Settings["AaruEnableVerbose"] = value.ToString(); }
         }
 
         /// <summary>
@@ -190,8 +220,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool AaruForceDumping
         {
-            get { return GetBooleanSetting(_settings, "AaruForceDumping", true); }
-            set { _settings["AaruForceDumping"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "AaruForceDumping", true); }
+            set { Settings["AaruForceDumping"] = value.ToString(); }
         }
 
         /// <summary>
@@ -199,8 +229,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int AaruRereadCount
         {
-            get { return GetInt32Setting(_settings, "AaruRereadCount", 5); }
-            set { _settings["AaruRereadCount"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "AaruRereadCount", 5); }
+            set { Settings["AaruRereadCount"] = value.ToString(); }
         }
 
         /// <summary>
@@ -208,8 +238,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool AaruStripPersonalData
         {
-            get { return GetBooleanSetting(_settings, "AaruStripPersonalData", false); }
-            set { _settings["AaruStripPersonalData"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "AaruStripPersonalData", false); }
+            set { Settings["AaruStripPersonalData"] = value.ToString(); }
         }
 
         #endregion
@@ -221,8 +251,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool DICMultiSectorRead
         {
-            get { return GetBooleanSetting(_settings, "DICMultiSectorRead", false); }
-            set { _settings["DICMultiSectorRead"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "DICMultiSectorRead", false); }
+            set { Settings["DICMultiSectorRead"] = value.ToString(); }
         }
 
         /// <summary>
@@ -230,8 +260,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int DICMultiSectorReadValue
         {
-            get { return GetInt32Setting(_settings, "DICMultiSectorReadValue", 0); }
-            set { _settings["DICMultiSectorReadValue"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "DICMultiSectorReadValue", 0); }
+            set { Settings["DICMultiSectorReadValue"] = value.ToString(); }
         }
 
         /// <summary>
@@ -244,8 +274,8 @@ namespace MPF.Core.Data
         /// </remarks>
         public bool DICParanoidMode
         {
-            get { return GetBooleanSetting(_settings, "DICParanoidMode", false); }
-            set { _settings["DICParanoidMode"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "DICParanoidMode", false); }
+            set { Settings["DICParanoidMode"] = value.ToString(); }
         }
 
         /// <summary>
@@ -253,8 +283,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool DICQuietMode
         {
-            get { return GetBooleanSetting(_settings, "DICQuietMode", false); }
-            set { _settings["DICQuietMode"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "DICQuietMode", false); }
+            set { Settings["DICQuietMode"] = value.ToString(); }
         }
 
         /// <summary>
@@ -262,8 +292,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int DICRereadCount
         {
-            get { return GetInt32Setting(_settings, "DICRereadCount", 20); }
-            set { _settings["DICRereadCount"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "DICRereadCount", 20); }
+            set { Settings["DICRereadCount"] = value.ToString(); }
         }
 
         /// <summary>
@@ -271,8 +301,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int DICDVDRereadCount
         {
-            get { return GetInt32Setting(_settings, "DICDVDRereadCount", 10); }
-            set { _settings["DICDVDRereadCount"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "DICDVDRereadCount", 10); }
+            set { Settings["DICDVDRereadCount"] = value.ToString(); }
         }
 
         /// <summary>
@@ -280,8 +310,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool DICResetDriveAfterDump
         {
-            get { return GetBooleanSetting(_settings, "DICResetDriveAfterDump", false); }
-            set { _settings["DICResetDriveAfterDump"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "DICResetDriveAfterDump", false); }
+            set { Settings["DICResetDriveAfterDump"] = value.ToString(); }
         }
 
         /// <summary>
@@ -289,8 +319,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool DICUseCMIFlag
         {
-            get { return GetBooleanSetting(_settings, "DICUseCMIFlag", false); }
-            set { _settings["DICUseCMIFlag"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "DICUseCMIFlag", false); }
+            set { Settings["DICUseCMIFlag"] = value.ToString(); }
         }
 
         #endregion
@@ -302,8 +332,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool RedumperEnableDebug
         {
-            get { return GetBooleanSetting(_settings, "RedumperEnableDebug", false); }
-            set { _settings["RedumperEnableDebug"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "RedumperEnableDebug", false); }
+            set { Settings["RedumperEnableDebug"] = value.ToString(); }
         }
 
         /// <summary>
@@ -311,8 +341,26 @@ namespace MPF.Core.Data
         /// </summary>
         public bool RedumperEnableVerbose
         {
-            get { return GetBooleanSetting(_settings, "RedumperEnableVerbose", false); }
-            set { _settings["RedumperEnableVerbose"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "RedumperEnableVerbose", false); }
+            set { Settings["RedumperEnableVerbose"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Enable BE reading by default with Redumper
+        /// </summary>
+        public bool RedumperUseBEReading
+        {
+            get { return GetBooleanSetting(Settings, "RedumperUseBEReading", false); }
+            set { Settings["RedumperUseBEReading"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Enable generic drive type by default with Redumper
+        /// </summary>
+        public bool RedumperUseGenericDriveType
+        {
+            get { return GetBooleanSetting(Settings, "RedumperUseGenericDriveType", false); }
+            set { Settings["RedumperUseGenericDriveType"] = value.ToString(); }
         }
 
         /// <summary>
@@ -320,8 +368,8 @@ namespace MPF.Core.Data
         /// </summary>
         public int RedumperRereadCount
         {
-            get { return GetInt32Setting(_settings, "RedumperRereadCount", 20); }
-            set { _settings["RedumperRereadCount"] = value.ToString(); }
+            get { return GetInt32Setting(Settings, "RedumperRereadCount", 20); }
+            set { Settings["RedumperRereadCount"] = value.ToString(); }
         }
 
         #endregion
@@ -333,8 +381,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool ScanForProtection
         {
-            get { return GetBooleanSetting(_settings, "ScanForProtection", true); }
-            set { _settings["ScanForProtection"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ScanForProtection", true); }
+            set { Settings["ScanForProtection"] = value.ToString(); }
         }
 
         /// <summary>
@@ -342,8 +390,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool OutputSeparateProtectionFile
         {
-            get { return GetBooleanSetting(_settings, "OutputSeparateProtectionFile", true); }
-            set { _settings["OutputSeparateProtectionFile"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "OutputSeparateProtectionFile", true); }
+            set { Settings["OutputSeparateProtectionFile"] = value.ToString(); }
         }
 
         /// <summary>
@@ -351,8 +399,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool AddPlaceholders
         {
-            get { return GetBooleanSetting(_settings, "AddPlaceholders", true); }
-            set { _settings["AddPlaceholders"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "AddPlaceholders", true); }
+            set { Settings["AddPlaceholders"] = value.ToString(); }
         }
 
         /// <summary>
@@ -360,8 +408,17 @@ namespace MPF.Core.Data
         /// </summary>
         public bool PromptForDiscInformation
         {
-            get { return GetBooleanSetting(_settings, "PromptForDiscInformation", true); }
-            set { _settings["PromptForDiscInformation"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "PromptForDiscInformation", true); }
+            set { Settings["PromptForDiscInformation"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Pull all information from Redump if signed in
+        /// </summary>
+        public bool PullAllInformation
+        {
+            get { return GetBooleanSetting(Settings, "PullAllInformation", false); }
+            set { Settings["PullAllInformation"] = value.ToString(); }
         }
 
         /// <summary>
@@ -369,8 +426,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool EnableTabsInInputFields
         {
-            get { return GetBooleanSetting(_settings, "EnableTabsInInputFields", false); }
-            set { _settings["EnableTabsInInputFields"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "EnableTabsInInputFields", false); }
+            set { Settings["EnableTabsInInputFields"] = value.ToString(); }
         }
 
         /// <summary>
@@ -378,8 +435,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool EnableRedumpCompatibility
         {
-            get { return GetBooleanSetting(_settings, "EnableRedumpCompatibility", true); }
-            set { _settings["EnableRedumpCompatibility"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "EnableRedumpCompatibility", true); }
+            set { Settings["EnableRedumpCompatibility"] = value.ToString(); }
         }
 
         /// <summary>
@@ -387,8 +444,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool ShowDiscEjectReminder
         {
-            get { return GetBooleanSetting(_settings, "ShowDiscEjectReminder", true); }
-            set { _settings["ShowDiscEjectReminder"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ShowDiscEjectReminder", true); }
+            set { Settings["ShowDiscEjectReminder"] = value.ToString(); }
         }
 
         /// <summary>
@@ -396,8 +453,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool EjectAfterDump
         {
-            get { return GetBooleanSetting(_settings, "EjectAfterDump", false); }
-            set { _settings["EjectAfterDump"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "EjectAfterDump", false); }
+            set { Settings["EjectAfterDump"] = value.ToString(); }
         }
 
         /// <summary>
@@ -405,8 +462,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool IgnoreFixedDrives
         {
-            get { return GetBooleanSetting(_settings, "IgnoreFixedDrives", true); }
-            set { _settings["IgnoreFixedDrives"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "IgnoreFixedDrives", true); }
+            set { Settings["IgnoreFixedDrives"] = value.ToString(); }
         }
 
         /// <summary>
@@ -414,8 +471,17 @@ namespace MPF.Core.Data
         /// </summary>
         public bool ToolsInSeparateWindow
         {
-            get { return GetBooleanSetting(_settings, "ToolsInSeparateWindow", true); }
-            set { _settings["ToolsInSeparateWindow"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ToolsInSeparateWindow", true); }
+            set { Settings["ToolsInSeparateWindow"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Add the dump filename as a suffix to the auto-generated files
+        /// </summary>
+        public bool AddFilenameSuffix
+        {
+            get { return GetBooleanSetting(Settings, "AddFilenameSuffix", false); }
+            set { Settings["AddFilenameSuffix"] = value.ToString(); }
         }
 
         /// <summary>
@@ -423,8 +489,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool OutputSubmissionJSON
         {
-            get { return GetBooleanSetting(_settings, "OutputSubmissionJSON", false); }
-            set { _settings["OutputSubmissionJSON"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "OutputSubmissionJSON", false); }
+            set { Settings["OutputSubmissionJSON"] = value.ToString(); }
         }
 
         /// <summary>
@@ -432,8 +498,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool IncludeArtifacts
         {
-            get { return GetBooleanSetting(_settings, "IncludeArtifacts", false); }
-            set { _settings["IncludeArtifacts"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "IncludeArtifacts", false); }
+            set { Settings["IncludeArtifacts"] = value.ToString(); }
         }
 
         /// <summary>
@@ -441,8 +507,17 @@ namespace MPF.Core.Data
         /// </summary>
         public bool CompressLogFiles
         {
-            get { return GetBooleanSetting(_settings, "CompressLogFiles", true); }
-            set { _settings["CompressLogFiles"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "CompressLogFiles", true); }
+            set { Settings["CompressLogFiles"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Delete unnecessary files to reduce space
+        /// </summary>
+        public bool DeleteUnnecessaryFiles
+        {
+            get { return GetBooleanSetting(Settings, "DeleteUnnecessaryFiles", false); }
+            set { Settings["DeleteUnnecessaryFiles"] = value.ToString(); }
         }
 
         #endregion
@@ -454,8 +529,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool SkipMediaTypeDetection
         {
-            get { return GetBooleanSetting(_settings, "SkipMediaTypeDetection", false); }
-            set { _settings["SkipMediaTypeDetection"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "SkipMediaTypeDetection", false); }
+            set { Settings["SkipMediaTypeDetection"] = value.ToString(); }
         }
 
         /// <summary>
@@ -463,8 +538,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool SkipSystemDetection
         {
-            get { return GetBooleanSetting(_settings, "SkipSystemDetection", false); }
-            set { _settings["SkipSystemDetection"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "SkipSystemDetection", false); }
+            set { Settings["SkipSystemDetection"] = value.ToString(); }
         }
 
         #endregion
@@ -476,8 +551,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool ScanArchivesForProtection
         {
-            get { return GetBooleanSetting(_settings, "ScanArchivesForProtection", true); }
-            set { _settings["ScanArchivesForProtection"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ScanArchivesForProtection", true); }
+            set { Settings["ScanArchivesForProtection"] = value.ToString(); }
         }
 
         /// <summary>
@@ -485,8 +560,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool ScanPackersForProtection
         {
-            get { return GetBooleanSetting(_settings, "ScanPackersForProtection", false); }
-            set { _settings["ScanPackersForProtection"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "ScanPackersForProtection", false); }
+            set { Settings["ScanPackersForProtection"] = value.ToString(); }
         }
 
         /// <summary>
@@ -494,8 +569,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool IncludeDebugProtectionInformation
         {
-            get { return GetBooleanSetting(_settings, "IncludeDebugProtectionInformation", false); }
-            set { _settings["IncludeDebugProtectionInformation"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "IncludeDebugProtectionInformation", false); }
+            set { Settings["IncludeDebugProtectionInformation"] = value.ToString(); }
         }
 
         #endregion
@@ -507,8 +582,8 @@ namespace MPF.Core.Data
         /// </summary>
         public bool VerboseLogging
         {
-            get { return GetBooleanSetting(_settings, "VerboseLogging", true); }
-            set { _settings["VerboseLogging"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "VerboseLogging", true); }
+            set { Settings["VerboseLogging"] = value.ToString(); }
         }
 
         /// <summary>
@@ -516,25 +591,36 @@ namespace MPF.Core.Data
         /// </summary>
         public bool OpenLogWindowAtStartup
         {
-            get { return GetBooleanSetting(_settings, "OpenLogWindowAtStartup", true); }
-            set { _settings["OpenLogWindowAtStartup"] = value.ToString(); }
+            get { return GetBooleanSetting(Settings, "OpenLogWindowAtStartup", true); }
+            set { Settings["OpenLogWindowAtStartup"] = value.ToString(); }
         }
 
         #endregion
 
         #region Redump Login Information
 
+#if NET48
         public string RedumpUsername
+#else
+        public string? RedumpUsername
+#endif
         {
-            get { return GetStringSetting(_settings, "RedumpUsername", ""); }
-            set { _settings["RedumpUsername"] = value; }
+            get { return GetStringSetting(Settings, "RedumpUsername", ""); }
+            set { Settings["RedumpUsername"] = value; }
         }
 
         // TODO: Figure out a way to keep this encrypted in some way, BASE64 to start?
+#if NET48
         public string RedumpPassword
+#else
+        public string? RedumpPassword
+#endif
         {
-            get { return GetStringSetting(_settings, "RedumpPassword", ""); }
-            set { _settings["RedumpPassword"] = value; }
+            get
+            {
+                return GetStringSetting(Settings, "RedumpPassword", "");
+            }
+            set { Settings["RedumpPassword"] = value; }
         }
 
         /// <summary>
@@ -548,27 +634,47 @@ namespace MPF.Core.Data
         /// Constructor taking a dictionary for settings
         /// </summary>
         /// <param name="settings"></param>
+#if NET48
         public Options(Dictionary<string, string> settings = null)
+#else
+        public Options(Dictionary<string, string?>? settings = null)
+#endif
         {
-            this._settings = settings ?? new Dictionary<string, string>();
+#if NET48
+            this.Settings = settings ?? new Dictionary<string, string>();
+#else
+            this.Settings = settings ?? new Dictionary<string, string?>();
+#endif
         }
 
         /// <summary>
         /// Constructor taking an existing Options object
         /// </summary>
         /// <param name="source"></param>
+#if NET48
         public Options(Options source)
+#else
+        public Options(Options? source)
+#endif
         {
-            _settings = new Dictionary<string, string>(source._settings);
+#if NET48
+            Settings = new Dictionary<string, string>(source?.Settings ?? new Dictionary<string, string>());
+#else
+            Settings = new Dictionary<string, string?>(source?.Settings ?? new Dictionary<string, string?>());
+#endif
         }
 
         /// <summary>
-        /// Set all fields from an existing Options object
+        /// Accessor for the internal dictionary
         /// </summary>
-        /// <param name="source"></param>
-        public void SetFromExisting(Options source)
+#if NET48
+        public string this[string key]
+#else
+        public string? this[string key]
+#endif
         {
-            _settings = new Dictionary<string, string>(source._settings);
+            get => this.Settings[key];
+            set => this.Settings[key] = value;
         }
 
         #region Helpers
@@ -580,11 +686,15 @@ namespace MPF.Core.Data
         /// <param name="key">Setting key to get a value for</param>
         /// <param name="defaultValue">Default value to return if no value is found</param>
         /// <returns>Setting value if possible, default value otherwise</returns>
-        private bool GetBooleanSetting(Dictionary<string, string> settings, string key, bool defaultValue)
+#if NET48
+        private static bool GetBooleanSetting(Dictionary<string, string> settings, string key, bool defaultValue)
+#else
+        private static bool GetBooleanSetting(Dictionary<string, string?> settings, string key, bool defaultValue)
+#endif
         {
             if (settings.ContainsKey(key))
             {
-                if (Boolean.TryParse(settings[key], out bool value))
+                if (bool.TryParse(settings[key], out bool value))
                     return value;
                 else
                     return defaultValue;
@@ -602,11 +712,15 @@ namespace MPF.Core.Data
         /// <param name="key">Setting key to get a value for</param>
         /// <param name="defaultValue">Default value to return if no value is found</param>
         /// <returns>Setting value if possible, default value otherwise</returns>
-        private int GetInt32Setting(Dictionary<string, string> settings, string key, int defaultValue)
+#if NET48
+        private static int GetInt32Setting(Dictionary<string, string> settings, string key, int defaultValue)
+#else
+        private static int GetInt32Setting(Dictionary<string, string?> settings, string key, int defaultValue)
+#endif
         {
             if (settings.ContainsKey(key))
             {
-                if (Int32.TryParse(settings[key], out int value))
+                if (int.TryParse(settings[key], out int value))
                     return value;
                 else
                     return defaultValue;
@@ -624,7 +738,11 @@ namespace MPF.Core.Data
         /// <param name="key">Setting key to get a value for</param>
         /// <param name="defaultValue">Default value to return if no value is found</param>
         /// <returns>Setting value if possible, default value otherwise</returns>
-        private string GetStringSetting(Dictionary<string, string> settings, string key, string defaultValue)
+#if NET48
+        private static string GetStringSetting(Dictionary<string, string> settings, string key, string defaultValue)
+#else
+        private static string? GetStringSetting(Dictionary<string, string?> settings, string key, string? defaultValue)
+#endif
         {
             if (settings.ContainsKey(key))
                 return settings[key];
@@ -633,45 +751,5 @@ namespace MPF.Core.Data
         }
 
         #endregion
-
-        #region IDictionary implementations
-
-        public ICollection<string> Keys => _settings.Keys;
-
-        public ICollection<string> Values => _settings.Values;
-
-        public int Count => _settings.Count;
-
-        public bool IsReadOnly => ((IDictionary<string, string>)_settings).IsReadOnly;
-
-        public string this[string key]
-        {
-            get { return (_settings.ContainsKey(key) ? _settings[key] : null); }
-            set { _settings[key] = value; }
-        }
-
-        public bool ContainsKey(string key) => _settings.ContainsKey(key);
-
-        public void Add(string key, string value) => _settings.Add(key, value);
-
-        public bool Remove(string key) => _settings.Remove(key);
-
-        public bool TryGetValue(string key, out string value) => _settings.TryGetValue(key, out value);
-
-        public void Add(KeyValuePair<string, string> item) => _settings.Add(item.Key, item.Value);
-
-        public void Clear() => _settings.Clear();
-
-        public bool Contains(KeyValuePair<string, string> item) => ((IDictionary<string, string>)_settings).Contains(item);
-
-        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) => ((IDictionary<string, string>)_settings).CopyTo(array, arrayIndex);
-
-        public bool Remove(KeyValuePair<string, string> item) => ((IDictionary<string, string>)_settings).Remove(item);
-
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => _settings.GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => _settings.GetEnumerator();
-
-        #endregion
     }
 }

MPF.Core/Data/ProcessingQueue.cs

@@ -42,7 +42,7 @@ namespace MPF.Core.Data
         public void Enqueue(T item)
         {
             // Only accept new data when not cancelled
-            if (!this.TokenSource.IsCancellationRequested)
+            if (item != null && !this.TokenSource.IsCancellationRequested)
                 this.InternalQueue.Enqueue(item);
         }
 
@@ -64,7 +64,7 @@ namespace MPF.Core.Data
                 }
 
                 // Get the next item from the queue
-                if (!this.InternalQueue.TryDequeue(out T nextItem))
+                if (!this.InternalQueue.TryDequeue(out var nextItem))
                     continue;
 
                 // Invoke the lambda, if possible

MPF.Core/Data/Result.cs

@@ -30,7 +30,11 @@
         /// Create a success result with a custom message
         /// </summary>
         /// <param name="message">String to add as a message</param>
+#if NET48
         public static Result Success(string message) => new Result(true, message);
+#else
+        public static Result Success(string? message) => new Result(true, message ?? string.Empty);
+#endif
 
         /// <summary>
         /// Create a default failure result with no message
@@ -42,7 +46,11 @@
         /// Create a failure result with a custom message
         /// </summary>
         /// <param name="message">String to add as a message</param>
+#if NET48
         public static Result Failure(string message) => new Result(false, message);
+#else
+        public static Result Failure(string? message) => new Result(false, message ?? string.Empty);
+#endif
 
         /// <summary>
         /// Results can be compared to boolean values based on the success value

MPF.Core/Data/XgdInfo.cs

@@ -1,180 +0,0 @@
-using SabreTools.RedumpLib.Data;
-
-namespace MPF.Core.Data
-{
-    /// <summary>
-    /// Contains information specific to an XGD disc
-    /// </summary>
-    public class XgdInfo
-    {
-        #region Fields
-
-        /// <summary>
-        /// Indicates whether the information in this object is fully instantiated or not
-        /// </summary>
-        public bool Initialized { get; private set; }
-
-        /// <summary>
-        /// Raw XMID/XeMID string that all other information is derived from
-        /// </summary>
-        public string RawXMID { get; private set; }
-
-        /// <summary>
-        /// XGD1 XMID
-        /// </summary>
-        public SabreTools.Models.Xbox.XMID XMID { get; private set; }
-
-        /// <summary>
-        /// XGD2/3 XeMID
-        /// </summary>
-        public SabreTools.Models.Xbox.XeMID XeMID { get; private set; }
-
-        #endregion
-
-        /// <summary>
-        /// Populate a set of XGD information from a Master ID (XMID/XeMID) string
-        /// </summary>
-        /// <param name="xmid">XMID/XeMID string representing the DMI information</param>
-        public XgdInfo(string xmid)
-        {
-            this.Initialized = false;
-            if (string.IsNullOrWhiteSpace(xmid))
-                return;
-
-            this.RawXMID = xmid.TrimEnd('\0');
-            if (string.IsNullOrWhiteSpace(this.RawXMID))
-                return;
-
-            // XGD1 information is 8 characters
-            if (this.RawXMID.Length == 8)
-                this.Initialized = ParseXGD1XMID(this.RawXMID);
-
-            // XGD2/3 information is semi-variable length
-            else if (this.RawXMID.Length == 13 || this.RawXMID.Length == 14 || this.RawXMID.Length == 21 || this.RawXMID.Length == 22)
-                this.Initialized = ParseXGD23XeMID(this.RawXMID);
-        }
-
-        /// <summary>
-        /// Get the human-readable serial string
-        /// </summary>
-        /// <returns>Formatted serial string, null on error</returns>
-        public string GetSerial()
-        {
-            if (!this.Initialized)
-                return null;
-
-            try
-            {
-                // XGD1 doesn't use PlatformIdentifier
-                if (XMID != null)
-                    return $"{XMID.PublisherIdentifier}-{XMID.GameID}";
-
-                // XGD2/3 uses a specific identifier
-                else if (XeMID?.PlatformIdentifier == '2')
-                    return $"{XeMID.PublisherIdentifier}-{XeMID.PlatformIdentifier}{XeMID.GameID}";
-
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Get the human-readable version string
-        /// </summary>
-        /// <returns>Formatted version string, null on error</returns>
-        /// <remarks>This may differ for XGD2/3 in the future</remarks>
-        public string GetVersion()
-        {
-            if (!this.Initialized)
-                return null;
-
-            try
-            {
-                // XGD1 doesn't use PlatformIdentifier
-                if (XMID != null)
-                    return $"1.{XMID.VersionNumber}";
-
-                // XGD2/3 uses a specific identifier
-                else if (XeMID?.PlatformIdentifier == '2')
-                    return $"1.{XeMID.SKU}";
-
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Parse an XGD1 XMID string
-        /// </summary>
-        /// <param name="rawXmid">XMID string to attempt to parse</param>
-        /// <returns>True if the XMID could be parsed, false otherwise</returns>
-        private bool ParseXGD1XMID(string rawXmid)
-        {
-            try
-            {
-                var xmid = new SabreTools.Serialization.Files.XMID().Deserialize(rawXmid);
-                if (xmid == null)
-                    return false;
-
-                this.XMID = xmid;
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Parse an XGD2/3 XeMID string
-        /// </summary>
-        /// <param name="rawXemid">XeMID string to attempt to parse</param>
-        /// <returns>True if the XeMID could be parsed, false otherwise</returns>
-        private bool ParseXGD23XeMID(string rawXemid)
-        {
-            try
-            {
-                var xemid = new SabreTools.Serialization.Files.XeMID().Deserialize(rawXemid);
-                if (xemid == null)
-                    return false;
-
-                this.XeMID = xemid;
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        #region Helpers
-
-        /// <summary>
-        /// Determine the region based on the XGD serial character
-        /// </summary>
-        /// <param name="region">Character denoting the region</param>
-        /// <returns>Region, if possible</returns>
-        public static Region? GetRegion(char region)
-        {
-            switch (region)
-            {
-                case 'W': return Region.World;
-                case 'A': return Region.UnitedStatesOfAmerica;
-                case 'J': return Region.JapanAsia;
-                case 'E': return Region.Europe;
-                case 'K': return Region.USAJapan;
-                case 'L': return Region.USAEurope;
-                case 'H': return Region.JapanEurope;
-                default: return null;
-            }
-        }
-
-        #endregion
-    }
-}

MPF.Core/DumpEnvironment.cs

@@ -2,14 +2,15 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
-using BurnOutSharp;
+using BinaryObjectScanner;
 using MPF.Core.Data;
+using MPF.Core.Modules;
 using MPF.Core.Utilities;
-using MPF.Modules;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Library
+namespace MPF.Core
 {
     /// <summary>
     /// Represents the state of all settings to be used during dumping
@@ -30,7 +31,11 @@ namespace MPF.Library
         /// <summary>
         /// Drive object representing the current drive
         /// </summary>
+#if NET48
         public Drive Drive { get; private set; }
+#else
+        public Drive? Drive { get; private set; }
+#endif
 
         /// <summary>
         /// Currently selected system
@@ -50,36 +55,52 @@ namespace MPF.Library
         /// <summary>
         /// Options object representing user-defined options
         /// </summary>
-        public Core.Data.Options Options { get; private set; }
+        public Data.Options Options { get; private set; }
 
         /// <summary>
         /// Parameters object representing what to send to the internal program
         /// </summary>
+#if NET48
         public BaseParameters Parameters { get; private set; }
+#else
+        public BaseParameters? Parameters { get; private set; }
+#endif
 
         #endregion
-        
+
         #region Event Handlers
 
         /// <summary>
         /// Generic way of reporting a message
         /// </summary>
+#if NET48
         public EventHandler<string> ReportStatus;
+#else
+        public EventHandler<string>? ReportStatus;
+#endif
 
         /// <summary>
         /// Queue of items that need to be logged
         /// </summary>
+#if NET48
         private ProcessingQueue<string> outputQueue;
+#else
+        private ProcessingQueue<string>? outputQueue;
+#endif
 
         /// <summary>
         /// Event handler for data returned from a process
         /// </summary>
-        private void OutputToLog(object proc, string args) => outputQueue.Enqueue(args);
+#if NET48
+        private void OutputToLog(object proc, string args) => outputQueue?.Enqueue(args);
+#else
+        private void OutputToLog(object? proc, string args) => outputQueue?.Enqueue(args);
+#endif
 
         /// <summary>
         /// Process the outputs in the queue
         /// </summary>
-        private void ProcessOutputs(string nextOutput) => ReportStatus.Invoke(this, nextOutput);
+        private void ProcessOutputs(string nextOutput) => ReportStatus?.Invoke(this, nextOutput);
 
         #endregion
 
@@ -93,112 +114,108 @@ namespace MPF.Library
         /// <param name="type"></param>
         /// <param name="internalProgram"></param>
         /// <param name="parameters"></param>
-        public DumpEnvironment(Core.Data.Options options,
+        public DumpEnvironment(Data.Options options,
             string outputPath,
+#if NET48
             Drive drive,
+#else
+            Drive? drive,
+#endif
             RedumpSystem? system,
             MediaType? type,
             InternalProgram? internalProgram,
+#if NET48
             string parameters)
+#else
+            string? parameters)
+#endif
         {
             // Set options object
-            this.Options = options;
+            Options = options;
 
             // Output paths
-            this.OutputPath = InfoTool.NormalizeOutputPaths(outputPath);
+            OutputPath = InfoTool.NormalizeOutputPaths(outputPath, false);
 
             // UI information
-            this.Drive = drive;
-            this.System = system ?? options.DefaultSystem;
-            this.Type = type ?? MediaType.NONE;
-            this.InternalProgram = internalProgram ?? options.InternalProgram;
-            
+            Drive = drive;
+            System = system ?? options.DefaultSystem;
+            Type = type ?? MediaType.NONE;
+            InternalProgram = internalProgram ?? options.InternalProgram;
+
             // Dumping program
             SetParameters(parameters);
         }
 
         #region Public Functionality
 
-        /// <summary>
-        /// Adjust output paths if we're using DiscImageCreator
-        /// </summary>
-        public void AdjustPathsForDiscImageCreator()
-        {
-            // Only DiscImageCreator has issues with paths
-            if (this.Parameters.InternalProgram != InternalProgram.DiscImageCreator)
-                return;
-
-            try
-            {
-                // Normalize the output path
-                string outputPath = InfoTool.NormalizeOutputPaths(this.OutputPath);
-
-                // Replace all instances in the output directory
-                string outputDirectory = Path.GetDirectoryName(outputPath);
-                outputDirectory = outputDirectory.Replace(".", "_");
-
-                // Replace all instances in the output filename
-                string outputFilename = Path.GetFileNameWithoutExtension(outputPath);
-                outputFilename = outputFilename.Replace(".", "_");
-
-                // Get the extension for recreating the path
-                string outputExtension = Path.GetExtension(outputPath).TrimStart('.');
-
-                // Rebuild the output path
-                if (!string.IsNullOrWhiteSpace(outputExtension))
-                    this.OutputPath = Path.Combine(outputDirectory, $"{outputFilename}.{outputExtension}");
-                else
-                    this.OutputPath = Path.Combine(outputDirectory, outputFilename);
-
-                // Assign the path to the filename as well for dumping
-                ((Modules.DiscImageCreator.Parameters)this.Parameters).Filename = this.OutputPath;
-            }
-            catch { }
-        }
-
         /// <summary>
         /// Set the parameters object based on the internal program and parameters string
         /// </summary>
         /// <param name="parameters">String representation of the parameters</param>
+#if NET48
         public void SetParameters(string parameters)
+#else
+        public void SetParameters(string? parameters)
+#endif
         {
-            switch (this.InternalProgram)
+#if NET48
+            switch (InternalProgram)
             {
                 // Dumping support
                 case InternalProgram.Aaru:
-                    this.Parameters = new Modules.Aaru.Parameters(parameters) { ExecutablePath = Options.AaruPath };
+                    Parameters = new Modules.Aaru.Parameters(parameters) { ExecutablePath = Options.AaruPath };
                     break;
 
                 case InternalProgram.DiscImageCreator:
-                    this.Parameters = new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath };
+                    Parameters = new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath };
                     break;
 
                 case InternalProgram.Redumper:
-                    this.Parameters = new Modules.Redumper.Parameters(parameters) { ExecutablePath = Options.RedumperPath };
+                    Parameters = new Modules.Redumper.Parameters(parameters) { ExecutablePath = Options.RedumperPath };
                     break;
 
                 // Verification support only
                 case InternalProgram.CleanRip:
-                    this.Parameters = new Modules.CleanRip.Parameters(parameters) { ExecutablePath = null };
+                    Parameters = new Modules.CleanRip.Parameters(parameters) { ExecutablePath = null };
                     break;
 
                 case InternalProgram.DCDumper:
-                    this.Parameters = null; // TODO: Create correct parameter type when supported
+                    Parameters = null; // TODO: Create correct parameter type when supported
                     break;
 
                 case InternalProgram.UmdImageCreator:
-                    this.Parameters = new Modules.UmdImageCreator.Parameters(parameters) { ExecutablePath = null };
+                    Parameters = new Modules.UmdImageCreator.Parameters(parameters) { ExecutablePath = null };
                     break;
 
                 // This should never happen, but it needs a fallback
                 default:
-                    this.Parameters = new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath };
+                    Parameters = new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath };
                     break;
             }
+#else
+            Parameters = InternalProgram switch
+            {
+                // Dumping support
+                InternalProgram.Aaru => new Modules.Aaru.Parameters(parameters) { ExecutablePath = Options.AaruPath },
+                InternalProgram.DiscImageCreator => new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath },
+                InternalProgram.Redumper => new Modules.Redumper.Parameters(parameters) { ExecutablePath = Options.RedumperPath },
+
+                // Verification support only
+                InternalProgram.CleanRip => new Modules.CleanRip.Parameters(parameters) { ExecutablePath = null },
+                InternalProgram.DCDumper => null, // TODO: Create correct parameter type when supported
+                InternalProgram.UmdImageCreator => new Modules.UmdImageCreator.Parameters(parameters) { ExecutablePath = null },
+
+                // This should never happen, but it needs a fallback
+                _ => new Modules.DiscImageCreator.Parameters(parameters) { ExecutablePath = Options.DiscImageCreatorPath },
+            };
+#endif
 
             // Set system and type
-            this.Parameters.System = this.System;
-            this.Parameters.Type = this.Type;
+            if (Parameters != null)
+            {
+                Parameters.System = System;
+                Parameters.Type = Type;
+            }
         }
 
         /// <summary>
@@ -206,7 +223,11 @@ namespace MPF.Library
         /// </summary>
         /// <param name="driveSpeed">Nullable int representing the drive speed</param>
         /// <returns>String representing the params, null on error</returns>
+#if NET48
         public string GetFullParameters(int? driveSpeed)
+#else
+        public string? GetFullParameters(int? driveSpeed)
+#endif
         {
             // Populate with the correct params for inputs (if we're not on the default option)
             if (System != null && Type != MediaType.NONE)
@@ -216,25 +237,37 @@ namespace MPF.Library
                     return null;
 
                 // Set the proper parameters
-                switch (this.InternalProgram)
+#if NET48
+                switch (InternalProgram)
                 {
                     case InternalProgram.Aaru:
-                        Parameters = new Modules.Aaru.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
+                        Parameters = new Modules.Aaru.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options);
                         break;
 
                     case InternalProgram.DiscImageCreator:
-                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
+                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options);
                         break;
 
                     case InternalProgram.Redumper:
-                        Parameters = new Modules.Redumper.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
+                        Parameters = new Modules.Redumper.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options);
                         break;
 
                     // This should never happen, but it needs a fallback
                     default:
-                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
+                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options);
                         break;
                 }
+#else
+                Parameters = InternalProgram switch
+                {
+                    InternalProgram.Aaru => new Modules.Aaru.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options),
+                    InternalProgram.DiscImageCreator => new Modules.DiscImageCreator.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options),
+                    InternalProgram.Redumper => new Modules.Redumper.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options),
+
+                    // This should never happen, but it needs a fallback
+                    _ => new Modules.DiscImageCreator.Parameters(System, Type, Drive.Name, OutputPath, driveSpeed, Options),
+                };
+#endif
 
                 // Generate and return the param string
                 return Parameters.GenerateParameters();
@@ -250,26 +283,42 @@ namespace MPF.Library
         /// <summary>
         /// Cancel an in-progress dumping process
         /// </summary>
-        public void CancelDumping() => Parameters.KillInternalProgram();
+        public void CancelDumping() => Parameters?.KillInternalProgram();
 
         /// <summary>
         /// Eject the disc using DiscImageCreator
         /// </summary>
+#if NET48
         public async Task<string> EjectDisc() =>
+#else
+        public async Task<string?> EjectDisc() =>
+#endif
             await RunStandaloneDiscImageCreatorCommand(Modules.DiscImageCreator.CommandStrings.Eject);
 
         /// <summary>
         /// Reset the current drive using DiscImageCreator
         /// </summary>
+#if NET48
         public async Task<string> ResetDrive() =>
+#else
+        public async Task<string?> ResetDrive() =>
+#endif
             await RunStandaloneDiscImageCreatorCommand(Modules.DiscImageCreator.CommandStrings.Reset);
 
         /// <summary>
         /// Execute the initial invocation of the dumping programs
         /// </summary>
         /// <param name="progress">Optional result progress callback</param>
+#if NET48
         public async Task<Result> Run(IProgress<Result> progress = null)
+#else
+        public async Task<Result> Run(IProgress<Result>? progress = null)
+#endif
         {
+            // If we don't have parameters
+            if (Parameters == null)
+                return Result.Failure("Error! Current configuration is not supported!");
+
             // Check that we have the basics for dumping
             Result result = IsValidForDump();
             if (!result)
@@ -279,24 +328,24 @@ namespace MPF.Library
             if (!Options.ToolsInSeparateWindow)
             {
                 outputQueue = new ProcessingQueue<string>(ProcessOutputs);
-                Parameters.ReportStatus += OutputToLog;
+                if (Parameters.ReportStatus != null)
+                    Parameters.ReportStatus += OutputToLog;
             }
 
             // Execute internal tool
-            progress?.Report(Result.Success($"Executing {this.InternalProgram}... {(Options.ToolsInSeparateWindow ? "please wait!" : "see log for output!")}"));
-            Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPath));
-            await Task.Run(() => Parameters.ExecuteInternalProgram(Options.ToolsInSeparateWindow));
-            progress?.Report(Result.Success($"{this.InternalProgram} has finished!"));
+            progress?.Report(Result.Success($"Executing {InternalProgram}... {(Options.ToolsInSeparateWindow ? "please wait!" : "see log for output!")}"));
 
-            // Execute additional tools
-            progress?.Report(Result.Success("Running any additional tools... see log for output!"));
-            result = await Task.Run(() => ExecuteAdditionalTools());
-            progress?.Report(result);
+            var directoryName = Path.GetDirectoryName(OutputPath);
+            if (!string.IsNullOrWhiteSpace(directoryName))
+                Directory.CreateDirectory(directoryName);
+
+            await Task.Run(() => Parameters.ExecuteInternalProgram(Options.ToolsInSeparateWindow));
+            progress?.Report(Result.Success($"{InternalProgram} has finished!"));
 
             // Remove event handler if needed
             if (!Options.ToolsInSeparateWindow)
             {
-                outputQueue.Dispose();
+                outputQueue?.Dispose();
                 Parameters.ReportStatus -= OutputToLog;
             }
 
@@ -309,20 +358,29 @@ namespace MPF.Library
         /// <param name="resultProgress">Optional result progress callback</param>
         /// <param name="protectionProgress">Optional protection progress callback</param>
         /// <param name="processUserInfo">Optional user prompt to deal with submission information</param>
+        /// <param name="seedInfo">A seed SubmissionInfo object that contains user data</param>
         /// <returns>Result instance with the outcome</returns>
         public async Task<Result> VerifyAndSaveDumpOutput(
+#if NET48
             IProgress<Result> resultProgress = null,
             IProgress<ProtectionProgress> protectionProgress = null,
-            Func<SubmissionInfo, (bool?, SubmissionInfo)> processUserInfo = null)
+            Func<SubmissionInfo, (bool?, SubmissionInfo)> processUserInfo = null,
+            SubmissionInfo seedInfo = null)
+#else
+            IProgress<Result>? resultProgress = null,
+            IProgress<ProtectionProgress>? protectionProgress = null,
+            Func<SubmissionInfo?, (bool?, SubmissionInfo?)>? processUserInfo = null,
+            SubmissionInfo? seedInfo = null)
+#endif
         {
             resultProgress?.Report(Result.Success("Gathering submission information... please wait!"));
 
             // Get the output directory and filename separately
-            string outputDirectory = Path.GetDirectoryName(this.OutputPath);
-            string outputFilename = Path.GetFileName(this.OutputPath);
+            var outputDirectory = Path.GetDirectoryName(OutputPath);
+            var outputFilename = Path.GetFileName(OutputPath);
 
             // Check to make sure that the output had all the correct files
-            (bool foundFiles, List<string> missingFiles) = InfoTool.FoundAllFiles(outputDirectory, outputFilename, this.Parameters, false);
+            (bool foundFiles, List<string> missingFiles) = InfoTool.FoundAllFiles(outputDirectory, outputFilename, Parameters, false);
             if (!foundFiles)
             {
                 resultProgress?.Report(Result.Failure($"There were files missing from the output:\n{string.Join("\n", missingFiles)}"));
@@ -331,28 +389,36 @@ namespace MPF.Library
 
             // Extract the information from the output files
             resultProgress?.Report(Result.Success("Extracting output information from output files..."));
-            SubmissionInfo submissionInfo = await InfoTool.ExtractOutputInformation(
-                this.OutputPath,
-                this.Drive,
-                this.System,
-                this.Type,
-                this.Options,
-                this.Parameters,
+            var submissionInfo = await SubmissionInfoTool.ExtractOutputInformation(
+                OutputPath,
+                Drive,
+                System,
+                Type,
+                Options,
+                Parameters,
                 resultProgress,
                 protectionProgress);
             resultProgress?.Report(Result.Success("Extracting information complete!"));
 
+            // Inject seed submission info data, if necessary
+            if (seedInfo != null)
+            {
+                resultProgress?.Report(Result.Success("Injecting user-supplied information..."));
+                SubmissionInfoTool.InjectSubmissionInformation(submissionInfo, seedInfo);
+                resultProgress?.Report(Result.Success("Information injection complete!"));
+            }
+
             // Eject the disc automatically if configured to
             if (Options.EjectAfterDump == true)
             {
-                resultProgress?.Report(Result.Success($"Ejecting disc in drive {Drive.Letter}"));
+                resultProgress?.Report(Result.Success($"Ejecting disc in drive {Drive?.Name}"));
                 await EjectDisc();
             }
 
             // Reset the drive automatically if configured to
-            if (this.InternalProgram == InternalProgram.DiscImageCreator && Options.DICResetDriveAfterDump)
+            if (InternalProgram == InternalProgram.DiscImageCreator && Options.DICResetDriveAfterDump)
             {
-                resultProgress?.Report(Result.Success($"Resetting drive {Drive.Letter}"));
+                resultProgress?.Report(Result.Success($"Resetting drive {Drive?.Name}"));
                 await ResetDrive();
             }
 
@@ -377,36 +443,42 @@ namespace MPF.Library
 
             // Format the information for the text output
             resultProgress?.Report(Result.Success("Formatting information..."));
-            (List<string> formattedValues, string formatResult) = InfoTool.FormatOutputData(submissionInfo, this.Options);
+            (var formattedValues, var formatResult) = InfoTool.FormatOutputData(submissionInfo, Options);
             if (formattedValues == null)
                 resultProgress?.Report(Result.Success(formatResult));
             else
                 resultProgress?.Report(Result.Failure(formatResult));
 
+            // Get the filename suffix for auto-generated files
+            var filenameSuffix = Options.AddFilenameSuffix ? Path.GetFileNameWithoutExtension(outputFilename) : null;
+
             // Write the text output
             resultProgress?.Report(Result.Success("Writing information to !submissionInfo.txt..."));
-            (bool txtSuccess, string txtResult) = InfoTool.WriteOutputData(outputDirectory, formattedValues);
+            (bool txtSuccess, string txtResult) = InfoTool.WriteOutputData(outputDirectory, filenameSuffix, formattedValues);
             if (txtSuccess)
                 resultProgress?.Report(Result.Success(txtResult));
             else
                 resultProgress?.Report(Result.Failure(txtResult));
 
             // Write the copy protection output
-            if (Options.ScanForProtection && Options.OutputSeparateProtectionFile)
+            if (submissionInfo?.CopyProtection?.FullProtections != null && submissionInfo.CopyProtection.FullProtections.Any())
             {
-                resultProgress?.Report(Result.Success("Writing protection to !protectionInfo.txt..."));
-                bool scanSuccess = InfoTool.WriteProtectionData(outputDirectory, submissionInfo);
-                if (scanSuccess)
-                    resultProgress?.Report(Result.Success("Writing complete!"));
-                else
-                    resultProgress?.Report(Result.Failure("Writing could not complete!"));
+                if (Options.ScanForProtection && Options.OutputSeparateProtectionFile)
+                {
+                    resultProgress?.Report(Result.Success("Writing protection to !protectionInfo.txt..."));
+                    bool scanSuccess = InfoTool.WriteProtectionData(outputDirectory, filenameSuffix, submissionInfo);
+                    if (scanSuccess)
+                        resultProgress?.Report(Result.Success("Writing complete!"));
+                    else
+                        resultProgress?.Report(Result.Failure("Writing could not complete!"));
+                }
             }
 
             // Write the JSON output, if required
             if (Options.OutputSubmissionJSON)
             {
                 resultProgress?.Report(Result.Success($"Writing information to !submissionInfo.json{(Options.IncludeArtifacts ? ".gz" : string.Empty)}..."));
-                bool jsonSuccess = InfoTool.WriteOutputData(outputDirectory, submissionInfo, Options.IncludeArtifacts);
+                bool jsonSuccess = InfoTool.WriteOutputData(outputDirectory, filenameSuffix, submissionInfo, Options.IncludeArtifacts);
                 if (jsonSuccess)
                     resultProgress?.Report(Result.Success("Writing complete!"));
                 else
@@ -417,13 +489,24 @@ namespace MPF.Library
             if (Options.CompressLogFiles)
             {
                 resultProgress?.Report(Result.Success("Compressing log files..."));
-                (bool compressSuccess, string compressResult) = InfoTool.CompressLogFiles(outputDirectory, outputFilename, this.Parameters);
+                (bool compressSuccess, string compressResult) = InfoTool.CompressLogFiles(outputDirectory, filenameSuffix, outputFilename, Parameters);
                 if (compressSuccess)
                     resultProgress?.Report(Result.Success(compressResult));
                 else
                     resultProgress?.Report(Result.Failure(compressResult));
             }
 
+            // Delete unnecessary files, if required
+            if (Options.DeleteUnnecessaryFiles)
+            {
+                resultProgress?.Report(Result.Success("Deleting unnecessary files..."));
+                (bool deleteSuccess, string deleteResult) = InfoTool.DeleteUnnecessaryFiles(outputDirectory, outputFilename, Parameters);
+                if (deleteSuccess)
+                    resultProgress?.Report(Result.Success(deleteResult));
+                else
+                    resultProgress?.Report(Result.Failure(deleteResult));
+            }
+
             resultProgress?.Report(Result.Success("Submission information process complete!"));
             return Result.Success();
         }
@@ -434,7 +517,11 @@ namespace MPF.Library
         /// <returns>True if the configuration is valid, false otherwise</returns>
         internal bool ParametersValid()
         {
-            bool parametersValid = Parameters.IsValid();
+            // Missing drive means it can never be valid
+            if (Drive == null)
+                return false;
+
+            bool parametersValid = Parameters?.IsValid() ?? false;
             bool floppyValid = !(Drive.InternalDriveType == InternalDriveType.Floppy ^ Type == MediaType.FloppyDisk);
 
             // TODO: HardDisk being in the Removable category is a hack, fix this later
@@ -444,18 +531,12 @@ namespace MPF.Library
             return parametersValid && floppyValid && removableDiskValid;
         }
 
-        /// <summary>
-        /// Run any additional tools given a DumpEnvironment
-        /// </summary>
-        /// <returns>Result instance with the outcome</returns>
-        private Result ExecuteAdditionalTools() => Result.Success("No external tools needed!");
-
         /// <summary>
         /// Run internal program async with an input set of parameters
         /// </summary>
         /// <param name="parameters"></param>
         /// <returns>Standard output from commandline window</returns>
-        private async Task<string> ExecuteInternalProgram(BaseParameters parameters)
+        private static async Task<string> ExecuteInternalProgram(BaseParameters parameters)
         {
             Process childProcess;
             string output = await Task.Run(() =>
@@ -494,14 +575,14 @@ namespace MPF.Library
         private Result IsValidForDump()
         {
             // Validate that everything is good
-            if (!ParametersValid())
+            if (Parameters == null || !ParametersValid())
                 return Result.Failure("Error! Current configuration is not supported!");
 
             // Fix the output paths, just in case
-            this.OutputPath = InfoTool.NormalizeOutputPaths(this.OutputPath);
+            OutputPath = InfoTool.NormalizeOutputPaths(OutputPath, false);
 
             // Validate that the output path isn't on the dumping drive
-            if (this.OutputPath[0] == Drive.Letter)
+            if (Drive?.Name != null && OutputPath.StartsWith(Drive.Name))
                 return Result.Failure("Error! Cannot output to same drive that is being dumped!");
 
             // Validate that the required program exists
@@ -510,7 +591,7 @@ namespace MPF.Library
 
             // Validate that the dumping drive doesn't contain the executable
             string fullExecutablePath = Path.GetFullPath(Parameters.ExecutablePath);
-            if (fullExecutablePath[0] == Drive.Letter)
+            if (Drive?.Name != null && fullExecutablePath.StartsWith(Drive.Name))
                 return Result.Failure("Error! Cannot dump same drive that executable resides on!");
 
             // Validate that the current configuration is supported
@@ -539,14 +620,18 @@ namespace MPF.Library
         /// </summary>
         /// <param name="command">Command string to run</param>
         /// <returns>The output of the command on success, null on error</returns>
+#if NET48
         private async Task<string> RunStandaloneDiscImageCreatorCommand(string command)
+#else
+        private async Task<string?> RunStandaloneDiscImageCreatorCommand(string command)
+#endif
         {
             // Validate that DiscImageCreator is all set
             if (!RequiredProgramsExist())
                 return null;
 
             // Validate we're not trying to eject a non-optical
-            if (Drive.InternalDriveType != InternalDriveType.Optical)
+            if (Drive == null || Drive.InternalDriveType != InternalDriveType.Optical)
                 return null;
 
             CancelDumping();
@@ -554,7 +639,7 @@ namespace MPF.Library
             var parameters = new Modules.DiscImageCreator.Parameters(string.Empty)
             {
                 BaseCommand = command,
-                DriveLetter = Drive.Letter.ToString(),
+                DrivePath = Drive.Name,
                 ExecutablePath = Options.DiscImageCreatorPath,
             };
 

MPF.Core/Hashing/Hasher.cs

@@ -1,35 +1,90 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Hashing;
 using System.Linq;
 using System.Security.Cryptography;
+using System.Threading.Tasks;
+using MPF.Core.Data;
 
 namespace MPF.Core.Hashing
 {
-    /// <summary>
-    /// Available hashing types
-    /// </summary>
-    [Flags]
-    public enum Hash
+    public sealed class Hasher : IDisposable
     {
-        CRC = 1 << 0,
-        MD5 = 1 << 1,
-        SHA1 = 1 << 2,
-        SHA256 = 1 << 3,
-        SHA384 = 1 << 4,
-        SHA512 = 1 << 5,
+        #region Properties
 
-        // Special combinations
-        Standard = CRC | MD5 | SHA1,
-        All = CRC | MD5 | SHA1 | SHA256 | SHA384 | SHA512,
-    }
-
-    /// <summary>
-    /// Async hashing class wraper
-    /// </summary>
-    public class Hasher
-    {
+        /// <summary>
+        /// Hash type associated with the current state
+        /// </summary>
+#if NET48
         public Hash HashType { get; private set; }
-        private IDisposable _hasher; 
+#else
+        public Hash HashType { get; init; }
+#endif
 
+        /// <summary>
+        /// Current hash in bytes
+        /// </summary>
+#if NET48
+        public byte[] CurrentHashBytes
+#else
+        public byte[]? CurrentHashBytes
+#endif
+        {
+            get
+            {
+#if NET48
+                switch (_hasher)
+                {
+                    case HashAlgorithm ha:
+                        return ha.Hash;
+                    case NonCryptographicHashAlgorithm ncha:
+                        return ncha.GetCurrentHash().Reverse().ToArray();
+                    default:
+                        return null;
+                }
+#else
+                return (_hasher) switch
+                {
+                    HashAlgorithm ha => ha.Hash,
+                    NonCryptographicHashAlgorithm ncha => ncha.GetCurrentHash().Reverse().ToArray(),
+                    _ => null,
+                };
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Current hash as a string
+        /// </summary>
+#if NET48
+        public string CurrentHashString => ByteArrayToString(CurrentHashBytes);
+#else
+        public string? CurrentHashString => ByteArrayToString(CurrentHashBytes);
+#endif
+
+        #endregion
+
+        #region Private Fields
+
+        /// <summary>
+        /// Internal hasher being used for processing
+        /// </summary>
+        /// <remarks>May be either a HashAlgorithm or NonCryptographicHashAlgorithm</remarks>
+#if NET48
+        private object _hasher;
+#else
+        private object? _hasher;
+#endif
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="hashType">Hash type to instantiate</param>
         public Hasher(Hash hashType)
         {
             this.HashType = hashType;
@@ -41,56 +96,256 @@ namespace MPF.Core.Hashing
         /// </summary>
         private void GetHasher()
         {
+#if NET48
             switch (HashType)
             {
-                case Hash.CRC:
-                    _hasher = new OptimizedCRC();
+                case Hash.CRC32:
+                    _hasher = new Crc32();
+                    break;
+                case Hash.CRC64:
+                    _hasher = new Crc64();
                     break;
-
                 case Hash.MD5:
                     _hasher = MD5.Create();
                     break;
-
                 case Hash.SHA1:
                     _hasher = SHA1.Create();
                     break;
-
                 case Hash.SHA256:
                     _hasher = SHA256.Create();
                     break;
-
                 case Hash.SHA384:
                     _hasher = SHA384.Create();
                     break;
-
                 case Hash.SHA512:
                     _hasher = SHA512.Create();
                     break;
+                case Hash.XxHash32:
+                    _hasher = new XxHash32();
+                    break;
+                case Hash.XxHash64:
+                    _hasher = new XxHash64();
+                    break;
+            }
+#else
+            _hasher = HashType switch
+            {
+                Hash.CRC32 => new Crc32(),
+                Hash.CRC64 => new Crc64(),
+                Hash.MD5 => MD5.Create(),
+                Hash.SHA1 => SHA1.Create(),
+                Hash.SHA256 => SHA256.Create(),
+                Hash.SHA384 => SHA384.Create(),
+                Hash.SHA512 => SHA512.Create(),
+                Hash.XxHash32 => new XxHash32(),
+                Hash.XxHash64 => new XxHash64(),
+                _ => null,
+            };
+#endif
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            if (_hasher is IDisposable disposable)
+                disposable.Dispose();
+        }
+
+        #endregion
+
+        #region Static Hashing
+
+        /// <summary>
+        /// Get hashes from an input file path
+        /// </summary>
+        /// <param name="filename">Path to the input file</param>
+        /// <returns>True if hashing was successful, false otherwise</returns>
+#if NET48
+        public static bool GetFileHashes(string filename, out long size, out string crc32, out string md5, out string sha1)
+#else
+        public static bool GetFileHashes(string filename, out long size, out string? crc32, out string? md5, out string? sha1)
+#endif
+        {
+            // Set all initial values
+            crc32 = null; md5 = null; sha1 = null;
+
+            // Get all file hashes
+            var fileHashes = GetFileHashes(filename, out size);
+            if (fileHashes == null)
+                return false;
+
+            // Assign the file hashes and return
+            crc32 = fileHashes[Hash.CRC32];
+            md5 = fileHashes[Hash.MD5];
+            sha1 = fileHashes[Hash.SHA1];
+            return true;
+        }
+
+        /// <summary>
+        /// Get hashes from an input file path
+        /// </summary>
+        /// <param name="filename">Path to the input file</param>
+        /// <returns>Dictionary containing hashes on success, null on error</returns>
+#if NET48
+        public static Dictionary<Hash, string> GetFileHashes(string filename, out long size)
+#else
+        public static Dictionary<Hash, string?>? GetFileHashes(string filename, out long size)
+#endif
+        {
+            // If the file doesn't exist, we can't do anything
+            if (!File.Exists(filename))
+            {
+                size = -1;
+                return null;
+            }
+
+            // Set the file size
+            size = new FileInfo(filename).Length;
+
+            // Create the output dictionary
+#if NET48
+            var hashDict = new Dictionary<Hash, string>();
+#else
+            var hashDict = new Dictionary<Hash, string?>();
+#endif
+
+            // Open the input file
+            var input = File.OpenRead(filename);
+
+            // Return the hashes from the stream
+            return GetStreamHashes(input);
+        }
+
+        /// <summary>
+        /// Get hashes from an input Stream
+        /// </summary>
+        /// <param name="input">Stream to hash</param>
+        /// <returns>Dictionary containing hashes on success, null on error</returns>
+#if NET48
+        public static Dictionary<Hash, string> GetStreamHashes(Stream input)
+#else
+        public static Dictionary<Hash, string?>? GetStreamHashes(Stream input)
+#endif
+        {
+            // Create the output dictionary
+#if NET48
+            var hashDict = new Dictionary<Hash, string>();
+#else
+            var hashDict = new Dictionary<Hash, string?>();
+#endif
+
+            try
+            {
+                // Get a list of hashers to run over the buffer
+                var hashers = new Dictionary<Hash, Hasher>
+                {
+                    { Hash.CRC32, new Hasher(Hash.CRC32) },
+                    { Hash.CRC64, new Hasher(Hash.CRC64) },
+                    { Hash.MD5, new Hasher(Hash.MD5) },
+                    { Hash.SHA1, new Hasher(Hash.SHA1) },
+                    { Hash.SHA256, new Hasher(Hash.SHA256) },
+                    { Hash.SHA384, new Hasher(Hash.SHA384) },
+                    { Hash.SHA512, new Hasher(Hash.SHA512) },
+                    { Hash.XxHash32, new Hasher(Hash.XxHash32) },
+                    { Hash.XxHash64, new Hasher(Hash.XxHash64) },
+                };
+
+                // Initialize the hashing helpers
+                var loadBuffer = new ThreadLoadBuffer(input);
+                int buffersize = 3 * 1024 * 1024;
+                byte[] buffer0 = new byte[buffersize];
+                byte[] buffer1 = new byte[buffersize];
+
+                /*
+                Please note that some of the following code is adapted from
+                RomVault. This is a modified version of how RomVault does
+                threaded hashing. As such, some of the terminology and code
+                is the same, though variable names and comments may have
+                been tweaked to better fit this code base.
+                */
+
+                // Pre load the first buffer
+                long refsize = input.Length;
+                int next = refsize > buffersize ? buffersize : (int)refsize;
+                input.Read(buffer0, 0, next);
+                int current = next;
+                refsize -= next;
+                bool bufferSelect = true;
+
+                while (current > 0)
+                {
+                    // Trigger the buffer load on the second buffer
+                    next = refsize > buffersize ? buffersize : (int)refsize;
+                    if (next > 0)
+                        loadBuffer.Trigger(bufferSelect ? buffer1 : buffer0, next);
+
+                    byte[] buffer = bufferSelect ? buffer0 : buffer1;
+
+                    // Run hashes in parallel
+                    Parallel.ForEach(hashers, h => h.Value.Process(buffer, current));
+
+                    // Wait for the load buffer worker, if needed
+                    if (next > 0)
+                        loadBuffer.Wait();
+
+                    // Setup for the next hashing step
+                    current = next;
+                    refsize -= next;
+                    bufferSelect = !bufferSelect;
+                }
+
+                // Finalize all hashing helpers
+                loadBuffer.Finish();
+                Parallel.ForEach(hashers, h => h.Value.Terminate());
+
+                // Get the results
+                hashDict[Hash.CRC32] = hashers[Hash.CRC32].CurrentHashString;
+                hashDict[Hash.CRC64] = hashers[Hash.CRC64].CurrentHashString;
+                hashDict[Hash.MD5] = hashers[Hash.MD5].CurrentHashString;
+                hashDict[Hash.SHA1] = hashers[Hash.SHA1].CurrentHashString;
+                hashDict[Hash.SHA256] = hashers[Hash.SHA256].CurrentHashString;
+                hashDict[Hash.SHA384] = hashers[Hash.SHA384].CurrentHashString;
+                hashDict[Hash.SHA512] = hashers[Hash.SHA512].CurrentHashString;
+                hashDict[Hash.XxHash32] = hashers[Hash.XxHash32].CurrentHashString;
+                hashDict[Hash.XxHash64] = hashers[Hash.XxHash64].CurrentHashString;
+                hashDict[Hash.CRC64] = hashers[Hash.CRC64].CurrentHashString;
+
+                // Dispose of the hashers
+                loadBuffer.Dispose();
+                foreach (var hasher in hashers.Values)
+                {
+                    hasher.Dispose();
+                }
+
+                return hashDict;
+            }
+            catch (IOException)
+            {
+                return null;
+            }
+            finally
+            {
+                input.Dispose();
             }
         }
 
-        public void Dispose()
-        {
-            _hasher.Dispose();
-        }
+        #endregion
+
+        #region Hashing
 
         /// <summary>
         /// Process a buffer of some length with the internal hash algorithm
         /// </summary>
         public void Process(byte[] buffer, int size)
         {
-            switch (HashType)
+            switch (_hasher)
             {
-                case Hash.CRC:
-                    (_hasher as OptimizedCRC).Update(buffer, 0, size);
+                case HashAlgorithm ha:
+                    ha.TransformBlock(buffer, 0, size, null, 0);
                     break;
-
-                case Hash.MD5:
-                case Hash.SHA1:
-                case Hash.SHA256:
-                case Hash.SHA384:
-                case Hash.SHA512:
-                    (_hasher as HashAlgorithm).TransformBlock(buffer, 0, size, null, 0);
+                case NonCryptographicHashAlgorithm ncha:
+                    var bufferSpan = new ReadOnlySpan<byte>(buffer, 0, size);
+                    ncha.Append(bufferSpan);
                     break;
             }
         }
@@ -98,57 +353,21 @@ namespace MPF.Core.Hashing
         /// <summary>
         /// Finalize the internal hash algorigthm
         /// </summary>
+        /// <remarks>NonCryptographicHashAlgorithm implementations do not need finalization</remarks>
         public void Terminate()
         {
-            byte[] emptyBuffer = new byte[0];
-            switch (HashType)
+            byte[] emptyBuffer = Array.Empty<byte>();
+            switch (_hasher)
             {
-                case Hash.CRC:
-                    (_hasher as OptimizedCRC).Update(emptyBuffer, 0, 0);
-                    break;
-
-                case Hash.MD5:
-                case Hash.SHA1:
-                case Hash.SHA256:
-                case Hash.SHA384:
-                case Hash.SHA512:
-                    (_hasher as HashAlgorithm).TransformFinalBlock(emptyBuffer, 0, 0);
+                case HashAlgorithm ha:
+                    ha.TransformFinalBlock(emptyBuffer, 0, 0);
                     break;
             }
         }
 
-        /// <summary>
-        /// Get internal hash as a byte array
-        /// </summary>
-        public byte[] GetHash()
-        {
-            switch (HashType)
-            {
-                case Hash.CRC:
-                    return BitConverter.GetBytes((_hasher as OptimizedCRC).Value).Reverse().ToArray();
+        #endregion
 
-                case Hash.MD5:
-                case Hash.SHA1:
-                case Hash.SHA256:
-                case Hash.SHA384:
-                case Hash.SHA512:
-                    return (_hasher as HashAlgorithm).Hash;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Get internal hash as a string
-        /// </summary>
-        public string GetHashString()
-        {
-            byte[] hash = GetHash();
-            if (hash == null)
-                return null;
-            
-            return ByteArrayToString(hash);
-        }
+        #region Helpers
 
         /// <summary>
         /// Convert a byte array to a hex string
@@ -156,7 +375,11 @@ namespace MPF.Core.Hashing
         /// <param name="bytes">Byte array to convert</param>
         /// <returns>Hex string representing the byte array</returns>
         /// <link>http://stackoverflow.com/questions/311165/how-do-you-convert-byte-array-to-hexadecimal-string-and-vice-versa</link>
+#if NET48
         private static string ByteArrayToString(byte[] bytes)
+#else
+        private static string? ByteArrayToString(byte[]? bytes)
+#endif
         {
             // If we get null in, we send null out
             if (bytes == null)
@@ -172,5 +395,7 @@ namespace MPF.Core.Hashing
                 return null;
             }
         }
+
+        #endregion
     }
 }

MPF.Core/Hashing/OptimizedCRC.cs

@@ -1,154 +0,0 @@
-/*
- 
- Copyright (c) 2012-2015 Eugene Larchenko (spct@mail.ru)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- 
-*/
-
-using System;
-
-//namespace OptimizedCRC
-namespace MPF.Core.Hashing
-{
-    internal class OptimizedCRC : IDisposable
-    {
-        private const uint kCrcPoly = 0xEDB88320;
-        private const uint kInitial = 0xFFFFFFFF;
-        private const int CRC_NUM_TABLES = 8;
-        private static readonly uint[] Table;
-
-        static OptimizedCRC()
-        {
-            unchecked
-            {
-                Table = new uint[256 * CRC_NUM_TABLES];
-                int i;
-                for (i = 0; i < 256; i++)
-                {
-                    uint r = (uint)i;
-                    for (int j = 0; j < 8; j++)
-                    {
-                        r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-                    }
-                    Table[i] = r;
-                }
-                for (; i < 256 * CRC_NUM_TABLES; i++)
-                {
-                    uint r = Table[i - 256];
-                    Table[i] = Table[r & 0xFF] ^ (r >> 8);
-                }
-            }
-        }
-
-        public uint UnsignedValue;
-
-        public OptimizedCRC()
-        {
-            Init();
-        }
-
-        /// <summary>
-        /// Reset CRC
-        /// </summary>
-        public void Init()
-        {
-            UnsignedValue = kInitial;
-        }
-
-        public int Value
-        {
-            get { return (int)~UnsignedValue; }
-        }
-
-        public void Update(byte[] data, int offset, int count)
-        {
-            new ArraySegment<byte>(data, offset, count);     // check arguments
-            if (count == 0)
-            {
-                return;
-            }
-
-            var table = OptimizedCRC.Table;
-
-            uint crc = UnsignedValue;
-
-            for (; (offset & 7) != 0 && count != 0; count--)
-            {
-                crc = (crc >> 8) ^ table[(byte)crc ^ data[offset++]];
-            }
-
-            if (count >= 8)
-            {
-                /*
-                 * Idea from 7-zip project sources (http://7-zip.org/sdk.html)
-                 */
-
-                int end = (count - 8) & ~7;
-                count -= end;
-                end += offset;
-
-                while (offset != end)
-                {
-                    crc ^= (uint)(data[offset] + (data[offset + 1] << 8) + (data[offset + 2] << 16) + (data[offset + 3] << 24));
-                    uint high = (uint)(data[offset + 4] + (data[offset + 5] << 8) + (data[offset + 6] << 16) + (data[offset + 7] << 24));
-                    offset += 8;
-
-                    crc = table[(byte)crc + 0x700]
-                        ^ table[(byte)(crc >>= 8) + 0x600]
-                        ^ table[(byte)(crc >>= 8) + 0x500]
-                        ^ table[/*(byte)*/(crc >> 8) + 0x400]
-                        ^ table[(byte)(high) + 0x300]
-                        ^ table[(byte)(high >>= 8) + 0x200]
-                        ^ table[(byte)(high >>= 8) + 0x100]
-                        ^ table[/*(byte)*/(high >> 8) + 0x000];
-                }
-            }
-
-            while (count-- != 0)
-            {
-                crc = (crc >> 8) ^ table[(byte)crc ^ data[offset++]];
-            }
-
-            UnsignedValue = crc;
-        }
-
-        static public int Compute(byte[] data, int offset, int count)
-        {
-            var crc = new OptimizedCRC();
-            crc.Update(data, offset, count);
-            return crc.Value;
-        }
-
-        static public int Compute(byte[] data)
-        {
-            return Compute(data, 0, data.Length);
-        }
-
-        static public int Compute(ArraySegment<byte> block)
-        {
-            return Compute(block.Array, block.Offset, block.Count);
-        }
-
-        public void Dispose()
-        {
-            UnsignedValue = 0;
-        }
-    }
-}

MPF.Core/Hashing/ThreadLoadBuffer.cs

@@ -11,7 +11,11 @@ namespace MPF.Core.Hashing
         private readonly AutoResetEvent _outEvent;
         private readonly Thread _tWorker;
 
+#if NET48
         private byte[] _buffer;
+#else
+        private byte[]? _buffer;
+#endif
         private int _size;
         private readonly Stream _ds;
         private bool _finished;
@@ -48,7 +52,8 @@ namespace MPF.Core.Hashing
                 }
                 try
                 {
-                    SizeRead = _ds.Read(_buffer, 0, _size);
+                    if (_buffer != null)
+                        SizeRead = _ds.Read(_buffer, 0, _size);
                 }
                 catch (Exception)
                 {

MPF.Core/MPF.Core.csproj

@@ -2,50 +2,33 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <VersionPrefix>2.7.4</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
+  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
-    <COMReference Include="IMAPI2">
-      <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="IMAPI2FS">
-      <Guid>{2C941FD0-975B-59BE-A960-9A2A262853A5}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
+  <ItemGroup>
+    <InternalsVisibleTo Include="MPF.Test" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.9.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0-preview.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SabreTools.Models" Version="1.1.2" />
+    <PackageReference Include="psxt001z" Version="0.21.0-beta1" />
+    <PackageReference Include="SabreTools.Models" Version="1.1.5" />
     <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.1.2" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.1.7" />
+    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
+    <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
+    <PackageReference Include="System.IO.Hashing" Version="7.0.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 

MPF.Core/Modules/Aaru/Constants.cs

@@ -1,4 +1,4 @@
-namespace MPF.Modules.Aaru
+namespace MPF.Core.Modules.Aaru
 {
     /// <summary>
     /// Top-level commands for Aaru

MPF.Core/Modules/Aaru/Converters.cs

@@ -1,6 +1,6 @@
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Modules.Aaru
+namespace MPF.Core.Modules.Aaru
 {
     public static class Converters
     {

MPF.Core/Modules/CleanRIp/Parameters.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -7,7 +6,9 @@ using MPF.Core.Converters;
 using MPF.Core.Data;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Modules.CleanRip
+#pragma warning disable IDE0051 // Remove unused private members
+
+namespace MPF.Core.Modules.CleanRip
 {
     /// <summary>
     /// Represents a generic set of CleanRip parameters
@@ -22,11 +23,19 @@ namespace MPF.Modules.CleanRip
         #endregion
 
         /// <inheritdoc/>
+#if NET48
         public Parameters(string parameters) : base(parameters) { }
+#else
+        public Parameters(string? parameters) : base(parameters) { }
+#endif
 
         /// <inheritdoc/>
-        public Parameters(RedumpSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, Options options)
-            : base(system, type, driveLetter, filename, driveSpeed, options)
+#if NET48
+        public Parameters(RedumpSystem? system, MediaType? type, string drivePath, string filename, int? driveSpeed, Options options)
+#else
+        public Parameters(RedumpSystem? system, MediaType? type, string? drivePath, string filename, int? driveSpeed, Options options)
+#endif
+            : base(system, type, drivePath, filename, driveSpeed, options)
         {
         }
 
@@ -35,7 +44,7 @@ namespace MPF.Modules.CleanRip
         /// <inheritdoc/>
         public override (bool, List<string>) CheckAllOutputFilesExist(string basePath, bool preCheck)
         {
-            List<string> missingFiles = new List<string>();
+            var missingFiles = new List<string>();
             switch (this.Type)
             {
                 case MediaType.DVD: // Only added here to help users; not strictly correct
@@ -60,18 +69,33 @@ namespace MPF.Modules.CleanRip
         }
 
         /// <inheritdoc/>
+#if NET48
         public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive drive, bool includeArtifacts)
+#else
+        public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive, bool includeArtifacts)
+#endif
         {
-            // TODO: Determine if there's a CleanRip version anywhere
-            info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
-            info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "-dumpinfo.txt")?.ToString("yyyy-MM-dd HH:mm:ss");
+            // Ensure that required sections exist
+            info = SubmissionInfoTool.EnsureAllSections(info);
+
+            // TODO: Determine if there's a CleanRip version anywhere
+#if NET48
+            info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
+#else
+            info.DumpingInfo!.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
+#endif
+            info.DumpingInfo.DumpingDate = InfoTool.GetFileModifiedDate(basePath + "-dumpinfo.txt")?.ToString("yyyy-MM-dd HH:mm:ss");
+
+            var datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt");
 
-            Datafile datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt");
-            
             // Get the individual hash data, as per internal
-            if (GetISOHashValues(datafile, out long size, out string crc32, out string md5, out string sha1))
+            if (InfoTool.GetISOHashValues(datafile, out long size, out var crc32, out var md5, out var sha1))
             {
+#if NET48
                 info.SizeAndChecksums.Size = size;
+#else
+                info.SizeAndChecksums!.Size = size;
+#endif
                 info.SizeAndChecksums.CRC32 = crc32;
                 info.SizeAndChecksums.MD5 = md5;
                 info.SizeAndChecksums.SHA1 = sha1;
@@ -79,7 +103,7 @@ namespace MPF.Modules.CleanRip
                 // Dual-layer discs have the same size and layerbreak
                 if (size == 8511160320)
                     info.SizeAndChecksums.Layerbreak = 2084960;
-            }            
+            }
 
             // Extract info based generically on MediaType
             switch (this.Type)
@@ -88,13 +112,23 @@ namespace MPF.Modules.CleanRip
                 case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     if (File.Exists(basePath + ".bca"))
+#if NET48
                         info.Extras.BCA = GetBCA(basePath + ".bca");
+#else
+                        info.Extras!.BCA = GetBCA(basePath + ".bca");
+#endif
 
-                    if (GetGameCubeWiiInformation(basePath + "-dumpinfo.txt", out Region? gcRegion, out string gcVersion, out string gcName))
+                    if (GetGameCubeWiiInformation(basePath + "-dumpinfo.txt", out Region? gcRegion, out var gcVersion, out var gcName))
                     {
+#if NET48
                         info.CommonDiscInfo.Region = gcRegion ?? info.CommonDiscInfo.Region;
                         info.VersionAndEditions.Version = gcVersion ?? info.VersionAndEditions.Version;
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName] = gcName ?? string.Empty;
+#else
+                        info.CommonDiscInfo!.Region = gcRegion ?? info.CommonDiscInfo.Region;
+                        info.VersionAndEditions!.Version = gcVersion ?? info.VersionAndEditions.Version;
+                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.InternalName] = gcName ?? string.Empty;
+#endif
                     }
 
                     break;
@@ -103,17 +137,23 @@ namespace MPF.Modules.CleanRip
             // Fill in any artifacts that exist, Base64-encoded, if we need to
             if (includeArtifacts)
             {
+#if NET48
+                if (info.Artifacts == null) info.Artifacts = new Dictionary<string, string>();
+#else
+                info.Artifacts ??= new Dictionary<string, string>();
+#endif
+
                 if (File.Exists(basePath + ".bca"))
-                    info.Artifacts["bca"] = GetBase64(GetFullFile(basePath + ".bca", binary: true));
+                    info.Artifacts["bca"] = GetBase64(GetFullFile(basePath + ".bca", binary: true)) ?? string.Empty;
                 if (File.Exists(basePath + "-dumpinfo.txt"))
-                    info.Artifacts["dumpinfo"] = GetBase64(GetFullFile(basePath + "-dumpinfo.txt"));
+                    info.Artifacts["dumpinfo"] = GetBase64(GetFullFile(basePath + "-dumpinfo.txt")) ?? string.Empty;
             }
         }
 
         /// <inheritdoc/>
         public override List<string> GetLogFilePaths(string basePath)
         {
-            List<string> logFiles = new List<string>();
+            var logFiles = new List<string>();
             switch (this.Type)
             {
                 case MediaType.DVD: // Only added here to help users; not strictly correct
@@ -140,13 +180,17 @@ namespace MPF.Modules.CleanRip
         /// <param name="iso">Path to ISO file</param>
         /// <param name="dumpinfo">Path to discinfo file</param>
         /// <returns></returns>
+#if NET48
         private static Datafile GenerateCleanripDatafile(string iso, string dumpinfo)
+#else
+        private static Datafile? GenerateCleanripDatafile(string iso, string dumpinfo)
+#endif
         {
             // If the file doesn't exist, we can't get info from it
             if (!File.Exists(dumpinfo))
                 return null;
 
-            using (StreamReader sr = File.OpenText(dumpinfo))
+            using (var sr = File.OpenText(dumpinfo))
             {
                 long size = new FileInfo(iso).Length;
                 string crc = string.Empty;
@@ -156,19 +200,30 @@ namespace MPF.Modules.CleanRip
                 try
                 {
                     // Make sure this file is a dumpinfo
-                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                    if (sr.ReadLine()?.Contains("--File Generated by CleanRip") != true)
                         return null;
 
                     // Read all lines and gather dat information
                     while (!sr.EndOfStream)
                     {
-                        string line = sr.ReadLine().Trim();
-                        if (line.StartsWith("CRC32"))
+                        var line = sr.ReadLine()?.Trim();
+                        if (string.IsNullOrWhiteSpace(line))
+                            continue;
+#if NET48
+                        else if (line.StartsWith("CRC32"))
                             crc = line.Substring(7).ToLowerInvariant();
                         else if (line.StartsWith("MD5"))
                             md5 = line.Substring(5);
                         else if (line.StartsWith("SHA-1"))
                             sha1 = line.Substring(7);
+#else
+                        else if (line.StartsWith("CRC32"))
+                            crc = line[7..].ToLowerInvariant();
+                        else if (line.StartsWith("MD5"))
+                            md5 = line[5..];
+                        else if (line.StartsWith("SHA-1"))
+                            sha1 = line[7..];
+#endif
                     }
 
                     return new Datafile
@@ -199,7 +254,11 @@ namespace MPF.Modules.CleanRip
         /// <param name="bcaPath">Path to the BCA file associated with the dump</param>
         /// <returns>BCA data as a hex string if possible, null on error</returns>
         /// <remarks>https://stackoverflow.com/questions/9932096/add-separator-to-string-at-every-n-characters</remarks>
+#if NET48
         private static string GetBCA(string bcaPath)
+#else
+        private static string? GetBCA(string bcaPath)
+#endif
         {
             // If the file doesn't exist, we can't get the info
             if (!File.Exists(bcaPath))
@@ -207,7 +266,10 @@ namespace MPF.Modules.CleanRip
 
             try
             {
-                string hex = GetFullFile(bcaPath, true);
+                var hex = GetFullFile(bcaPath, true);
+                if (hex == null)
+                    return null;
+
                 return Regex.Replace(hex, ".{32}", "$0\n");
             }
             catch
@@ -223,13 +285,17 @@ namespace MPF.Modules.CleanRip
         /// <param name="iso">Path to ISO file</param>
         /// <param name="dumpinfo">Path to discinfo file</param>
         /// <returns></returns>
+#if NET48
         private static string GetCleanripDatfile(string iso, string dumpinfo)
+#else
+        private static string? GetCleanripDatfile(string iso, string dumpinfo)
+#endif
         {
             // If the file doesn't exist, we can't get info from it
             if (!File.Exists(dumpinfo))
                 return null;
 
-            using (StreamReader sr = File.OpenText(dumpinfo))
+            using (var sr = File.OpenText(dumpinfo))
             {
                 long size = new FileInfo(iso).Length;
                 string crc = string.Empty;
@@ -239,19 +305,30 @@ namespace MPF.Modules.CleanRip
                 try
                 {
                     // Make sure this file is a dumpinfo
-                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                    if (sr.ReadLine()?.Contains("--File Generated by CleanRip") != true)
                         return null;
 
                     // Read all lines and gather dat information
                     while (!sr.EndOfStream)
                     {
-                        string line = sr.ReadLine().Trim();
-                        if (line.StartsWith("CRC32"))
+                        var line = sr.ReadLine()?.Trim();
+                        if (string.IsNullOrWhiteSpace(line))
+                            continue;
+#if NET48
+                        else if (line.StartsWith("CRC32"))
                             crc = line.Substring(7).ToLowerInvariant();
                         else if (line.StartsWith("MD5"))
                             md5 = line.Substring(5);
                         else if (line.StartsWith("SHA-1"))
                             sha1 = line.Substring(7);
+#else
+                        else if (line.StartsWith("CRC32"))
+                            crc = line[7..].ToLowerInvariant();
+                        else if (line.StartsWith("MD5"))
+                            md5 = line[5..];
+                        else if (line.StartsWith("SHA-1"))
+                            sha1 = line[7..];
+#endif
                     }
 
                     return $"<rom name=\"{Path.GetFileName(iso)}\" size=\"{size}\" crc=\"{crc}\" md5=\"{md5}\" sha1=\"{sha1}\" />";
@@ -272,7 +349,11 @@ namespace MPF.Modules.CleanRip
         /// <param name="version">Output internal version of the game</param>
         /// <param name="name">Output internal name of the game</param>
         /// <returns></returns>
+#if NET48
         private static bool GetGameCubeWiiInformation(string dumpinfo, out Region? region, out string version, out string name)
+#else
+        private static bool GetGameCubeWiiInformation(string dumpinfo, out Region? region, out string? version, out string? name)
+#endif
         {
             region = null; version = null; name = null;
 
@@ -280,29 +361,45 @@ namespace MPF.Modules.CleanRip
             if (!File.Exists(dumpinfo))
                 return false;
 
-            using (StreamReader sr = File.OpenText(dumpinfo))
+            using (var sr = File.OpenText(dumpinfo))
             {
                 try
                 {
                     // Make sure this file is a dumpinfo
-                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                    if (sr.ReadLine()?.Contains("--File Generated by CleanRip") != true)
                         return false;
 
                     // Read all lines and gather dat information
                     while (!sr.EndOfStream)
                     {
-                        string line = sr.ReadLine().Trim();
-                        if (line.StartsWith("Version"))
+                        var line = sr.ReadLine()?.Trim();
+                        if (string.IsNullOrWhiteSpace(line))
                         {
+                            continue;
+                        }
+                        else if (line.StartsWith("Version"))
+                        {
+#if NET48
                             version = line.Substring("Version: ".Length);
+#else
+                            version = line["Version: ".Length..];
+#endif
                         }
                         else if (line.StartsWith("Internal Name"))
                         {
+#if NET48
                             name = line.Substring("Internal Name: ".Length);
+#else
+                            name = line["Internal Name: ".Length..];
+#endif
                         }
                         else if (line.StartsWith("Filename"))
                         {
+#if NET48
                             string serial = line.Substring("Filename: ".Length);
+#else
+                            string serial = line["Filename: ".Length..];
+#endif
 
                             // char gameType = serial[0];
                             // string gameid = serial[1] + serial[2];

MPF.Core/Modules/Datafile.cs

@@ -1,72 +1,144 @@
 using System.Xml.Serialization;
 
-namespace MPF.Modules
+namespace MPF.Core.Modules
 {
     [XmlRoot("datafile")]
     public class Datafile
     {
         [XmlElement("header")]
+#if NET48
         public Header Header;
+#else
+        public Header? Header;
+#endif
 
         [XmlElement("game")]
+#if NET48
         public Game[] Games;
+#else
+        public Game[]? Games;
+#endif
     }
 
     public class Header
     {
         [XmlElement("name")]
+#if NET48
         public string Name;
+#else
+        public string? Name;
+#endif
 
         [XmlElement("description")]
+#if NET48
         public string Description;
+#else
+        public string? Description;
+#endif
 
         [XmlElement("version")]
+#if NET48
         public string Version;
+#else
+        public string? Version;
+#endif
 
         [XmlElement("date")]
+#if NET48
         public string Date;
+#else
+        public string? Date;
+#endif
 
         [XmlElement("author")]
+#if NET48
         public string Author;
+#else
+        public string? Author;
+#endif
 
         [XmlElement("homepage")]
+#if NET48
         public string Homepage;
+#else
+        public string? Homepage;
+#endif
 
         [XmlElement("url")]
+#if NET48
         public string Url;
+#else
+        public string? Url;
+#endif
     }
 
     public class Game
     {
         [XmlAttribute("name")]
+#if NET48
         public string Name;
+#else
+        public string? Name;
+#endif
 
         [XmlElement("category")]
+#if NET48
         public string Category;
+#else
+        public string? Category;
+#endif
 
         [XmlElement("description")]
+#if NET48
         public string Description;
+#else
+        public string? Description;
+#endif
 
         [XmlElement("rom")]
+#if NET48
         public Rom[] Roms;
+#else
+        public Rom[]? Roms;
+#endif
     }
 
     public class Rom
     {
         [XmlAttribute("name")]
+#if NET48
         public string Name;
+#else
+        public string? Name;
+#endif
 
         [XmlAttribute("size")]
+#if NET48
         public string Size;
+#else
+        public string? Size;
+#endif
 
         [XmlAttribute("crc")]
+#if NET48
         public string Crc;
+#else
+        public string? Crc;
+#endif
 
         [XmlAttribute("md5")]
+#if NET48
         public string Md5;
+#else
+        public string? Md5;
+#endif
 
         [XmlAttribute("sha1")]
+#if NET48
         public string Sha1;
+#else
+        public string? Sha1;
+#endif
 
         // TODO: Add extended hashes here
     }

MPF.Core/Modules/DiscImageCreator/Constants.cs

@@ -1,4 +1,4 @@
-namespace MPF.Modules.DiscImageCreator
+namespace MPF.Core.Modules.DiscImageCreator
 {
     /// <summary>
     /// Top-level commands for DiscImageCreator

MPF.Core/Modules/DiscImageCreator/Converters.cs

@@ -1,6 +1,6 @@
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Modules.DiscImageCreator
+namespace MPF.Core.Modules.DiscImageCreator
 {
     public static class Converters
     {
@@ -48,7 +48,11 @@ namespace MPF.Modules.DiscImageCreator
         /// <param name="baseCommand">Command value to check</param>
         /// <returns>MediaType if possible, null on error</returns>
         /// <remarks>This takes the "safe" route by assuming the larger of any given format</remarks>
+#if NET48
         public static MediaType? ToMediaType(string baseCommand)
+#else
+        public static MediaType? ToMediaType(string? baseCommand)
+#endif
         {
             switch (baseCommand)
             {
@@ -86,7 +90,11 @@ namespace MPF.Modules.DiscImageCreator
         /// </summary>
         /// <param name="type">MediaType value to check</param>
         /// <returns>Valid extension (with leading '.'), null on error</returns>
+#if NET48
         public static string Extension(MediaType? type)
+#else
+        public static string? Extension(MediaType? type)
+#endif
         {
             switch (type)
             {

MPF.Core/Modules/Redumper/Constants.cs

@@ -1,4 +1,4 @@
-namespace MPF.Modules.Redumper
+namespace MPF.Core.Modules.Redumper
 {
     /// <summary>
     /// Top-level commands for Redumper
@@ -69,5 +69,6 @@ namespace MPF.Modules.Redumper
         public const string RefineSubchannel = "--refine-subchannel";
         public const string Skip = "--skip";
         public const string DumpReadSize = "--dump-read-size";
+        public const string OverreadLeadout = "--overread-leadout";
     }
 }

MPF.Core/Modules/Redumper/Converters.cs

@@ -1,6 +1,6 @@
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Modules.Redumper
+namespace MPF.Core.Modules.Redumper
 {
     public static class Converters
     {
@@ -11,7 +11,11 @@ namespace MPF.Modules.Redumper
         /// </summary>
         /// <param name="type">MediaType value to check</param>
         /// <returns>Valid extension (with leading '.'), null on error</returns>
+#if NET48
         public static string Extension(MediaType? type)
+#else
+        public static string? Extension(MediaType? type)
+#endif
         {
             switch (type)
             {

MPF.Core/Modules/UmdImageCreator/Parameters.cs

@@ -4,9 +4,10 @@ using System.IO;
 using System.Linq;
 using MPF.Core.Converters;
 using MPF.Core.Data;
+using MPF.Core.Hashing;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.Modules.UmdImageCreator
+namespace MPF.Core.Modules.UmdImageCreator
 {
     /// <summary>
     /// Represents a generic set of UmdImageCreator parameters
@@ -21,11 +22,19 @@ namespace MPF.Modules.UmdImageCreator
         #endregion
 
         /// <inheritdoc/>
+#if NET48
         public Parameters(string parameters) : base(parameters) { }
+#else
+        public Parameters(string? parameters) : base(parameters) { }
+#endif
 
         /// <inheritdoc/>
-        public Parameters(RedumpSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, Options options)
-            : base(system, type, driveLetter, filename, driveSpeed, options)
+#if NET48
+        public Parameters(RedumpSystem? system, MediaType? type, string drivePath, string filename, int? driveSpeed, Options options)
+#else
+        public Parameters(RedumpSystem? system, MediaType? type, string? drivePath, string filename, int? driveSpeed, Options options)
+#endif
+            : base(system, type, drivePath, filename, driveSpeed, options)
         {
         }
 
@@ -34,7 +43,7 @@ namespace MPF.Modules.UmdImageCreator
         /// <inheritdoc/>
         public override (bool, List<string>) CheckAllOutputFilesExist(string basePath, bool preCheck)
         {
-            List<string> missingFiles = new List<string>();
+            var missingFiles = new List<string>();
             switch (this.Type)
             {
                 case MediaType.UMD:
@@ -61,32 +70,58 @@ namespace MPF.Modules.UmdImageCreator
         }
 
         /// <inheritdoc/>
+#if NET48
         public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive drive, bool includeArtifacts)
+#else
+        public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive, bool includeArtifacts)
+#endif
         {
+            // Ensure that required sections exist
+            info = SubmissionInfoTool.EnsureAllSections(info);
+
             // TODO: Determine if there's a UMDImageCreator version anywhere
+#if NET48
             info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
-            info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "_disc.txt")?.ToString("yyyy-MM-dd HH:mm:ss");
+#else
+            info.DumpingInfo!.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
+#endif
+            info.DumpingInfo.DumpingDate = InfoTool.GetFileModifiedDate(basePath + "_disc.txt")?.ToString("yyyy-MM-dd HH:mm:ss");
 
             // Extract info based generically on MediaType
             switch (this.Type)
             {
                 case MediaType.UMD:
+#if NET48
                     info.Extras.PVD = GetPVD(basePath + "_mainInfo.txt") ?? string.Empty;
+#else
+                    info.Extras!.PVD = GetPVD(basePath + "_mainInfo.txt") ?? string.Empty;
+#endif
 
-                    if (GetFileHashes(basePath + ".iso", out long filesize, out string crc32, out string md5, out string sha1))
+                    if (Hasher.GetFileHashes(basePath + ".iso", out long filesize, out var crc32, out var md5, out var sha1))
                     {
+#if NET48
                         info.SizeAndChecksums.Size = filesize;
+#else
+                        info.SizeAndChecksums!.Size = filesize;
+#endif
                         info.SizeAndChecksums.CRC32 = crc32;
                         info.SizeAndChecksums.MD5 = md5;
                         info.SizeAndChecksums.SHA1 = sha1;
                     }
 
-                    if (GetUMDAuxInfo(basePath + "_disc.txt", out string title, out DiscCategory? umdcat, out string umdversion, out string umdlayer, out long umdsize))
+                    if (GetUMDAuxInfo(basePath + "_disc.txt", out var title, out DiscCategory? umdcat, out var umdversion, out var umdlayer, out long umdsize))
                     {
+#if NET48
                         info.CommonDiscInfo.Title = title ?? string.Empty;
                         info.CommonDiscInfo.Category = umdcat ?? DiscCategory.Games;
                         info.VersionAndEditions.Version = umdversion ?? string.Empty;
                         info.SizeAndChecksums.Size = umdsize;
+#else
+                        info.CommonDiscInfo!.Title = title ?? string.Empty;
+                        info.CommonDiscInfo.Category = umdcat ?? DiscCategory.Games;
+                        info.VersionAndEditions!.Version = umdversion ?? string.Empty;
+                        info.SizeAndChecksums!.Size = umdsize;
+#endif
 
                         if (!string.IsNullOrWhiteSpace(umdlayer))
                             info.SizeAndChecksums.Layerbreak = Int64.Parse(umdlayer ?? "-1");
@@ -98,23 +133,29 @@ namespace MPF.Modules.UmdImageCreator
             // Fill in any artifacts that exist, Base64-encoded, if we need to
             if (includeArtifacts)
             {
+#if NET48
+                if (info.Artifacts == null) info.Artifacts = new Dictionary<string, string>();
+#else
+                info.Artifacts ??= new Dictionary<string, string>();
+#endif
+
                 if (File.Exists(basePath + "_disc.txt"))
-                    info.Artifacts["disc"] = GetBase64(GetFullFile(basePath + "_disc.txt"));
+                    info.Artifacts["disc"] = GetBase64(GetFullFile(basePath + "_disc.txt")) ?? string.Empty;
                 if (File.Exists(basePath + "_drive.txt"))
-                    info.Artifacts["drive"] = GetBase64(GetFullFile(basePath + "_drive.txt"));
+                    info.Artifacts["drive"] = GetBase64(GetFullFile(basePath + "_drive.txt")) ?? string.Empty;
                 if (File.Exists(basePath + "_mainError.txt"))
-                    info.Artifacts["mainError"] = GetBase64(GetFullFile(basePath + "_mainError.txt"));
+                    info.Artifacts["mainError"] = GetBase64(GetFullFile(basePath + "_mainError.txt")) ?? string.Empty;
                 if (File.Exists(basePath + "_mainInfo.txt"))
-                    info.Artifacts["mainInfo"] = GetBase64(GetFullFile(basePath + "_mainInfo.txt"));
+                    info.Artifacts["mainInfo"] = GetBase64(GetFullFile(basePath + "_mainInfo.txt")) ?? string.Empty;
                 if (File.Exists(basePath + "_volDesc.txt"))
-                    info.Artifacts["volDesc"] = GetBase64(GetFullFile(basePath + "_volDesc.txt"));
+                    info.Artifacts["volDesc"] = GetBase64(GetFullFile(basePath + "_volDesc.txt")) ?? string.Empty;
             }
         }
 
         /// <inheritdoc/>
         public override List<string> GetLogFilePaths(string basePath)
         {
-            List<string> logFiles = new List<string>();
+            var logFiles = new List<string>();
             switch (this.Type)
             {
                 case MediaType.UMD:
@@ -144,21 +185,25 @@ namespace MPF.Modules.UmdImageCreator
         /// </summary>
         /// <param name="mainInfo">_mainInfo.txt file location</param>
         /// <returns>Newline-deliminated PVD if possible, null on error</returns>
+#if NET48
         private static string GetPVD(string mainInfo)
+#else
+        private static string? GetPVD(string mainInfo)
+#endif
         {
             // If the file doesn't exist, we can't get info from it
             if (!File.Exists(mainInfo))
                 return null;
 
-            using (StreamReader sr = File.OpenText(mainInfo))
+            using (var sr = File.OpenText(mainInfo))
             {
                 try
                 {
                     // Make sure we're in the right sector
-                    while (!sr.ReadLine().StartsWith("========== LBA[000016, 0x0000010]: Main Channel ==========")) ;
+                    while (sr.ReadLine()?.StartsWith("========== LBA[000016, 0x0000010]: Main Channel ==========") == false) ;
 
                     // Fast forward to the PVD
-                    while (!sr.ReadLine().StartsWith("0310")) ;
+                    while (sr.ReadLine()?.StartsWith("0310") == false) ;
 
                     // Now that we're at the PVD, read each line in and concatenate
                     string pvd = "";
@@ -180,7 +225,11 @@ namespace MPF.Modules.UmdImageCreator
         /// </summary>
         /// <param name="disc">_disc.txt file location</param>
         /// <returns>True on successful extraction of info, false otherwise</returns>
+#if NET48
         private static bool GetUMDAuxInfo(string disc, out string title, out DiscCategory? umdcat, out string umdversion, out string umdlayer, out long umdsize)
+#else
+        private static bool GetUMDAuxInfo(string disc, out string? title, out DiscCategory? umdcat, out string? umdversion, out string? umdlayer, out long umdsize)
+#endif
         {
             title = null; umdcat = null; umdversion = null; umdlayer = null; umdsize = -1;
 
@@ -188,22 +237,28 @@ namespace MPF.Modules.UmdImageCreator
             if (!File.Exists(disc))
                 return false;
 
-            using (StreamReader sr = File.OpenText(disc))
+            using (var sr = File.OpenText(disc))
             {
                 try
                 {
                     // Loop through everything to get the first instance of each required field
-                    string line = string.Empty;
+                    var line = string.Empty;
                     while (!sr.EndOfStream)
                     {
-                        line = sr.ReadLine().Trim();
+                        line = sr.ReadLine()?.Trim();
+                        if (line == null)
+                            break;
 
                         if (line.StartsWith("TITLE") && title == null)
+#if NET48
                             title = line.Substring("TITLE: ".Length);
+#else
+                            title = line["TITLE: ".Length..];
+#endif
                         else if (line.StartsWith("DISC_VERSION") && umdversion == null)
                             umdversion = line.Split(' ')[1];
                         else if (line.StartsWith("pspUmdTypes"))
-                            umdcat = GetUMDCategory(line.Split(' ')[1]);
+                            umdcat = InfoTool.GetUMDCategory(line.Split(' ')[1]);
                         else if (line.StartsWith("L0 length"))
                             umdlayer = line.Split(' ')[2];
                         else if (line.StartsWith("FileSize:"))
@@ -211,7 +266,7 @@ namespace MPF.Modules.UmdImageCreator
                     }
 
                     // If the L0 length is the size of the full disc, there's no layerbreak
-                    if (Int64.Parse(umdlayer) * 2048 == umdsize)
+                    if (Int64.TryParse(umdlayer, out long umdlayerValue) && umdlayerValue * 2048 == umdsize)
                         umdlayer = null;
 
                     return true;

MPF.Core/Protection.cs

@@ -4,11 +4,11 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using BinaryObjectScanner;
 using BinaryObjectScanner.Protection;
-using BurnOutSharp;
 using psxt001z;
 
-namespace MPF.Library
+namespace MPF.Core
 {
     public static class Protection
     {
@@ -19,7 +19,11 @@ namespace MPF.Library
         /// <param name="options">Options object that determines what to scan</param>
         /// <param name="progress">Optional progress callback</param>
         /// <returns>Set of all detected copy protections with an optional error string</returns>
-        public static async Task<(Dictionary<string, List<string>>, string)> RunProtectionScanOnPath(string path, Core.Data.Options options, IProgress<ProtectionProgress> progress = null)
+#if NET48
+        public static async Task<(Dictionary<string, List<string>>, string)> RunProtectionScanOnPath(string path, Data.Options options, IProgress<ProtectionProgress> progress = null)
+#else
+        public static async Task<(Dictionary<string, List<string>>?, string?)> RunProtectionScanOnPath(string path, Data.Options options, IProgress<ProtectionProgress>? progress = null)
+#endif
         {
             try
             {
@@ -62,11 +66,15 @@ namespace MPF.Library
         /// </summary>
         /// <param name="protections">Dictionary of file to list of protection mappings</param>
         /// <returns>Detected protections, if any</returns>
+#if NET48
         public static string FormatProtections(Dictionary<string, List<string>> protections)
+#else
+        public static string? FormatProtections(Dictionary<string, List<string>>? protections)
+#endif
         {
             // If the filtered list is empty in some way, return
             if (protections == null || !protections.Any())
-                return "None found";
+                return "None found [OMIT FROM SUBMISSION]";
 
             // Get an ordered list of distinct found protections
             var orderedDistinctProtections = protections
@@ -77,7 +85,7 @@ namespace MPF.Library
             // Sanitize and join protections for writing
             string protectionString = SanitizeFoundProtections(orderedDistinctProtections);
             if (string.IsNullOrWhiteSpace(protectionString))
-                return "None found";
+                return "None found [OMIT FROM SUBMISSION]";
 
             return protectionString;
         }
@@ -87,8 +95,16 @@ namespace MPF.Library
         /// </summary>
         /// <param name="path">Path to scan for anti-modchip strings</param>
         /// <returns>Anti-modchip existence if possible, false on error</returns>
+#if NET48
         public static async Task<bool> GetPlayStationAntiModchipDetected(string path)
+#else
+        public static async Task<bool> GetPlayStationAntiModchipDetected(string? path)
+#endif
         {
+            // If there is no valid path
+            if (string.IsNullOrEmpty(path))
+                return false;
+
             return await Task.Run(() =>
             {
                 try
@@ -99,7 +115,7 @@ namespace MPF.Library
                         try
                         {
                             byte[] fileContent = File.ReadAllBytes(file);
-                            string protection = antiModchip.CheckContents(file, fileContent, false);
+                            var protection = antiModchip.CheckContents(file, fileContent, false);
                             if (!string.IsNullOrWhiteSpace(protection))
                                 return true;
                         }
@@ -132,12 +148,21 @@ namespace MPF.Library
         /// <param name="foundProtections">Enumerable of found protections</param>
         public static string SanitizeFoundProtections(IEnumerable<string> foundProtections)
         {
+            // EXCEPTIONS
+            if (foundProtections.Any(p => p.StartsWith("[Exception opening file")))
+            {
+                foundProtections = foundProtections.Where(p => !p.StartsWith("[Exception opening file"));
+                foundProtections = foundProtections
+                    .Prepend("Exception occurred while scanning [RESCAN NEEDED]")
+                    .OrderBy(p => p);
+            }
+
             // ActiveMARK
             if (foundProtections.Any(p => p == "ActiveMARK 5") && foundProtections.Any(p => p == "ActiveMARK"))
                 foundProtections = foundProtections.Where(p => p != "ActiveMARK");
 
             // Cactus Data Shield
-            if (foundProtections.Any(p => Regex.IsMatch(p, @"Cactus Data Shield [0-9]{3} .+")) && foundProtections.Any(p => p == "Cactus Data Shield 200"))
+            if (foundProtections.Any(p => Regex.IsMatch(p, @"Cactus Data Shield [0-9]{3} .+", RegexOptions.Compiled)) && foundProtections.Any(p => p == "Cactus Data Shield 200"))
                 foundProtections = foundProtections.Where(p => p != "Cactus Data Shield 200");
 
             // CD-Check
@@ -167,7 +192,7 @@ namespace MPF.Library
             // JoWood X-Prot
             if (foundProtections.Any(p => p.StartsWith("JoWood X-Prot")))
             {
-                if (foundProtections.Any(p => Regex.IsMatch(p, @"JoWood X-Prot [0-9]\.[0-9]\.[0-9]\.[0-9]{2}")))
+                if (foundProtections.Any(p => Regex.IsMatch(p, @"JoWood X-Prot [0-9]\.[0-9]\.[0-9]\.[0-9]{2}", RegexOptions.Compiled)))
                 {
                     foundProtections = foundProtections.Where(p => p != "JoWood X-Prot")
                         .Where(p => p != "JoWood X-Prot v1.0-v1.3")
@@ -216,28 +241,28 @@ namespace MPF.Library
             // SafeDisc
             if (foundProtections.Any(p => p.StartsWith("SafeDisc")))
             {
-                if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}")))
+                if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)))
                 {
                     foundProtections = foundProtections.Where(p => !p.StartsWith("Macrovision Protected Application"))
                         .Where(p => !p.StartsWith("Macrovision Protection File"))
                         .Where(p => !p.StartsWith("Macrovision Security Driver"))
                         .Where(p => p != "SafeDisc")
-                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}-[0-9]\.[0-9]{2}\.[0-9]{3}")))
-                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+")))
+                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}-[0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)))
+                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+", RegexOptions.Compiled)))
                         .Where(p => p != "SafeDisc 1/Lite")
                         .Where(p => p != "SafeDisc 2+");
                 }
-                else if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}-[0-9]\.[0-9]{2}\.[0-9]{3}")))
+                else if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}-[0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)))
                 {
                     foundProtections = foundProtections.Where(p => !p.StartsWith("Macrovision Protected Application"))
                         .Where(p => !p.StartsWith("Macrovision Protection File"))
                         .Where(p => !p.StartsWith("Macrovision Security Driver"))
                         .Where(p => p != "SafeDisc")
-                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+")))
+                        .Where(p => !(Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+", RegexOptions.Compiled)))
                         .Where(p => p != "SafeDisc 1/Lite")
                         .Where(p => p != "SafeDisc 2+");
                 }
-                else if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+")))
+                else if (foundProtections.Any(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}/+", RegexOptions.Compiled)))
                 {
                     foundProtections = foundProtections.Where(p => !p.StartsWith("Macrovision Protected Application"))
                         .Where(p => !p.StartsWith("Macrovision Protection File"))
@@ -277,7 +302,7 @@ namespace MPF.Library
             // StarForce
             if (foundProtections.Any(p => p.StartsWith("StarForce")))
             {
-                if (foundProtections.Any(p => Regex.IsMatch(p, @"StarForce [0-9]+\..+")))
+                if (foundProtections.Any(p => Regex.IsMatch(p, @"StarForce [0-9]+\..+", RegexOptions.Compiled)))
                 {
                     foundProtections = foundProtections.Where(p => p != "StarForce")
                         .Where(p => p != "StarForce 3-5")

MPF.Core/UI/ComboBoxItems/Element.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using MPF.Core.Converters;
 
-namespace MPF.UI.Core.ComboBoxItems
+namespace MPF.Core.UI.ComboBoxItems
 {
     /// <summary>
     /// A generic combo box element
     /// </summary>
     /// <typeparam name="T">Enum type representing the possible values</typeparam>
-    public class Element<T> : IElement where T : struct, Enum
+    public class Element<T> : IEquatable<Element<T>>, IElement where T : struct, Enum
     {
         private readonly T Data;
 
@@ -47,5 +47,18 @@ namespace MPF.UI.Core.ComboBoxItems
                 .OfType<T>()
                 .Select(e => new Element<T>(e));
         }
+
+        /// <inheritdoc/>
+#if NET48
+        public bool Equals(Element<T> other)
+#else
+        public bool Equals(Element<T>? other)
+#endif
+        {
+            if (other == null)
+                return false;
+
+            return Name == other.Name;
+        }
     }
 }

MPF.Core/UI/ComboBoxItems/IElement.cs

@@ -1,4 +1,4 @@
-namespace MPF.UI.Core.ComboBoxItems
+namespace MPF.Core.UI.ComboBoxItems
 {
     public interface IElement
     {

MPF.Core/UI/ComboBoxItems/RedumpSystemComboBoxItem.cs

@@ -1,18 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MPF.Core.Utilities;
-using MPF.UI.Core.ComboBoxItems;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.UI.Core.ComboBoxItems
+namespace MPF.Core.UI.ComboBoxItems
 {
     /// <summary>
     /// Represents a single item in the System combo box
     /// </summary>
-    public class RedumpSystemComboBoxItem : IElement
+    public class RedumpSystemComboBoxItem : IEquatable<RedumpSystemComboBoxItem>, IElement
     {
+#if NET48
         private readonly object Data;
+#else
+        private readonly object? Data;
+#endif
 
         public RedumpSystemComboBoxItem(RedumpSystem? system) => Data = system;
         public RedumpSystemComboBoxItem(SystemCategory? category) => Data = category;
@@ -81,5 +83,18 @@ namespace MPF.UI.Core.ComboBoxItems
 
             return systemsValues;
         }
+
+        /// <inheritdoc/>
+#if NET48
+        public bool Equals(RedumpSystemComboBoxItem other)
+#else
+        public bool Equals(RedumpSystemComboBoxItem? other)
+#endif
+        {
+            if (other == null)
+                return false;
+
+            return Value == other.Value;
+        }
     }
 }

MPF.Core/UI/ViewModels/DiscInformationViewModel.cs

@@ -0,0 +1,257 @@
+using System.Collections.Generic;
+using System.Linq;
+using MPF.Core.Data;
+using MPF.Core.UI.ComboBoxItems;
+using MPF.Core.Utilities;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.Core.UI.ViewModels
+{
+    public class DiscInformationViewModel
+    {
+        #region Fields
+
+        /// <summary>
+        /// Application-level Options object
+        /// </summary>
+        public Options Options { get; private set; }
+
+        /// <summary>
+        /// SubmissionInfo object to fill and save
+        /// </summary>
+        public SubmissionInfo SubmissionInfo { get; private set; }
+
+        #endregion
+
+        #region Lists
+
+        /// <summary>
+        /// List of available disc categories
+        /// </summary>
+        public List<Element<DiscCategory>> Categories { get; private set; } = Element<DiscCategory>.GenerateElements().ToList();
+
+        /// <summary>
+        /// List of available regions
+        /// </summary>
+        public List<Element<Region>> Regions { get; private set; } = Element<Region>.GenerateElements().ToList();
+
+        /// <summary>
+        /// List of Redump-supported Regions
+        /// </summary>
+#if NET48
+        private static readonly List<Region> RedumpRegions = new List<Region>
+#else
+        private static readonly List<Region> RedumpRegions = new()
+#endif
+        {
+            Region.Argentina,
+            Region.Asia,
+            Region.AsiaEurope,
+            Region.AsiaUSA,
+            Region.Australia,
+            Region.AustraliaGermany,
+            Region.AustraliaNewZealand,
+            Region.Austria,
+            Region.AustriaSwitzerland,
+            Region.Belarus,
+            Region.Belgium,
+            Region.BelgiumNetherlands,
+            Region.Brazil,
+            Region.Bulgaria,
+            Region.Canada,
+            Region.China,
+            Region.Croatia,
+            Region.Czechia,
+            Region.Denmark,
+            Region.Estonia,
+            Region.Europe,
+            Region.EuropeAsia,
+            Region.EuropeAustralia,
+            Region.EuropeCanada,
+            Region.EuropeGermany,
+            Region.Export,
+            Region.Finland,
+            Region.France,
+            Region.FranceSpain,
+            Region.Germany,
+            Region.GreaterChina,
+            Region.Greece,
+            Region.Hungary,
+            Region.Iceland,
+            Region.India,
+            Region.Ireland,
+            Region.Israel,
+            Region.Italy,
+            Region.Japan,
+            Region.JapanAsia,
+            Region.JapanEurope,
+            Region.JapanKorea,
+            Region.JapanUSA,
+            Region.SouthKorea,
+            Region.LatinAmerica,
+            Region.Lithuania,
+            Region.Netherlands,
+            Region.NewZealand,
+            Region.Norway,
+            Region.Poland,
+            Region.Portugal,
+            Region.Romania,
+            Region.RussianFederation,
+            Region.Scandinavia,
+            Region.Serbia,
+            Region.Singapore,
+            Region.Slovakia,
+            Region.SouthAfrica,
+            Region.Spain,
+            Region.SpainPortugal,
+            Region.Sweden,
+            Region.Switzerland,
+            Region.Taiwan,
+            Region.Thailand,
+            Region.Turkey,
+            Region.UnitedArabEmirates,
+            Region.UnitedKingdom,
+            Region.UKAustralia,
+            Region.Ukraine,
+            Region.UnitedStatesOfAmerica,
+            Region.USAAsia,
+            Region.USAAustralia,
+            Region.USABrazil,
+            Region.USACanada,
+            Region.USAEurope,
+            Region.USAGermany,
+            Region.USAJapan,
+            Region.USAKorea,
+            Region.World,
+        };
+
+        /// <summary>
+        /// List of available languages
+        /// </summary>
+        public List<Element<Language>> Languages { get; private set; } = Element<Language>.GenerateElements().ToList();
+
+        /// <summary>
+        /// List of Redump-supported Languages
+        /// </summary>
+#if NET48
+        private static readonly List<Language> RedumpLanguages = new List<Language>
+#else
+        private static readonly List<Language> RedumpLanguages = new()
+#endif
+        {
+            Language.Afrikaans,
+            Language.Albanian,
+            Language.Arabic,
+            Language.Armenian,
+            Language.Basque,
+            Language.Belarusian,
+            Language.Bulgarian,
+            Language.Catalan,
+            Language.Chinese,
+            Language.Croatian,
+            Language.Czech,
+            Language.Danish,
+            Language.Dutch,
+            Language.English,
+            Language.Estonian,
+            Language.Finnish,
+            Language.French,
+            Language.Gaelic,
+            Language.German,
+            Language.Greek,
+            Language.Hebrew,
+            Language.Hindi,
+            Language.Hungarian,
+            Language.Icelandic,
+            Language.Indonesian,
+            Language.Italian,
+            Language.Japanese,
+            Language.Korean,
+            Language.Latin,
+            Language.Latvian,
+            Language.Lithuanian,
+            Language.Macedonian,
+            Language.Norwegian,
+            Language.Polish,
+            Language.Portuguese,
+            Language.Panjabi,
+            Language.Romanian,
+            Language.Russian,
+            Language.Serbian,
+            Language.Slovak,
+            Language.Slovenian,
+            Language.Spanish,
+            Language.Swedish,
+            Language.Tamil,
+            Language.Thai,
+            Language.Turkish,
+            Language.Ukrainian,
+            Language.Vietnamese,
+        };
+
+        /// <summary>
+        /// List of available languages
+        /// </summary>
+        public List<Element<LanguageSelection>> LanguageSelections { get; private set; } = Element<LanguageSelection>.GenerateElements().ToList();
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+#if NET48
+        public DiscInformationViewModel(Options options, SubmissionInfo submissionInfo)
+#else
+        public DiscInformationViewModel(Options options, SubmissionInfo? submissionInfo)
+#endif
+        {
+            Options = options;
+            SubmissionInfo = submissionInfo?.Clone() as SubmissionInfo ?? new SubmissionInfo();
+        }
+
+        #region Helpers
+
+        /// <summary>
+        /// Load the current contents of the base SubmissionInfo to the UI
+        /// </summary>
+        /// TODO: Convert selected list item to binding
+        public void Load()
+        {
+            if (SubmissionInfo.CommonDiscInfo?.Languages != null)
+                Languages.ForEach(l => l.IsChecked = SubmissionInfo.CommonDiscInfo.Languages.Contains(l));
+            if (SubmissionInfo.CommonDiscInfo?.LanguageSelection != null)
+                LanguageSelections.ForEach(ls => ls.IsChecked = SubmissionInfo.CommonDiscInfo.LanguageSelection.Contains(ls));
+        }
+
+        /// <summary>
+        /// Save the current contents of the UI to the base SubmissionInfo
+        /// </summary>
+        /// TODO: Convert selected list item to binding
+        public void Save()
+        {
+            if (SubmissionInfo.CommonDiscInfo == null) SubmissionInfo.CommonDiscInfo = new CommonDiscInfoSection();
+            SubmissionInfo.CommonDiscInfo.Languages = Languages.Where(l => l.IsChecked).Select(l => l?.Value).ToArray();
+            if (!SubmissionInfo.CommonDiscInfo.Languages.Any())
+                SubmissionInfo.CommonDiscInfo.Languages = new Language?[] { null };
+            SubmissionInfo.CommonDiscInfo.LanguageSelection = LanguageSelections.Where(ls => ls.IsChecked).Select(ls => ls?.Value).ToArray();
+        }
+
+        /// <summary>
+        /// Repopulate the list of Languages based on Redump support
+        /// </summary>
+        public void SetRedumpLanguages()
+        {
+            this.Languages = RedumpLanguages.Select(l => new Element<Language>(l)).ToList();
+        }
+
+        /// <summary>
+        /// Repopulate the list of Regions based on Redump support
+        /// </summary>
+        public void SetRedumpRegions()
+        {
+            this.Regions = RedumpRegions.Select(r => new Element<Region>(r)).ToList();
+        }
+
+        #endregion
+    }
+}

MPF.Core/UI/ViewModels/OptionsViewModel.cs

@@ -0,0 +1,124 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using MPF.Core.Data;
+using MPF.Core.UI.ComboBoxItems;
+using SabreTools.RedumpLib.Web;
+
+namespace MPF.Core.UI.ViewModels
+{
+    public class OptionsViewModel : INotifyPropertyChanged
+    {
+        #region Fields
+
+        /// <summary>
+        /// Title for the window
+        /// </summary>
+#if NET48
+        public string Title
+#else
+        public string? Title
+#endif
+        {
+            get => _title;
+            set
+            {
+                _title = value;
+                TriggerPropertyChanged(nameof(Title));
+            }
+        }
+#if NET48
+        private string _title;
+#else
+        private string? _title;
+#endif
+
+        /// <summary>
+        /// Current set of options
+        /// </summary>
+        public Options Options { get; }
+
+        /// <summary>
+        /// Flag for if settings were saved or not
+        /// </summary>
+        public bool SavedSettings { get; set; }
+
+        /// <inheritdoc/>
+#if NET48
+        public event PropertyChangedEventHandler PropertyChanged;
+#else
+        public event PropertyChangedEventHandler? PropertyChanged;
+#endif
+
+#endregion
+
+        #region Lists
+
+        /// <summary>
+        /// List of available internal programs
+        /// </summary>
+        public List<Element<InternalProgram>> InternalPrograms => PopulateInternalPrograms();
+
+        /// <summary>
+        /// Current list of supported system profiles
+        /// </summary>
+        public List<RedumpSystemComboBoxItem> Systems => RedumpSystemComboBoxItem.GenerateElements().ToList();
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public OptionsViewModel(Options baseOptions)
+        {
+            Options = new Options(baseOptions);
+        }
+
+        #region Population
+
+        /// <summary>
+        /// Get a complete list of  supported internal programs
+        /// </summary>
+        private static List<Element<InternalProgram>> PopulateInternalPrograms()
+        {
+            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, InternalProgram.Redumper };
+            return internalPrograms.Select(ip => new Element<InternalProgram>(ip)).ToList();
+        }
+
+        #endregion
+
+        #region UI Commands
+
+        /// <summary>
+        /// Test Redump login credentials
+        /// </summary>
+#if NET48
+        public (bool?, string) TestRedumpLogin(string username, string password)
+#else
+        public async Task<(bool?, string?)> TestRedumpLogin(string username, string password)
+#endif
+        {
+#if NET48
+            return RedumpWebClient.ValidateCredentials(username, password);
+#else
+            return await RedumpHttpClient.ValidateCredentials(username, password);
+#endif
+        }
+
+        #endregion
+
+        #region Property Updates
+
+        /// <summary>
+        /// Trigger a property changed event
+        /// </summary>
+        private void TriggerPropertyChanged(string propertyName)
+        {
+            // If the property change event is initialized
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        #endregion
+    }
+}

MPF.Core/Utilities/Chime.cs

@@ -1,4 +1,6 @@
-using System;
+#if FALSE
+
+using System;
 
 namespace MPF.Core.Utilities
 {
@@ -394,3 +396,5 @@ namespace MPF.Core.Utilities
         }
     }
 }
+
+#endif

MPF.Core/Utilities/Logging.cs

@@ -14,7 +14,11 @@ namespace MPF.Core.Utilities
         /// <param name="reader">TextReader representing the input</param>
         /// <param name="baseClass">Invoking class, passed on to the event handler</param>
         /// <param name="handler">Event handler to be invoked to write to log</param>
+#if NET48
         public static async Task OutputToLog(TextReader reader, object baseClass, EventHandler<string> handler)
+#else
+        public static async Task OutputToLog(TextReader reader, object baseClass, EventHandler<string>? handler)
+#endif
         {
             // Initialize the required variables
             char[] buffer = new char[256];
@@ -63,7 +67,11 @@ namespace MPF.Core.Utilities
         /// <param name="line">Current line to process</param>
         /// <param name="baseClass">Invoking class, passed on to the event handler</param>
         /// <param name="handler">Event handler to be invoked to write to log</param>
+#if NET48
         private static void ProcessNewLines(StringBuilder sb, string line, object baseClass, EventHandler<string> handler)
+#else
+        private static void ProcessNewLines(StringBuilder sb, string line, object baseClass, EventHandler<string>? handler)
+#endif
         {
             line = line.Replace("\r\n", "\n");
             var split = line.Split('\n');
@@ -105,7 +113,11 @@ namespace MPF.Core.Utilities
         /// <param name="line">Current line to process</param>
         /// <param name="baseClass">Invoking class, passed on to the event handler</param>
         /// <param name="handler">Event handler to be invoked to write to log</param>
+#if NET48
         private static void ProcessCarriageReturns(StringBuilder sb, string line, object baseClass, EventHandler<string> handler)
+#else
+        private static void ProcessCarriageReturns(StringBuilder sb, string line, object baseClass, EventHandler<string>? handler)
+#endif
         {
             var split = line.Split('\r');
 

MPF.Core/Utilities/OptionsLoader.cs

@@ -1,18 +1,99 @@
-using System.Collections.Generic;
-using System.Configuration;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using MPF.Core.Converters;
 using MPF.Core.Data;
+using Newtonsoft.Json;
+using SabreTools.RedumpLib.Data;
 
 namespace MPF.Core.Utilities
 {
     public static class OptionsLoader
     {
+        private const string ConfigurationPath = "config.json";
+
         #region Arguments
 
+        /// <summary>
+        /// Process any standalone arguments for the program
+        /// </summary>
+        /// <returns>True if one of the arguments was processed, false otherwise</returns>
+        public static bool? ProcessStandaloneArguments(string[] args)
+        {
+            // Help options
+            if (args.Length == 0 || args[0] == "-h" || args[0] == "-?")
+                return false;
+
+            // List options
+            if (args[0] == "-lm" || args[0] == "--listmedia")
+            {
+                Console.WriteLine("Supported Media Types:");
+                foreach (string mediaType in Extensions.ListMediaTypes())
+                {
+                    Console.WriteLine(mediaType);
+                }
+                Console.ReadLine();
+                return true;
+            }
+            else if (args[0] == "-lp" || args[0] == "--listprograms")
+            {
+                Console.WriteLine("Supported Programs:");
+                foreach (string program in EnumExtensions.ListPrograms())
+                {
+                    Console.WriteLine(program);
+                }
+                Console.ReadLine();
+                return true;
+            }
+            else if (args[0] == "-ls" || args[0] == "--listsystems")
+            {
+                Console.WriteLine("Supported Systems:");
+                foreach (string system in Extensions.ListSystems())
+                {
+                    Console.WriteLine(system);
+                }
+                Console.ReadLine();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Process common arguments for all functionality
+        /// </summary>
+        /// <returns>True if all arguments pass, false otherwise</returns>
+#if NET48
+        public static (bool, MediaType, RedumpSystem?, string) ProcessCommonArguments(string[] args)
+#else
+        public static (bool, MediaType, RedumpSystem?, string?) ProcessCommonArguments(string[] args)
+#endif
+        {
+            // All other use requires at least 3 arguments
+            if (args.Length < 3)
+                return (false, MediaType.NONE, null, "Invalid number of arguments");
+
+            // Check the MediaType
+            var mediaType = EnumConverter.ToMediaType(args[0].Trim('"'));
+            if (mediaType == MediaType.NONE)
+                return (false, MediaType.NONE, null, $"{args[0]} is not a recognized media type");
+
+            // Check the RedumpSystem
+            var knownSystem = Extensions.ToRedumpSystem(args[1].Trim('"'));
+            if (knownSystem == null)
+                return (false, MediaType.NONE, null, $"{args[1]} is not a recognized system");
+
+            return (true, mediaType, knownSystem, null);
+        }
+
         /// <summary>
         /// Load the current set of options from application arguments
         /// </summary>
-        public static (Options, string, int) LoadFromArguments(string[] args, int startIndex = 0)
+#if NET48
+        public static (Options, SubmissionInfo, string, int) LoadFromArguments(string[] args, int startIndex = 0)
+#else
+        public static (Options, SubmissionInfo?, string?, int) LoadFromArguments(string[] args, int startIndex = 0)
+#endif
         {
             // Create the output values with defaults
             var options = new Options()
@@ -20,28 +101,50 @@ namespace MPF.Core.Utilities
                 RedumpUsername = null,
                 RedumpPassword = null,
                 InternalProgram = InternalProgram.NONE,
+                AddFilenameSuffix = false,
                 OutputSubmissionJSON = false,
                 CompressLogFiles = false,
+                DeleteUnnecessaryFiles = false,
             };
 
+            // Create the submission info to return, if necessary
+#if NET48
+            SubmissionInfo info = null;
             string parsedPath = null;
+#else
+            SubmissionInfo? info = null;
+            string? parsedPath = null;
+#endif
 
             // These values require multiple parts to be active
             bool scan = false, protectFile = false;
 
             // If we have no arguments, just return
             if (args == null || args.Length == 0)
-                return (options, null, 0);
+                return (options, null, null, 0);
 
             // If we have an invalid start index, just return
             if (startIndex < 0 || startIndex >= args.Length)
-                return (options, null, startIndex);
+                return (options, null, null, startIndex);
 
             // Loop through the arguments and parse out values
             for (; startIndex < args.Length; startIndex++)
             {
+                // Use specific program
+                if (args[startIndex].StartsWith("-u=") || args[startIndex].StartsWith("--use="))
+                {
+                    string internalProgram = args[startIndex].Split('=')[1];
+                    options.InternalProgram = EnumConverter.ToInternalProgram(internalProgram);
+                }
+                else if (args[startIndex] == "-u" || args[startIndex] == "--use")
+                {
+                    string internalProgram = args[startIndex + 1];
+                    options.InternalProgram = EnumConverter.ToInternalProgram(internalProgram);
+                    startIndex++;
+                }
+
                 // Redump login
-                if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
+                else if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
                 {
                     string[] credentials = args[startIndex].Split('=')[1].Split(';');
                     options.RedumpUsername = credentials[0];
@@ -54,17 +157,10 @@ namespace MPF.Core.Utilities
                     startIndex += 2;
                 }
 
-                // Use specific program
-                else if (args[startIndex].StartsWith("-u=") || args[startIndex].StartsWith("--use="))
+                // Pull all information (requires Redump login)
+                else if (args[startIndex].Equals("-a") || args[startIndex].Equals("--pull-all"))
                 {
-                    string internalProgram = args[startIndex].Split('=')[1];
-                    options.InternalProgram = EnumConverter.ToInternalProgram(internalProgram);
-                }
-                else if (args[startIndex] == "-u" || args[startIndex] == "--use")
-                {
-                    string internalProgram = args[startIndex + 1];
-                    options.InternalProgram = EnumConverter.ToInternalProgram(internalProgram);
-                    startIndex++;
+                    options.PullAllInformation = true;
                 }
 
                 // Use a device path for physical checks
@@ -90,6 +186,25 @@ namespace MPF.Core.Utilities
                     protectFile = true;
                 }
 
+                // Include seed info file
+                else if (args[startIndex].StartsWith("-l=") || args[startIndex].StartsWith("--load-seed="))
+                {
+                    string seedInfo = args[startIndex].Split('=')[1];
+                    info = SubmissionInfoTool.CreateFromFile(seedInfo);
+                }
+                else if (args[startIndex] == "-l" || args[startIndex] == "--load-seed")
+                {
+                    string seedInfo = args[startIndex + 1];
+                    info = SubmissionInfoTool.CreateFromFile(seedInfo);
+                    startIndex++;
+                }
+
+                // Add filename suffix
+                else if (args[startIndex].Equals("-x") || args[startIndex].Equals("--suffix"))
+                {
+                    options.AddFilenameSuffix = true;
+                }
+
                 // Output submission JSON
                 else if (args[startIndex].Equals("-j") || args[startIndex].Equals("--json"))
                 {
@@ -102,6 +217,12 @@ namespace MPF.Core.Utilities
                     options.CompressLogFiles = true;
                 }
 
+                // Delete unnecessary files files
+                else if (args[startIndex].Equals("-d") || args[startIndex].Equals("--delete"))
+                {
+                    options.DeleteUnnecessaryFiles = true;
+                }
+
                 // Default, we fall out
                 else
                 {
@@ -113,7 +234,7 @@ namespace MPF.Core.Utilities
             options.ScanForProtection = scan && !string.IsNullOrWhiteSpace(parsedPath);
             options.OutputSeparateProtectionFile = scan && protectFile && !string.IsNullOrWhiteSpace(parsedPath);
 
-            return (options, parsedPath, startIndex);
+            return (options, info, parsedPath, startIndex);
         }
 
         /// <summary>
@@ -121,20 +242,25 @@ namespace MPF.Core.Utilities
         /// </summary>
         public static List<string> PrintSupportedArguments()
         {
-            var supportedArguments = new List<string>();
-
-            supportedArguments.Add("-u, --use <program>            Dumping program output type [REQUIRED]");
-            supportedArguments.Add("-c, --credentials <user> <pw>  Redump username and password");
-            supportedArguments.Add("-p, --path <drivepath>         Physical drive path for additional checks");
-            supportedArguments.Add("-s, --scan                     Enable copy protection scan (requires --path)");
-            supportedArguments.Add("-f, --protect-file             Output protection to separate file (requires --scan)");
-            supportedArguments.Add("-j, --json                     Enable submission JSON output");
-            supportedArguments.Add("-z, --zip                      Enable log file compression");
+            var supportedArguments = new List<string>
+            {
+                "-u, --use <program>            Dumping program output type [REQUIRED]",
+                "-c, --credentials <user> <pw>  Redump username and password",
+                "-a, --pull-all                 Pull all information from Redump (requires --credentials)",
+                "-p, --path <drivepath>         Physical drive path for additional checks",
+                "-s, --scan                     Enable copy protection scan (requires --path)",
+                "-f, --protect-file             Output protection to separate file (requires --scan)",
+                "-l, --load-seed <path>         Load a seed submission JSON for user information",
+                "-x, --suffix                   Enable adding filename suffix",
+                "-j, --json                     Enable submission JSON output",
+                "-z, --zip                      Enable log file compression",
+                "-d, --delete                   Enable unnecessary file deletion",
+            };
 
             return supportedArguments;
         }
 
-        #endregion
+#endregion
 
         #region Configuration
 
@@ -143,17 +269,20 @@ namespace MPF.Core.Utilities
         /// </summary>
         public static Options LoadFromConfig()
         {
-            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
-            var settings = configFile.AppSettings.Settings;
-            var dict = new Dictionary<string, string>();
-
-            foreach (string key in settings.AllKeys)
+            if (!File.Exists(ConfigurationPath))
             {
-                dict[key] = settings[key]?.Value ?? string.Empty;
+                _ = File.Create(ConfigurationPath);
+                return new Options();
             }
 
-            return new Options(dict);
+            var serializer = JsonSerializer.Create();
+            var reader = new StreamReader(ConfigurationPath);
+#if NET48
+            var settings = serializer.Deserialize(reader, typeof(Dictionary<string, string>)) as Dictionary<string, string>;
+#else
+            var settings = serializer.Deserialize(reader, typeof(Dictionary<string, string?>)) as Dictionary<string, string?>;
+#endif
+            return new Options(settings);
         }
 
         /// <summary>
@@ -161,16 +290,10 @@ namespace MPF.Core.Utilities
         /// </summary>
         public static void SaveToConfig(Options options)
         {
-            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
-            // Loop through all settings in Options and save them, overwriting existing settings
-            foreach (var kvp in options)
-            {
-                configFile.AppSettings.Settings.Remove(kvp.Key);
-                configFile.AppSettings.Settings.Add(kvp.Key, kvp.Value);
-            }
-
-            configFile.Save(ConfigurationSaveMode.Modified);
+            var serializer = JsonSerializer.Create();
+            var sw = new StreamWriter(ConfigurationPath) { AutoFlush = true };
+            var writer = new JsonTextWriter(sw) { Formatting = Formatting.Indented };
+            serializer.Serialize(writer, options.Settings, typeof(Dictionary<string, string>));
         }
 
         #endregion

MPF.Core/Utilities/Tools.cs

@@ -84,6 +84,7 @@ namespace MPF.Core.Utilities
                 return Result.Failure("Please select a valid system");
 
             // If we're on an unsupported type, update the status accordingly
+#if NET48
             switch (type)
             {
                 // Fully supported types
@@ -116,6 +117,132 @@ namespace MPF.Core.Utilities
                 default:
                     return Result.Failure($"{type.LongName()} media are not supported for dumping");
             }
+#else
+            return type switch
+            {
+                // Fully supported types
+                MediaType.BluRay
+                    or MediaType.CDROM
+                    or MediaType.DVD
+                    or MediaType.FloppyDisk
+                    or MediaType.HardDisk
+                    or MediaType.CompactFlash
+                    or MediaType.SDCard
+                    or MediaType.FlashDrive
+                    or MediaType.HDDVD => Result.Success($"{type.LongName()} ready to dump"),
+
+                // Partially supported types
+                MediaType.GDROM
+                    or MediaType.NintendoGameCubeGameDisc
+                    or MediaType.NintendoWiiOpticalDisc => Result.Success($"{type.LongName()} partially supported for dumping"),
+
+                // Special case for other supported tools
+                MediaType.UMD => Result.Failure($"{type.LongName()} supported for submission info parsing"),
+
+                // Specifically unknown type
+                MediaType.NONE => Result.Failure($"Please select a valid media type"),
+
+                // Undumpable but recognized types
+                _ => Result.Failure($"{type.LongName()} media are not supported for dumping"),
+            };
+#endif
+        }
+        
+        /// <summary>
+        /// Returns false if a given InternalProgram does not support a given MediaType
+        /// </summary>
+        public static bool ProgramSupportsMedia(InternalProgram program, MediaType? type)
+        {
+            // If the media type is not set, return false
+            if (type == null || type == MediaType.NONE)
+                return false;
+
+#if NET48
+            switch (program)
+            {
+                case InternalProgram.Redumper:
+                    switch (type)
+                    {
+                        // Formats considered at least partially dumpable by Redumper
+                        case MediaType.BluRay:
+                        case MediaType.CDROM:
+                        case MediaType.DVD:
+                        case MediaType.GDROM:
+                        case MediaType.HDDVD:
+                            return true;
+
+                        // All other formats considered unsupported
+                        default:
+                            return false;
+                    }
+                case InternalProgram.Aaru:
+                case InternalProgram.DiscImageCreator:
+                    switch (type)
+                    {
+                        // Formats considered at least partially supported
+                        case MediaType.BluRay:
+                        case MediaType.CDROM:
+                        case MediaType.DVD:
+                        case MediaType.FloppyDisk:
+                        case MediaType.HardDisk:
+                        case MediaType.CompactFlash:
+                        case MediaType.SDCard:
+                        case MediaType.FlashDrive:
+                        case MediaType.HDDVD:
+                        case MediaType.NintendoGameCubeGameDisc:
+                        case MediaType.NintendoWiiOpticalDisc:
+                            return true;
+
+                        // All other formats considered unsupported
+                        default:
+                            return false;
+                    }
+                // All other InternalPrograms are not used for dumping
+                default:
+                    return false;
+            }
+#else
+            return (program) switch
+            {
+                // Aaru
+                InternalProgram.Aaru when type == MediaType.BluRay => true,
+                InternalProgram.Aaru when type == MediaType.CDROM => true,
+                InternalProgram.Aaru when type == MediaType.CompactFlash => true,
+                InternalProgram.Aaru when type == MediaType.DVD => true,
+                InternalProgram.Aaru when type == MediaType.GDROM => true,
+                InternalProgram.Aaru when type == MediaType.FlashDrive => true,
+                InternalProgram.Aaru when type == MediaType.FloppyDisk => true,
+                InternalProgram.Aaru when type == MediaType.HardDisk => true,
+                InternalProgram.Aaru when type == MediaType.HDDVD => true,
+                InternalProgram.Aaru when type == MediaType.NintendoGameCubeGameDisc => true,
+                InternalProgram.Aaru when type == MediaType.NintendoWiiOpticalDisc => true,
+                InternalProgram.Aaru when type == MediaType.SDCard => true,
+
+                // DiscImageCreator
+                InternalProgram.DiscImageCreator when type == MediaType.BluRay => true,
+                InternalProgram.DiscImageCreator when type == MediaType.CDROM => true,
+                InternalProgram.DiscImageCreator when type == MediaType.CompactFlash => true,
+                InternalProgram.DiscImageCreator when type == MediaType.DVD => true,
+                InternalProgram.DiscImageCreator when type == MediaType.GDROM => true,
+                InternalProgram.DiscImageCreator when type == MediaType.FlashDrive => true,
+                InternalProgram.DiscImageCreator when type == MediaType.FloppyDisk => true,
+                InternalProgram.DiscImageCreator when type == MediaType.HardDisk => true,
+                InternalProgram.DiscImageCreator when type == MediaType.HDDVD => true,
+                InternalProgram.DiscImageCreator when type == MediaType.NintendoGameCubeGameDisc => true,
+                InternalProgram.DiscImageCreator when type == MediaType.NintendoWiiOpticalDisc => true,
+                InternalProgram.DiscImageCreator when type == MediaType.SDCard => true,
+
+                // Redumper
+                InternalProgram.Redumper when type == MediaType.BluRay => true,
+                InternalProgram.Redumper when type == MediaType.CDROM => true,
+                InternalProgram.Redumper when type == MediaType.DVD => true,
+                InternalProgram.Redumper when type == MediaType.GDROM => true,
+                InternalProgram.Redumper when type == MediaType.HDDVD => true,
+
+                // Default
+                _ => false,
+            };
+#endif
         }
 
         #endregion
@@ -130,16 +257,23 @@ namespace MPF.Core.Utilities
         /// String representing the message to display the the user.
         /// String representing the new release URL.
         /// </returns>
+#if NET48
         public static (bool different, string message, string url) CheckForNewVersion()
+#else
+        public static (bool different, string message, string? url) CheckForNewVersion()
+#endif
         {
             try
             {
                 // Get current assembly version
-                var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version;
-                string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty);
+                var assemblyVersion = Assembly.GetEntryAssembly()?.GetName()?.Version;
+                if (assemblyVersion == null)
+                    return (false, "Assembly version could not be determined", null);
+
+                string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}.{assemblyVersion.Build}";
 
                 // Get the latest tag from GitHub
-                (string tag, string url) = GetRemoteVersionAndUrl();
+                var (tag, url) = GetRemoteVersionAndUrl();
                 bool different = version != tag;
 
                 string message = $"Local version: {version}"
@@ -159,12 +293,20 @@ namespace MPF.Core.Utilities
         /// <summary>
         /// Get the current informational version formatted as a string
         /// </summary>
+#if NET48
         public static string GetCurrentVersion()
+#else
+        public static string? GetCurrentVersion()
+#endif
         {
             try
             {
-                var assemblyVersion = Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
-                return assemblyVersion.InformationalVersion;
+                var assembly = Assembly.GetEntryAssembly();
+                if (assembly == null)
+                    return null;
+
+                var assemblyVersion = Attribute.GetCustomAttribute(assembly, typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
+                return assemblyVersion?.InformationalVersion;
             }
             catch (Exception ex)
             {
@@ -175,10 +317,14 @@ namespace MPF.Core.Utilities
         /// <summary>
         /// Get the latest version of MPF from GitHub and the release URL
         /// </summary>
+#if NET48
         private static (string tag, string url) GetRemoteVersionAndUrl()
+#else
+        private static (string? tag, string? url) GetRemoteVersionAndUrl()
+#endif
         {
-#if NETFRAMEWORK
-            using (System.Net.WebClient wc = new System.Net.WebClient())
+#if NET48
+            using (var wc = new System.Net.WebClient())
             {
                 wc.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:64.0) Gecko/20100101 Firefox/64.0";
 
@@ -192,16 +338,22 @@ namespace MPF.Core.Utilities
                 return (latestTag, releaseUrl);
             }
 #else
-            using (System.Net.Http.HttpClient hc = new System.Net.Http.HttpClient())
+            using (var hc = new System.Net.Http.HttpClient())
             {
                 // TODO: Figure out a better way than having this hardcoded...
                 string url = "https://api.github.com/repos/SabreTools/MPF/releases/latest";
                 var message = new System.Net.Http.HttpRequestMessage(System.Net.Http.HttpMethod.Get, url);
                 message.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:64.0) Gecko/20100101 Firefox/64.0");
-                string latestReleaseJsonString = hc.Send(message)?.Content?.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+                var latestReleaseJsonString = hc.Send(message)?.Content?.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+                if (latestReleaseJsonString == null)
+                    return (null, null);
+
                 var latestReleaseJson = JObject.Parse(latestReleaseJsonString);
-                string latestTag = latestReleaseJson["tag_name"].ToString();
-                string releaseUrl = latestReleaseJson["html_url"].ToString();
+                if (latestReleaseJson == null)
+                    return (null, null);
+
+                var latestTag = latestReleaseJson["tag_name"]?.ToString();
+                var releaseUrl = latestReleaseJson["html_url"]?.ToString();
 
                 return (latestTag, releaseUrl);
             }

MPF.Library/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// Anything marked as internal can be used by the test methods
-[assembly: InternalsVisibleTo("MPF.Test")]

MPF.Library/MPF.Library.csproj

@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <AssemblyName>MPF.Library</AssemblyName>
-    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2023</Copyright>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.Modules\MPF.Modules.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
-      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
-  </ItemGroup>
-
-</Project>

MPF.Modules/AssemblyInfo.cs

@@ -1,4 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// Anything marked as internal can be used by the test methods
-[assembly: InternalsVisibleTo("MPF.Test")]

MPF.Modules/MPF.Modules.csproj

@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2023</Copyright>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SabreTools.Models" Version="1.1.2" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.1.2" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>

MPF.Test/Core/Converters/EnumConverterTests.cs

@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-#if NETFRAMEWORK
-using IMAPI2;
-#endif
 using MPF.Core.Converters;
 using MPF.Core.Data;
 using Xunit;
@@ -25,35 +22,6 @@ namespace MPF.Test.Core.Converters
             DriveType.Removable,
         };
 
-#if NETFRAMEWORK
-        /// <summary>
-        /// IMAPI_MEDIA_PHYSICAL_TYPE values that map to MediaType
-        /// </summary>
-        private static readonly IMAPI_MEDIA_PHYSICAL_TYPE[] _mappableImapiTypes = new IMAPI_MEDIA_PHYSICAL_TYPE[]
-        {
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_UNKNOWN,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDROM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDR,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_CDRW,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDROM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDRAM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSR,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSRW,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSR_DUALLAYER,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHR,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHRW,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDDASHR_DUALLAYER,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DISK,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_DVDPLUSRW_DUALLAYER,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDROM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDR,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_HDDVDRAM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDROM,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDR,
-            IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_BDRE,
-        };
-#endif
-
         /// <summary>
         /// Check that every supported DriveType maps to an InternalDriveType
         /// </summary>
@@ -71,64 +39,41 @@ namespace MPF.Test.Core.Converters
                 Assert.NotNull(actual);
         }
 
-#if NETFRAMEWORK
-        /// <summary>
-        /// Check that every supported IMAPI_MEDIA_PHYSICAL_TYPE maps to an MediaType
-        /// </summary>
-        /// <param name="imapiType">IMAPI_MEDIA_PHYSICAL_TYPE value to check</param>
-        /// <param name="expectNull">True to expect a null mapping, false otherwise</param>
-        [Theory]
-        [MemberData(nameof(GenerateImapiTypeMappingTestData))]
-        public void IMAPIToMediaTypeTest(IMAPI_MEDIA_PHYSICAL_TYPE imapiType, bool expectNull)
-        {
-            var actual = imapiType.IMAPIToMediaType();
-
-            if (expectNull)
-                Assert.Null(actual);
-            else
-                Assert.NotNull(actual);
-        }
-#endif
-
         /// <summary>
         /// Generate a test set of DriveType values
         /// </summary>
         /// <returns>MemberData-compatible list of DriveType values</returns>
+#if NET48
         public static List<object[]> GenerateDriveTypeMappingTestData()
+#else
+        public static List<object?[]> GenerateDriveTypeMappingTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (DriveType driveType in Enum.GetValues(typeof(DriveType)))
             {
                 if (_mappableDriveTypes.Contains(driveType))
+#if NET48
                     testData.Add(new object[] { driveType, false });
-                else
-                    testData.Add(new object[] { driveType, true });
-            }
-
-            return testData;
-        }
-
-#if NETFRAMEWORK
-        /// <summary>
-        /// Generate a test set of IMAPI_MEDIA_PHYSICAL_TYPE values
-        /// </summary>
-        /// <returns>MemberData-compatible list of IMAPI_MEDIA_PHYSICAL_TYPE values</returns>
-        public static List<object[]> GenerateImapiTypeMappingTestData()
-        {
-            var testData = new List<object[]>() { new object[] { null, false } };
-            foreach (IMAPI_MEDIA_PHYSICAL_TYPE imapiType in Enum.GetValues(typeof(IMAPI_MEDIA_PHYSICAL_TYPE)))
-            {
-                if (_mappableImapiTypes.Contains(imapiType))
-                    testData.Add(new object[] { imapiType, false });
-                else
-                    testData.Add(new object[] { imapiType, true });
-            }
-
-            return testData;
-        }
+#else
+                    testData.Add(new object?[] { driveType, false });
 #endif
+                else
+#if NET48
+                    testData.Add(new object[] { driveType, true });
+#else
+                    testData.Add(new object?[] { driveType, true });
+#endif
+            }
 
-        #endregion
+            return testData;
+        }
+
+#endregion
 
         #region Convert to Long Name
 
@@ -150,18 +95,30 @@ namespace MPF.Test.Core.Converters
         /// Generate a test set of InternalProgram values
         /// </summary>
         /// <returns>MemberData-compatible list of InternalProgram values</returns>
+#if NET48
         public static List<object[]> GenerateInternalProgramTestData()
+#else
+        public static List<object?[]> GenerateInternalProgramTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null } };
+#endif
             foreach (InternalProgram? internalProgram in Enum.GetValues(typeof(InternalProgram)))
             {
+#if NET48
                 testData.Add(new object[] { internalProgram });
+#else
+                testData.Add(new object?[] { internalProgram });
+#endif
             }
 
             return testData;
         }
 
-        #endregion
+#endregion
 
         // TODO: Add from-string tests
     }

MPF.Test/Core/Data/XgdInfoTests.cs

@@ -1,115 +0,0 @@
-using MPF.Core.Data;
-using Xunit;
-
-namespace MPF.Test.Core.Data
-{
-    public class XgdInfoTests
-    {
-        [Theory]
-        [InlineData(null)]
-        [InlineData("")]
-        [InlineData("1234567")]
-        [InlineData("1234567\0")]
-        [InlineData("123456789")]
-        public void UnmatchedStringTests(string invalidString)
-        {
-            XgdInfo xgdInfo = new XgdInfo(invalidString);
-            Assert.False(xgdInfo.Initialized);
-        }
-
-        [Theory]
-        [InlineData("AV00100W", "AV", "001", "00", 'W')]
-        [InlineData("AV00100W\0", "AV", "001", "00", 'W')]
-        public void XGD1ValidTests(string validString, string publisher, string gameId, string version, char regionIdentifier)
-        {
-            XgdInfo xgdInfo = new XgdInfo(validString);
-
-            Assert.True(xgdInfo.Initialized);
-            Assert.Equal(publisher, xgdInfo.XMID.PublisherIdentifier);
-            Assert.Equal(gameId, xgdInfo.XMID.GameID);
-            Assert.Equal(version, xgdInfo.XMID.VersionNumber);
-            Assert.Equal(regionIdentifier, xgdInfo.XMID.RegionIdentifier);
-        }
-
-        [Theory]
-        // Invalid publisher identifier
-        [InlineData("ZZ000000")]
-        [InlineData("ZZ000000\0")]
-        // Invalid region identifier
-        [InlineData("AV00000Z")]
-        [InlineData("AV00000Z\0")]
-        public void XGD1InvalidTests(string invalidString)
-        {
-            XgdInfo xgdInfo = new XgdInfo(invalidString);
-            Assert.False(xgdInfo.Initialized);
-        }
-
-        [Theory]
-        [InlineData("AV200100W0F11", "AV", "001", "00", 'W', "0", 'F', "11", null)]
-        [InlineData("AV200100W0F11\0", "AV", "001", "00", 'W', "0", 'F', "11", null)]
-        [InlineData("AV200100W01F11", "AV", "001", "00", 'W', "01", 'F', "11", null)]
-        [InlineData("AV200100W01F11\0", "AV", "001", "00", 'W', "01", 'F', "11", null)]
-        [InlineData("AV200100W0F11DEADBEEF", "AV", "001", "00", 'W', "0", 'F', "11", "DEADBEEF")]
-        [InlineData("AV200100W0F11DEADBEEF\0", "AV", "001", "00", 'W', "0", 'F', "11", "DEADBEEF")]
-        [InlineData("AV200100W01F11DEADBEEF", "AV", "001", "00", 'W', "01", 'F', "11", "DEADBEEF")]
-        [InlineData("AV200100W01F11DEADBEEF\0", "AV", "001", "00", 'W', "01", 'F', "11", "DEADBEEF")]
-        public void XGD23ValidTests(string validString, string publisher, string gameId, string sku, char regionIdentifier, string baseVersion, char mediaSubtype, string discNumber, string cert)
-        {
-            XgdInfo xgdInfo = new XgdInfo(validString);
-
-            Assert.True(xgdInfo.Initialized);
-            Assert.Equal(publisher, xgdInfo.XeMID.PublisherIdentifier);
-            Assert.Equal('2', xgdInfo.XeMID.PlatformIdentifier);
-            Assert.Equal(gameId, xgdInfo.XeMID.GameID);
-            Assert.Equal(sku, xgdInfo.XeMID.SKU);
-            Assert.Equal(regionIdentifier, xgdInfo.XeMID.RegionIdentifier);
-            Assert.Equal(baseVersion, xgdInfo.XeMID.BaseVersion);
-            Assert.Equal(mediaSubtype, xgdInfo.XeMID.MediaSubtypeIdentifier);
-            Assert.Equal(discNumber, xgdInfo.XeMID.DiscNumberIdentifier);
-            Assert.Equal(cert, xgdInfo.XeMID.CertificationSubmissionIdentifier);
-        }
-
-        [Theory]
-        // Invalid publisher identifier
-        [InlineData("ZZ00000000000")]
-        [InlineData("ZZ00000000000\0")]
-        [InlineData("ZZ000000000000")]
-        [InlineData("ZZ000000000000\0")]
-        [InlineData("ZZ0000000000000000000")]
-        [InlineData("ZZ0000000000000000000\0")]
-        [InlineData("ZZ00000000000000000000")]
-        [InlineData("ZZ00000000000000000000\0")]
-        // Invalid platform identifier
-        [InlineData("AV90000000000")]
-        [InlineData("AV90000000000\0")]
-        [InlineData("AV900000000000")]
-        [InlineData("AV900000000000\0")]
-        [InlineData("AV9000000000000000000")]
-        [InlineData("AV9000000000000000000\0")]
-        [InlineData("AV90000000000000000000")]
-        [InlineData("AV90000000000000000000\0")]
-        // Invalid region identifier
-        [InlineData("AV200000Z0000")]
-        [InlineData("AV200000Z0000\0")]
-        [InlineData("AV200000Z00000")]
-        [InlineData("AV200000Z00000\0")]
-        [InlineData("AV200000Z000000000000")]
-        [InlineData("AV200000Z000000000000\0")]
-        [InlineData("AV200000Z0000000000000")]
-        [InlineData("AV200000Z0000000000000\0")]
-        // Invalid media subtype identifier
-        [InlineData("AV200000W0A00")]
-        [InlineData("AV200000W0A00\0")]
-        [InlineData("AV200000W00A00")]
-        [InlineData("AV200000W00A00\0")]
-        [InlineData("AV200000W00A000000000")]
-        [InlineData("AV200000W00A000000000\0")]
-        [InlineData("AV200000W00A0000000000")]
-        [InlineData("AV200000W00A0000000000\0")]
-        public void XGD23InvalidTests(string invalidString)
-        {
-            XgdInfo xgdInfo = new XgdInfo(invalidString);
-            Assert.False(xgdInfo.Initialized);
-        }
-    }
-}

MPF.Test/Core/Utilities/EnumExtensionsTests.cs

@@ -143,15 +143,31 @@ namespace MPF.Test.Core.Utilities
         /// Generate a test set of MediaType values that support drive speeds
         /// </summary>
         /// <returns>MemberData-compatible list of MediaType values</returns>
+#if NET48
         public static List<object[]> GenerateSupportDriveSpeedsTestData()
+#else
+        public static List<object?[]> GenerateSupportDriveSpeedsTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (MediaType mediaType in Enum.GetValues(typeof(MediaType)))
             {
                 if (_supportDriveSpeeds.Contains(mediaType))
+#if NET48
                     testData.Add(new object[] { mediaType, true });
+#else
+                    testData.Add(new object?[] { mediaType, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { mediaType, false });
+#else
+                    testData.Add(new object?[] { mediaType, false });
+#endif
             }
 
             return testData;
@@ -161,15 +177,31 @@ namespace MPF.Test.Core.Utilities
         /// Generate a test set of RedumpSystem values that are considered Audio
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateAudioSystemsTestData()
+#else
+        public static List<object?[]> GenerateAudioSystemsTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
                 if (_audioSystems.Contains(redumpSystem))
+#if NET48
                     testData.Add(new object[] { redumpSystem, true });
+#else
+                    testData.Add(new object?[] { redumpSystem, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { redumpSystem, false });
+#else
+                    testData.Add(new object?[] { redumpSystem, false });
+#endif
             }
 
             return testData;
@@ -179,15 +211,31 @@ namespace MPF.Test.Core.Utilities
         /// Generate a test set of RedumpSystem values that are considered markers
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateMarkerSystemsTestData()
+#else
+        public static List<object?[]> GenerateMarkerSystemsTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
                 if (_markerSystems.Contains(redumpSystem))
+#if NET48
                     testData.Add(new object[] { redumpSystem, true });
+#else
+                    testData.Add(new object?[] { redumpSystem, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { redumpSystem, false });
+#else
+                    testData.Add(new object?[] { redumpSystem, false });
+#endif
             }
 
             return testData;
@@ -197,15 +245,31 @@ namespace MPF.Test.Core.Utilities
         /// Generate a test set of RedumpSystem values that are considered markers
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateReversedRingcodeSystemsTestData()
+#else
+        public static List<object?[]> GenerateReversedRingcodeSystemsTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
                 if (_reverseRingcodeSystems.Contains(redumpSystem))
+#if NET48
                     testData.Add(new object[] { redumpSystem, true });
+#else
+                    testData.Add(new object?[] { redumpSystem, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { redumpSystem, false });
+#else
+                    testData.Add(new object?[] { redumpSystem, false });
+#endif
             }
 
             return testData;
@@ -215,15 +279,31 @@ namespace MPF.Test.Core.Utilities
         /// Generate a test set of RedumpSystem values that are considered XGD
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateXGDSystemsTestData()
+#else
+        public static List<object?[]> GenerateXGDSystemsTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
                 if (_xgdSystems.Contains(redumpSystem))
+#if NET48
                     testData.Add(new object[] { redumpSystem, true });
+#else
+                    testData.Add(new object?[] { redumpSystem, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { redumpSystem, false });
+#else
+                    testData.Add(new object?[] { redumpSystem, false });
+#endif
             }
 
             return testData;

MPF.Test/Library/DumpEnvironmentTests.cs

@@ -1,6 +1,5 @@
-using System.IO;
+using MPF.Core;
 using MPF.Core.Data;
-using MPF.Library;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 

MPF.Test/Library/InfoToolTests.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
-using MPF.Library;
+using MPF.Core;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
@@ -42,28 +42,36 @@ namespace MPF.Test.Library
             long layerbreak,
             long layerbreak2,
             long layerbreak3,
+#if NET48
             string expected)
+#else
+            string? expected)
+#endif
         {
             // TODO: Add tests around BDU
-            string actual = InfoTool.GetFixedMediaType(mediaType, null, size, layerbreak, layerbreak2, layerbreak3);
+            var actual = InfoTool.GetFixedMediaType(mediaType, null, size, layerbreak, layerbreak2, layerbreak3);
             Assert.Equal(expected, actual);
         }
 
         [Theory]
-        [InlineData(null, null)]
-        [InlineData(" ", " ")]
+        [InlineData(null, "")]
+        [InlineData(" ", "")]
         [InlineData("super\\blah.bin", "super\\blah.bin")]
         [InlineData("super\\hero\\blah.bin", "super\\hero\\blah.bin")]
         [InlineData("super.hero\\blah.bin", "super.hero\\blah.bin")]
         [InlineData("superhero\\blah.rev.bin", "superhero\\blah.rev.bin")]
         [InlineData("super&hero\\blah.bin", "super&hero\\blah.bin")]
         [InlineData("superhero\\blah&foo.bin", "superhero\\blah&foo.bin")]
+#if NET48
         public void NormalizeOutputPathsTest(string outputPath, string expectedPath)
+#else
+        public void NormalizeOutputPathsTest(string? outputPath, string? expectedPath)
+#endif
         {
             if (!string.IsNullOrWhiteSpace(expectedPath))
                 expectedPath = Path.GetFullPath(expectedPath);
 
-            string actualPath = InfoTool.NormalizeOutputPaths(outputPath);
+            string actualPath = InfoTool.NormalizeOutputPaths(outputPath, true);
             Assert.Equal(expectedPath, actualPath);
         }
 
@@ -71,7 +79,7 @@ namespace MPF.Test.Library
         public void ProcessSpecialFieldsCompleteTest()
         {
             // Create a new SubmissionInfo object
-            SubmissionInfo info = new SubmissionInfo()
+            var info = new SubmissionInfo()
             {
                 CommonDiscInfo = new CommonDiscInfoSection()
                 {
@@ -119,7 +127,7 @@ namespace MPF.Test.Library
         public void ProcessSpecialFieldsNullObjectTest()
         {
             // Create a new SubmissionInfo object
-            SubmissionInfo info = new SubmissionInfo()
+            var info = new SubmissionInfo()
             {
                 CommonDiscInfo = null,
             };
@@ -135,7 +143,7 @@ namespace MPF.Test.Library
         public void ProcessSpecialFieldsNullCommentsContentsTest()
         {
             // Create a new SubmissionInfo object
-            SubmissionInfo info = new SubmissionInfo()
+            var info = new SubmissionInfo()
             {
                 CommonDiscInfo = new CommonDiscInfoSection()
                 {
@@ -183,7 +191,7 @@ namespace MPF.Test.Library
         public void ProcessSpecialFieldsNullDictionariesTest()
         {
             // Create a new SubmissionInfo object
-            SubmissionInfo info = new SubmissionInfo()
+            var info = new SubmissionInfo()
             {
                 CommonDiscInfo = new CommonDiscInfoSection()
                 {

MPF.Test/Library/ProtectionTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MPF.Library;
+using MPF.Core;
 using Xunit;
 
 namespace MPF.Test.Library

MPF.Test/MPF.Test.csproj

@@ -5,50 +5,32 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
-    <COMReference Include="IMAPI2">
-      <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="IMAPI2FS">
-      <Guid>{2C941FD0-975B-59BE-A960-9A2A262853A5}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MPF\MPF.csproj" />
-    <ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
-    <ProjectReference Include="..\MPF.Modules\MPF.Modules.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage" Version="17.6.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="psxt001z" Version="0.21.0-beta1" />
     <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-    <PackageReference Include="xunit.analyzers" Version="1.2.0" />
-    <PackageReference Include="xunit.assert" Version="2.5.0" />
-    <PackageReference Include="xunit.core" Version="2.5.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.5.0" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.5.0">
+    <PackageReference Include="xunit.analyzers" Version="1.4.0" />
+    <PackageReference Include="xunit.assert" Version="2.5.3" />
+    <PackageReference Include="xunit.core" Version="2.5.3" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.5.3" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.console" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

MPF.Test/Modules/DiscImageCreatorTests.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using MPF.Core.Data;
-using MPF.Modules.DiscImageCreator;
+using MPF.Core.Modules.DiscImageCreator;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
@@ -20,7 +21,7 @@ namespace MPF.Test.Modules
         public void ParametersFromSystemAndTypeTest(RedumpSystem? knownSystem, MediaType? mediaType, string expected)
         {
             var options = new Options();
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
             Assert.Equal(expected, actual.BaseCommand);
         }
 
@@ -31,9 +32,9 @@ namespace MPF.Test.Modules
         public void ParametersFromOptionsSpecialDefaultTest(RedumpSystem? knownSystem, MediaType? mediaType,string[] expected)
         {
             var options = new Options();
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
 
-            HashSet<string> expectedSet = new HashSet<string>(expected ?? new string[0]);
+            var expectedSet = new HashSet<string>(expected ?? Array.Empty<string>());
             HashSet<string> actualSet = GenerateUsedKeys(actual);
             Assert.Equal(expectedSet, actualSet);
         }
@@ -44,9 +45,9 @@ namespace MPF.Test.Modules
         public void ParametersFromOptionsC2RereadTest(RedumpSystem? knownSystem, MediaType? mediaType, int rereadC2, string[] expected)
         {
             var options = new Options { DICRereadCount = rereadC2 };
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
 
-            HashSet<string> expectedSet = new HashSet<string>(expected ?? new string[0]);
+            var expectedSet = new HashSet<string>(expected ?? Array.Empty<string>());
             HashSet<string> actualSet = GenerateUsedKeys(actual);
 
             Assert.Equal(expectedSet, actualSet);
@@ -64,9 +65,9 @@ namespace MPF.Test.Modules
         public void ParametersFromOptionsDVDRereadTest(RedumpSystem? knownSystem, MediaType? mediaType, int rereadDVDBD, string[] expected)
         {
             var options = new Options { DICDVDRereadCount = rereadDVDBD };
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
 
-            HashSet<string> expectedSet = new HashSet<string>(expected ?? new string[0]);
+            var expectedSet = new HashSet<string>(expected ?? Array.Empty<string>());
             HashSet<string> actualSet = GenerateUsedKeys(actual);
 
             Assert.Equal(expectedSet, actualSet);
@@ -88,9 +89,9 @@ namespace MPF.Test.Modules
         public void ParametersFromOptionsMultiSectorReadTest(RedumpSystem? knownSystem, MediaType? mediaType, bool multiSectorRead, string[] expected)
         {
             var options = new Options { DICMultiSectorRead = multiSectorRead };
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
 
-            HashSet<string> expectedSet = new HashSet<string>(expected ?? new string[0]);
+            var expectedSet = new HashSet<string>(expected ?? Array.Empty<string>());
             HashSet<string> actualSet = GenerateUsedKeys(actual);
             Assert.Equal(expectedSet, actualSet);
             if (expectedSet.Count != 1 && multiSectorRead)
@@ -109,9 +110,9 @@ namespace MPF.Test.Modules
         public void ParametersFromOptionsParanoidModeTest(RedumpSystem? knownSystem, MediaType? mediaType, bool paranoidMode, string[] expected)
         {
             var options = new Options { DICParanoidMode = paranoidMode };
-            var actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, options);
+            var actual = new Parameters(knownSystem, mediaType, "D:\\", "disc.bin", 16, options);
 
-            HashSet<string> expectedSet = new HashSet<string>(expected ?? new string[0]);
+            var expectedSet = new HashSet<string>(expected ?? Array.Empty<string>());
             HashSet<string> actualSet = GenerateUsedKeys(actual);
             Assert.Equal(expectedSet, actualSet);
             if (paranoidMode)
@@ -160,9 +161,13 @@ namespace MPF.Test.Modules
         [InlineData(MediaType.FloppyDisk, ".img")]
         [InlineData(MediaType.Cassette, ".wav")]
         [InlineData(MediaType.NONE, null)]
+#if NET48
         public void MediaTypeToExtensionTest(MediaType? mediaType, string expected)
+#else
+        public void MediaTypeToExtensionTest(MediaType? mediaType, string? expected)
+#endif
         {
-            string actual = Converters.Extension(mediaType);
+            var actual = Converters.Extension(mediaType);
             Assert.Equal(expected, actual);
         }
 
@@ -214,7 +219,7 @@ namespace MPF.Test.Modules
             Assert.Equal(expected, actual);
         }
 
-        #endregion
+#endregion
 
         [Fact]
         public void DiscImageCreatorAudioParametersTest()
@@ -226,7 +231,7 @@ namespace MPF.Test.Modules
             Assert.NotNull(parametersObject);
 
             // Validate that the same set of parameters are generated on the output
-            string newParameters = parametersObject.GenerateParameters();
+            var newParameters = parametersObject.GenerateParameters();
             Assert.NotNull(newParameters);
             Assert.Equal(originalParameters, newParameters);
         }
@@ -241,7 +246,7 @@ namespace MPF.Test.Modules
             Assert.NotNull(parametersObject);
 
             // Validate that the same set of parameters are generated on the output
-            string newParameters = parametersObject.GenerateParameters();
+            var newParameters = parametersObject.GenerateParameters();
             Assert.NotNull(newParameters);
             Assert.Equal(originalParameters, newParameters);
         }
@@ -253,7 +258,7 @@ namespace MPF.Test.Modules
         /// <returns>HashSet representing the strings</returns>
         private static HashSet<string> GenerateUsedKeys(Parameters parameters)
         {
-            HashSet<string> usedKeys = new HashSet<string>();
+            var usedKeys = new HashSet<string>();
             if (parameters?.Keys == null)
                 return usedKeys;
 

MPF.Test/RedumpLib/ExtensionsTests.cs

@@ -95,15 +95,31 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of DiscType values
         /// </summary>
         /// <returns>MemberData-compatible list of DiscType values</returns>
+#if NET48
         public static List<object[]> GenerateDiscTypeMappingTestData()
+#else
+        public static List<object?[]> GenerateDiscTypeMappingTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (DiscType? discType in Enum.GetValues(typeof(DiscType)))
             {
                 if (_mappableDiscTypes.Contains(discType))
+#if NET48
                     testData.Add(new object[] { discType, false });
+#else
+                    testData.Add(new object?[] { discType, false });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { discType, true });
+#else
+                    testData.Add(new object?[] { discType, true });
+#endif
             }
 
             return testData;
@@ -113,12 +129,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of RedumpSystem values
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateRedumpSystemMappingTestData()
+#else
+        public static List<object?[]> GenerateRedumpSystemMappingTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null } };
+#endif
             foreach (RedumpSystem? redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
+#if NET48
                 testData.Add(new object[] { redumpSystem });
+#else
+                testData.Add(new object?[] { redumpSystem });
+#endif
             }
 
             return testData;
@@ -128,16 +156,32 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of mappable media types
         /// </summary>
         /// <returns>MemberData-compatible list of MediaTypes</returns>
+#if NET48
         public static List<object[]> GenerateMediaTypeMappingTestData()
+#else
+        public static List<object?[]> GenerateMediaTypeMappingTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
 
             foreach (MediaType? mediaType in Enum.GetValues(typeof(MediaType)))
             {
                 if (_mappableMediaTypes.Contains(mediaType))
+#if NET48
                     testData.Add(new object[] { mediaType, false });
+#else
+                    testData.Add(new object?[] { mediaType, false });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { mediaType, true });
+#else
+                    testData.Add(new object?[] { mediaType, true });
+#endif
             }
 
             return testData;
@@ -156,7 +200,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateDiscCategoryTestData))]
         public void DiscCategoryLongNameTest(DiscCategory? discCategory, bool expectNull)
         {
-            string actual = discCategory.LongName();
+            var actual = discCategory.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -168,12 +212,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of DiscCategory values
         /// </summary>
         /// <returns>MemberData-compatible list of DiscCategory values</returns>
+#if NET48
         public static List<object[]> GenerateDiscCategoryTestData()
+#else
+        public static List<object?[]> GenerateDiscCategoryTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (DiscCategory? discCategory in Enum.GetValues(typeof(DiscCategory)))
             {
+#if NET48
                 testData.Add(new object[] { discCategory, false });
+#else
+                testData.Add(new object?[] { discCategory, false });
+#endif
             }
 
             return testData;
@@ -192,7 +248,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateDiscTypeTestData))]
         public void DiscTypeLongNameTest(DiscType? discType, bool expectNull)
         {
-            string actual = discType.LongName();
+            var actual = discType.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -204,15 +260,31 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of DiscType values
         /// </summary>
         /// <returns>MemberData-compatible list of DiscType values</returns>
+#if NET48
         public static List<object[]> GenerateDiscTypeTestData()
+#else
+        public static List<object?[]> GenerateDiscTypeTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (DiscType? discType in Enum.GetValues(typeof(DiscType)))
             {
                 if (discType == DiscType.NONE)
+#if NET48
                     testData.Add(new object[] { discType, true });
+#else
+                    testData.Add(new object?[] { discType, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { discType, false });
+#else
+                    testData.Add(new object?[] { discType, false });
+#endif
             }
 
             return testData;
@@ -231,7 +303,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateLanguageTestData))]
         public void LanguageLongNameTest(Language? language, bool expectNull)
         {
-            string actual = language.LongName();
+            var actual = language.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -248,7 +320,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateLanguageTestData))]
         public void LanguageShortNameTest(Language? language, bool expectNull)
         {
-            string actual = language.ShortName();
+            var actual = language.ShortName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -268,7 +340,7 @@ namespace MPF.Test.RedumpLib
             int totalCount = 0;
             foreach (Language? language in fullLanguages)
             {
-                string code = language.TwoLetterCode();
+                var code = language.TwoLetterCode();
                 if (string.IsNullOrWhiteSpace(code))
                     continue;
 
@@ -295,7 +367,7 @@ namespace MPF.Test.RedumpLib
             int totalCount = 0;
             foreach (Language? language in fullLanguages)
             {
-                string code = language.ThreeLetterCode();
+                var code = language.ThreeLetterCode();
                 if (string.IsNullOrWhiteSpace(code))
                     continue;
 
@@ -322,7 +394,7 @@ namespace MPF.Test.RedumpLib
             int totalCount = 0;
             foreach (Language? language in fullLanguages)
             {
-                string code = language.ThreeLetterCodeAlt();
+                var code = language.ThreeLetterCodeAlt();
                 if (string.IsNullOrWhiteSpace(code))
                     continue;
 
@@ -341,12 +413,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of Language values
         /// </summary>
         /// <returns>MemberData-compatible list of Language values</returns>
+#if NET48
         public static List<object[]> GenerateLanguageTestData()
+#else
+        public static List<object?[]> GenerateLanguageTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (Language? language in Enum.GetValues(typeof(Language)))
             {
+#if NET48
                 testData.Add(new object[] { language, false });
+#else
+                testData.Add(new object?[] { language, false });
+#endif
             }
 
             return testData;
@@ -365,7 +449,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateLanguageSelectionTestData))]
         public void LanguageSelectionLongNameTest(LanguageSelection? languageSelection, bool expectNull)
         {
-            string actual = languageSelection.LongName();
+            var actual = languageSelection.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -377,12 +461,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of LanguageSelection values
         /// </summary>
         /// <returns>MemberData-compatible list of LanguageSelection values</returns>
+#if NET48
         public static List<object[]> GenerateLanguageSelectionTestData()
+#else
+        public static List<object?[]> GenerateLanguageSelectionTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (LanguageSelection? languageSelection in Enum.GetValues(typeof(LanguageSelection)))
             {
+#if NET48
                 testData.Add(new object[] { languageSelection, false });
+#else
+                testData.Add(new object?[] { languageSelection, false });
+#endif
             }
 
             return testData;
@@ -401,7 +497,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateMediaTypeTestData))]
         public void MediaTypeLongNameTest(MediaType? mediaType, bool expectNull)
         {
-            string actual = mediaType.LongName();
+            var actual = mediaType.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -418,7 +514,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateMediaTypeTestData))]
         public void MediaTypeShortNameTest(MediaType? mediaType, bool expectNull)
         {
-            string actual = mediaType.ShortName();
+            var actual = mediaType.ShortName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -430,12 +526,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of MediaType values
         /// </summary>
         /// <returns>MemberData-compatible list of MediaType values</returns>
+#if NET48
         public static List<object[]> GenerateMediaTypeTestData()
+#else
+        public static List<object?[]> GenerateMediaTypeTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (MediaType? mediaType in Enum.GetValues(typeof(MediaType)))
             {
+#if NET48
                 testData.Add(new object[] { mediaType, false });
+#else
+                testData.Add(new object?[] { mediaType, false });
+#endif
             }
 
             return testData;
@@ -454,7 +562,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateRegionTestData))]
         public void RegionLongNameTest(Region? region, bool expectNull)
         {
-            string actual = region.LongName();
+            var actual = region.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -471,7 +579,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateRegionTestData))]
         public void RegionShortNameTest(Region? region, bool expectNull)
         {
-            string actual = region.ShortName();
+            var actual = region.ShortName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -491,7 +599,7 @@ namespace MPF.Test.RedumpLib
             int totalCount = 0;
             foreach (Region? region in fullRegions)
             {
-                string code = region.ShortName();
+                var code = region.ShortName();
                 if (string.IsNullOrWhiteSpace(code))
                     continue;
 
@@ -510,12 +618,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of Region values
         /// </summary>
         /// <returns>MemberData-compatible list of Region values</returns>
+#if NET48
         public static List<object[]> GenerateRegionTestData()
+#else
+        public static List<object?[]> GenerateRegionTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (Region? region in Enum.GetValues(typeof(Region)))
             {
+#if NET48
                 testData.Add(new object[] { region, false });
+#else
+                testData.Add(new object?[] { region, false });
+#endif
             }
 
             return testData;
@@ -534,7 +654,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateSiteCodeTestData))]
         public void SiteCodeLongNameTest(SiteCode? siteCode, bool expectNull)
         {
-            string actual = siteCode.LongName();
+            var actual = siteCode.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -551,7 +671,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateSiteCodeTestData))]
         public void SiteCodeShortNameTest(SiteCode? siteCode, bool expectNull)
         {
-            string actual = siteCode.ShortName();
+            var actual = siteCode.ShortName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -563,12 +683,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of SiteCode values
         /// </summary>
         /// <returns>MemberData-compatible list of SiteCode values</returns>
+#if NET48
         public static List<object[]> GenerateSiteCodeTestData()
+#else
+        public static List<object?[]> GenerateSiteCodeTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (SiteCode? siteCode in Enum.GetValues(typeof(SiteCode)))
             {
+#if NET48
                 testData.Add(new object[] { siteCode, false });
+#else
+                testData.Add(new object?[] { siteCode, false });
+#endif
             }
 
             return testData;
@@ -587,7 +719,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateRedumpSystemTestData))]
         public void RedumpSystemLongNameTest(RedumpSystem? redumpSystem, bool expectNull)
         {
-            string actual = redumpSystem.LongName();
+            var actual = redumpSystem.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -622,16 +754,28 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of RedumpSystem values
         /// </summary>
         /// <returns>MemberData-compatible list of RedumpSystem values</returns>
+#if NET48
         public static List<object[]> GenerateRedumpSystemTestData()
+#else
+        public static List<object?[]> GenerateRedumpSystemTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (RedumpSystem? redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
             {
                 // We want to skip all markers for this
                 if (redumpSystem.IsMarker())
                     continue;
 
+#if NET48
                 testData.Add(new object[] { redumpSystem, false });
+#else
+                testData.Add(new object?[] { redumpSystem, false });
+#endif
             }
 
             return testData;
@@ -650,7 +794,7 @@ namespace MPF.Test.RedumpLib
         [MemberData(nameof(GenerateSystemCategoryTestData))]
         public void SystemCategoryLongNameTest(SystemCategory? systemCategory, bool expectNull)
         {
-            string actual = systemCategory.LongName();
+            var actual = systemCategory.LongName();
 
             if (expectNull)
                 Assert.Null(actual);
@@ -662,15 +806,31 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of SystemCategory values
         /// </summary>
         /// <returns>MemberData-compatible list of SystemCategory values</returns>
+#if NET48
         public static List<object[]> GenerateSystemCategoryTestData()
+#else
+        public static List<object?[]> GenerateSystemCategoryTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, true } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, true } };
+#endif
             foreach (SystemCategory? systemCategory in Enum.GetValues(typeof(SystemCategory)))
             {
                 if (systemCategory == SystemCategory.NONE)
+#if NET48
                     testData.Add(new object[] { systemCategory, true });
+#else
+                    testData.Add(new object?[] { systemCategory, true });
+#endif
                 else
+#if NET48
                     testData.Add(new object[] { systemCategory, false });
+#else
+                    testData.Add(new object?[] { systemCategory, false });
+#endif
             }
 
             return testData;
@@ -701,12 +861,24 @@ namespace MPF.Test.RedumpLib
         /// Generate a test set of YesNo values
         /// </summary>
         /// <returns>MemberData-compatible list of YesNo values</returns>
+#if NET48
         public static List<object[]> GenerateYesNoTestData()
+#else
+        public static List<object?[]> GenerateYesNoTestData()
+#endif
         {
+#if NET48
             var testData = new List<object[]>() { new object[] { null, false } };
+#else
+            var testData = new List<object?[]>() { new object?[] { null, false } };
+#endif
             foreach (YesNo? yesNo in Enum.GetValues(typeof(YesNo)))
             {
+#if NET48
                 testData.Add(new object[] { yesNo, false });
+#else
+                testData.Add(new object?[] { yesNo, false });
+#endif
             }
 
             return testData;

MPF.Test/RedumpLib/SubmissionInfoTests.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using psxt001z;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 

MPF.UI.Core/Constants.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
+using static MPF.Core.Data.Interface;
 
 namespace MPF.UI.Core
 {
@@ -10,12 +11,6 @@ namespace MPF.UI.Core
     /// </summary>
     public static class Constants
     {
-        // Private lists of known drive speed ranges
-        private static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
-        private static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
-        private static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
-        private static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
-
         // Create collections for UI based on known drive speeds
         public static DoubleCollection SpeedsForCDAsCollection { get; } = GetDoubleCollectionFromIntList(CD);
         public static DoubleCollection SpeedsForDVDAsCollection { get; } = GetDoubleCollectionFromIntList(DVD);

MPF.UI.Core/ElementConverter.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using MPF.Core.Data;
+using MPF.Core.UI.ComboBoxItems;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.UI.Core
+{
+    internal class ElementConverter: IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            switch (value)
+            {
+                case DiscCategory discCategory:
+                    return new Element<DiscCategory>(discCategory);
+                case InternalProgram internalProgram:
+                    return new Element<InternalProgram>(internalProgram);
+                case MediaType mediaType:
+                    return new Element<MediaType>(mediaType);
+                case RedumpSystem redumpSystem:
+                    return new RedumpSystemComboBoxItem(redumpSystem);
+                case Region region:
+                    return new Element<Region>(region);
+
+                // Null values are treated as a system value
+                default:
+                    return new RedumpSystemComboBoxItem((RedumpSystem?)null);
+            }
+        }
+
+#if NET48
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+#else
+        public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+#endif
+        {
+            // If it's an IElement but ends up null
+#if NET48
+            if (!(value is IElement element))
+#else
+            if (value is not IElement element)
+#endif
+                return null;
+
+            switch (element)
+            {
+                case Element<DiscCategory> dcElement:
+                    return dcElement.Value;
+                case Element<InternalProgram> ipElement:
+                    return ipElement.Value;
+                case Element<MediaType> mtElement:
+                    return mtElement.Value;
+                case RedumpSystemComboBoxItem rsElement:
+                    return rsElement.Value;
+                case Element<Region> reValue:
+                    return reValue.Value;
+
+                default: return null;
+            }
+        }
+    }
+}

MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBox.cs

@@ -18,7 +18,7 @@ namespace WPFCustomMessageBox
         /// Global parameter to enable (true) or disable (false) the removal of the title bar icon.
         /// If you are using a custom window style, the icon removal may cause issues like displaying two title bar (the default windows one and the custom one). 
         /// </summary>
-        public static bool RemoveTitleBarIcon = true;
+        private static readonly bool RemoveTitleBarIcon = true;
 
         /// <summary>
         /// Displays a message box that has a message and returns a result.
@@ -173,7 +173,11 @@ namespace WPFCustomMessageBox
         /// </param>
         /// <param name="timeoutResult">If the message box closes automatically due to the <paramref name="timeout"/> being exceeded, this result is returned.</param>
         /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+#if NET48
         public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#else
+        public static MessageBoxResult Show(Window owner, string? messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#endif
         {
             switch (button)
             {
@@ -515,11 +519,15 @@ namespace WPFCustomMessageBox
         /// <param name="timeout">The message box will close automatically after given milliseconds</param>
         /// <param name="timeoutResult">If the message box closes automatically due to <paramref name="timeout"/> being exceeded, this result is returned.</param>
         /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+#if NET48
         private static MessageBoxResult ShowOKMessage(Window owner, string messageBoxText, string caption, string okButtonText, string cancelButtonText, MessageBoxImage? icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#else
+        private static MessageBoxResult ShowOKMessage(Window? owner, string? messageBoxText, string caption, string? okButtonText, string? cancelButtonText, MessageBoxImage? icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#endif
         {
             MessageBoxButton buttonLayout = string.IsNullOrEmpty(cancelButtonText) ? MessageBoxButton.OK : MessageBoxButton.OKCancel;
 
-            CustomMessageBoxWindow msg = new CustomMessageBoxWindow(owner, messageBoxText, caption, buttonLayout, icon, RemoveTitleBarIcon);
+            var msg = new CustomMessageBoxWindow(owner, messageBoxText, caption, buttonLayout, icon, RemoveTitleBarIcon);
             if (!string.IsNullOrEmpty(okButtonText))
                 msg.OkButtonText = okButtonText;
             if (!string.IsNullOrEmpty(cancelButtonText))
@@ -545,11 +553,15 @@ namespace WPFCustomMessageBox
         /// <param name="timeout">The message box will close automatically after given milliseconds</param>
         /// <param name="timeoutResult">If the message box closes automatically due to <paramref name="timeout"/> being exceeded, this result is returned.</param>
         /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+#if NET48
         private static MessageBoxResult ShowYesNoMessage(Window owner, string messageBoxText, string caption, string yesButtonText, string noButtonText, string cancelButtonText, MessageBoxImage? icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#else
+        private static MessageBoxResult ShowYesNoMessage(Window? owner, string? messageBoxText, string caption, string? yesButtonText, string? noButtonText, string? cancelButtonText, MessageBoxImage? icon, int? timeout = null, MessageBoxResult timeoutResult = MessageBoxResult.None)
+#endif
         {
             MessageBoxButton buttonLayout = string.IsNullOrEmpty(cancelButtonText) ? MessageBoxButton.YesNo : MessageBoxButton.YesNoCancel;
 
-            CustomMessageBoxWindow msg = new CustomMessageBoxWindow(owner, messageBoxText, caption, buttonLayout, icon, RemoveTitleBarIcon);
+            var msg = new CustomMessageBoxWindow(owner, messageBoxText, caption, buttonLayout, icon, RemoveTitleBarIcon);
             if (!string.IsNullOrEmpty(yesButtonText))
                 msg.YesButtonText = yesButtonText;
             if (!string.IsNullOrEmpty(noButtonText))
@@ -566,14 +578,14 @@ namespace WPFCustomMessageBox
         {
             if (timeout.HasValue && timeout.Value <= 0)
             {
-                throw new ArgumentOutOfRangeException("timeout", string.Format("Timeout must be greater than 0."));
+                throw new ArgumentOutOfRangeException(nameof(timeout), string.Format("Timeout must be greater than 0."));
             }
 
             if (timeout.HasValue)
             {
                 //System.Threading.Timer timer = null;
                 //timer = new System.Threading.Timer(s => { msg.Close(); timer.Dispose(); }, null, timeout.Value, System.Threading.Timeout.Infinite);
-                System.Timers.Timer timer = new System.Timers.Timer(timeout.Value) { AutoReset = false };
+                var timer = new System.Timers.Timer(timeout.Value) { AutoReset = false };
                 timer.Elapsed += delegate {
                     Application.Current.Dispatcher.Invoke(new Action(() =>
                     {

MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml

@@ -4,7 +4,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         WindowStartupLocation="CenterScreen"
         WindowStyle="None"
-        ShowInTaskbar="False"
         ResizeMode="NoResize" SizeToContent="WidthAndHeight"
         TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" UseLayoutRounding="True"
         Title="" MinHeight="155" MaxWidth="470" MinWidth="154"

MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs

@@ -10,9 +10,13 @@ namespace WPFCustomMessageBox
     /// </summary>
     internal partial class CustomMessageBoxWindow : Window
     {
-        private bool _removeTitleBarIcon = true;
+        private readonly bool _removeTitleBarIcon = true;
 
+#if NET48
         public string Caption
+#else
+        public string? Caption
+#endif
         {
             get
             {
@@ -24,7 +28,11 @@ namespace WPFCustomMessageBox
             }
         }
 
+#if NET48
         public string Message
+#else
+        public string? Message
+#endif
         {
             get
             {
@@ -36,7 +44,11 @@ namespace WPFCustomMessageBox
             }
         }
 
+#if NET48
         public string OkButtonText
+#else
+        public string? OkButtonText
+#endif
         {
             get
             {
@@ -48,7 +60,11 @@ namespace WPFCustomMessageBox
             }
         }
 
+#if NET48
         public string CancelButtonText
+#else
+        public string? CancelButtonText
+#endif
         {
             get
             {
@@ -60,7 +76,11 @@ namespace WPFCustomMessageBox
             }
         }
 
+#if NET48
         public string YesButtonText
+#else
+        public string? YesButtonText
+#endif
         {
             get
             {
@@ -72,7 +92,11 @@ namespace WPFCustomMessageBox
             }
         }
 
+#if NET48
         public string NoButtonText
+#else
+        public string? NoButtonText
+#endif
         {
             get
             {
@@ -86,13 +110,20 @@ namespace WPFCustomMessageBox
 
         public MessageBoxResult Result { get; set; }
 
+#if NET48
         internal CustomMessageBoxWindow(Window owner, string message, string caption = null, MessageBoxButton? button = null, MessageBoxImage? image = null, bool removeTitleBarIcon = true)
+#else
+        internal CustomMessageBoxWindow(Window? owner, string? message, string? caption = null, MessageBoxButton? button = null, MessageBoxImage? image = null, bool removeTitleBarIcon = true)
+#endif
         {
             InitializeComponent();
 
             _removeTitleBarIcon = removeTitleBarIcon;
+            Focusable = true;
+            ShowActivated = true;
+            ShowInTaskbar = true;
 
-            if (owner != null)
+            if (owner != null && owner.IsLoaded)
             {
                 Owner = owner;
                 WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -106,7 +137,7 @@ namespace WPFCustomMessageBox
             if (image.HasValue)
                 DisplayImage(image.Value);
             else
-                Image_MessageBox.Visibility = System.Windows.Visibility.Collapsed;
+                Image_MessageBox.Visibility = Visibility.Collapsed;
         }
 
         protected override void OnSourceInitialized(EventArgs e)
@@ -123,39 +154,39 @@ namespace WPFCustomMessageBox
             {
                 case MessageBoxButton.OKCancel:
                     // Hide all but OK, Cancel
-                    Button_OK.Visibility = System.Windows.Visibility.Visible;
+                    Button_OK.Visibility = Visibility.Visible;
                     Button_OK.Focus();
-                    Button_Cancel.Visibility = System.Windows.Visibility.Visible;
+                    Button_Cancel.Visibility = Visibility.Visible;
 
-                    Button_Yes.Visibility = System.Windows.Visibility.Collapsed;
-                    Button_No.Visibility = System.Windows.Visibility.Collapsed;
+                    Button_Yes.Visibility = Visibility.Collapsed;
+                    Button_No.Visibility = Visibility.Collapsed;
                     break;
                 case MessageBoxButton.YesNo:
                     // Hide all but Yes, No
-                    Button_Yes.Visibility = System.Windows.Visibility.Visible;
+                    Button_Yes.Visibility = Visibility.Visible;
                     Button_Yes.Focus();
-                    Button_No.Visibility = System.Windows.Visibility.Visible;
+                    Button_No.Visibility = Visibility.Visible;
 
-                    Button_OK.Visibility = System.Windows.Visibility.Collapsed;
-                    Button_Cancel.Visibility = System.Windows.Visibility.Collapsed;
+                    Button_OK.Visibility = Visibility.Collapsed;
+                    Button_Cancel.Visibility = Visibility.Collapsed;
                     break;
                 case MessageBoxButton.YesNoCancel:
                     // Hide only OK
-                    Button_Yes.Visibility = System.Windows.Visibility.Visible;
+                    Button_Yes.Visibility = Visibility.Visible;
                     Button_Yes.Focus();
-                    Button_No.Visibility = System.Windows.Visibility.Visible;
-                    Button_Cancel.Visibility = System.Windows.Visibility.Visible;
+                    Button_No.Visibility = Visibility.Visible;
+                    Button_Cancel.Visibility = Visibility.Visible;
 
-                    Button_OK.Visibility = System.Windows.Visibility.Collapsed;
+                    Button_OK.Visibility = Visibility.Collapsed;
                     break;
                 default:
                     // Hide all but OK
-                    Button_OK.Visibility = System.Windows.Visibility.Visible;
+                    Button_OK.Visibility = Visibility.Visible;
                     Button_OK.Focus();
 
-                    Button_Yes.Visibility = System.Windows.Visibility.Collapsed;
-                    Button_No.Visibility = System.Windows.Visibility.Collapsed;
-                    Button_Cancel.Visibility = System.Windows.Visibility.Collapsed;
+                    Button_Yes.Visibility = Visibility.Collapsed;
+                    Button_No.Visibility = Visibility.Collapsed;
+                    Button_Cancel.Visibility = Visibility.Collapsed;
                     break;
             }
         }
@@ -184,7 +215,7 @@ namespace WPFCustomMessageBox
             }
 
             Image_MessageBox.Source = icon.ToImageSource();
-            Image_MessageBox.Visibility = System.Windows.Visibility.Visible;
+            Image_MessageBox.Visibility = Visibility.Visible;
         }
 
         private void Button_OK_Click(object sender, RoutedEventArgs e)

MPF.UI.Core/External/WPFCustomMessageBox/Util.cs

@@ -37,7 +37,7 @@ namespace WPFCustomMessageBox
         const int SWP_NOMOVE = 0x0002;
         const int SWP_NOZORDER = 0x0004;
         const int SWP_FRAMECHANGED = 0x0020;
-        const uint WM_SETICON = 0x0080;
+        //const uint WM_SETICON = 0x0080;
 
 
         internal static ImageSource ToImageSource(this Icon icon)
@@ -60,7 +60,11 @@ namespace WPFCustomMessageBox
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
+#if NET48
         internal static string TryAddKeyboardAccellerator(this string input)
+#else
+        internal static string? TryAddKeyboardAccellerator(this string? input)
+#endif
         {
             if (input == null)
                 return input;
@@ -84,7 +88,7 @@ namespace WPFCustomMessageBox
             IntPtr hwnd = new WindowInteropHelper(window).Handle;
             // Change the extended window style to not show a window icon
             int extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-            SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_DLGMODALFRAME);
+            _ = SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_DLGMODALFRAME);
             // Update the window's non-client area to reflect the changes
             SetWindowPos(hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
         }

MPF.UI.Core/MPF.UI.Core.csproj

@@ -2,23 +2,16 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows;net7.0-windows</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Title>MPF.UI.Core</Title>
-    <AssemblyName>MPF.UI.Core</AssemblyName>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
+    <VersionPrefix>2.7.4</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
-    <UserSecretsId>27abb4ca-bf7a-431e-932f-49153303d5ff</UserSecretsId>
+  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,23 +21,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <Reference Include="PresentationFramework.Aero" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Images\" />
   </ItemGroup>
 
   <ItemGroup>

MPF.UI.Core/Theme.cs

@@ -6,39 +6,63 @@ namespace MPF.UI.Core
     /// <summary>
     /// Represents all required mapping values for the UI
     /// </summary>
-    public class Theme
+    public abstract class Theme
     {
         #region Application-Wide
 
         /// <summary>
         /// SolidColorBrush used to paint the active window's border.
         /// </summary>
-        public SolidColorBrush ActiveBorderBrush { get; set; }
+#if NET48
+        public SolidColorBrush ActiveBorderBrush { get; protected set; }
+#else
+        public SolidColorBrush? ActiveBorderBrush { get; protected set; }
+#endif
 
         /// <summary>
         /// SolidColorBrush that paints the face of a three-dimensional display element.
         /// </summary>
-        public SolidColorBrush ControlBrush { get; set; }
+#if NET48
+        public SolidColorBrush ControlBrush { get; protected set; }
+#else
+        public SolidColorBrush? ControlBrush { get; protected set; }
+#endif
 
         /// <summary>
         /// SolidColorBrush that paints text in a three-dimensional display element.
         /// </summary>
-        public SolidColorBrush ControlTextBrush { get; set; }
+#if NET48
+        public SolidColorBrush ControlTextBrush { get; protected set; }
+#else
+        public SolidColorBrush? ControlTextBrush { get; protected set; }
+#endif
 
         /// <summary>
         /// SolidColorBrush that paints disabled text.
         /// </summary>
-        public SolidColorBrush GrayTextBrush { get; set; }
+#if NET48
+        public SolidColorBrush GrayTextBrush { get; protected set; }
+#else
+        public SolidColorBrush? GrayTextBrush { get; protected set; }
+#endif
 
         /// <summary>
         /// SolidColorBrush that paints the background of a window's client area.
         /// </summary>
-        public SolidColorBrush WindowBrush { get; set; }
+#if NET48
+        public SolidColorBrush WindowBrush { get; protected set; }
+#else
+        public SolidColorBrush? WindowBrush { get; protected set; }
+#endif
 
         /// <summary>
         /// SolidColorBrush that paints the text in the client area of a window.
         /// </summary>
-        public SolidColorBrush WindowTextBrush { get; set; }
+#if NET48
+        public SolidColorBrush WindowTextBrush { get; protected set; }
+#else
+        public SolidColorBrush? WindowTextBrush { get; protected set; }
+#endif
 
         #endregion
 
@@ -47,22 +71,38 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the Button.Disabled.Background resource
         /// </summary>
-        public Brush Button_Disabled_Background { get; set; }
+#if NET48
+        public Brush Button_Disabled_Background { get; protected set; }
+#else
+        public Brush? Button_Disabled_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the Button.MouseOver.Background resource
         /// </summary>
-        public Brush Button_MouseOver_Background { get; set; }
+#if NET48
+        public Brush Button_MouseOver_Background { get; protected set; }
+#else
+        public Brush? Button_MouseOver_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the Button.Pressed.Background resource
         /// </summary>
-        public Brush Button_Pressed_Background { get; set; }
+#if NET48
+        public Brush Button_Pressed_Background { get; protected set; }
+#else
+        public Brush? Button_Pressed_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the Button.Static.Background resource
         /// </summary>
-        public Brush Button_Static_Background { get; set; }
+#if NET48
+        public Brush Button_Static_Background { get; protected set; }
+#else
+        public Brush? Button_Static_Background { get; protected set; }
+#endif
 
         #endregion
 
@@ -71,62 +111,110 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the ComboBox.Disabled.Background resource
         /// </summary>
-        public Brush ComboBox_Disabled_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Disabled_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Disabled_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Disabled.Editable.Background resource
         /// </summary>
-        public Brush ComboBox_Disabled_Editable_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Disabled_Editable_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Disabled_Editable_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Disabled.Editable.Button.Background resource
         /// </summary>
-        public Brush ComboBox_Disabled_Editable_Button_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Disabled_Editable_Button_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Disabled_Editable_Button_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.MouseOver.Background resource
         /// </summary>
-        public Brush ComboBox_MouseOver_Background { get; set; }
+#if NET48
+        public Brush ComboBox_MouseOver_Background { get; protected set; }
+#else
+        public Brush? ComboBox_MouseOver_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.MouseOver.Editable.Background resource
         /// </summary>
-        public Brush ComboBox_MouseOver_Editable_Background { get; set; }
+#if NET48
+        public Brush ComboBox_MouseOver_Editable_Background { get; protected set; }
+#else
+        public Brush? ComboBox_MouseOver_Editable_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.MouseOver.Editable.Button.Background resource
         /// </summary>
-        public Brush ComboBox_MouseOver_Editable_Button_Background { get; set; }
+#if NET48
+        public Brush ComboBox_MouseOver_Editable_Button_Background { get; protected set; }
+#else
+        public Brush? ComboBox_MouseOver_Editable_Button_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Pressed.Background resource
         /// </summary>
-        public Brush ComboBox_Pressed_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Pressed_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Pressed_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Pressed.Editable.Background resource
         /// </summary>
-        public Brush ComboBox_Pressed_Editable_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Pressed_Editable_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Pressed_Editable_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Pressed.Editable.Button.Background resource
         /// </summary>
-        public Brush ComboBox_Pressed_Editable_Button_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Pressed_Editable_Button_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Pressed_Editable_Button_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Static.Background resource
         /// </summary>
-        public Brush ComboBox_Static_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Static_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Static_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Static.Editable.Background resource
         /// </summary>
-        public Brush ComboBox_Static_Editable_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Static_Editable_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Static_Editable_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the ComboBox.Static.Editable.Button.Background resource
         /// </summary>
-        public Brush ComboBox_Static_Editable_Button_Background { get; set; }
+#if NET48
+        public Brush ComboBox_Static_Editable_Button_Background { get; protected set; }
+#else
+        public Brush? ComboBox_Static_Editable_Button_Background { get; protected set; }
+#endif
 
         #endregion
 
@@ -135,7 +223,11 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the CustomMessageBox.Static.Background resource
         /// </summary>
-        public Brush CustomMessageBox_Static_Background { get; set; }
+#if NET48
+        public Brush CustomMessageBox_Static_Background { get; protected set; }
+#else
+        public Brush? CustomMessageBox_Static_Background { get; protected set; }
+#endif
 
         #endregion
 
@@ -144,12 +236,20 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the MenuItem.SubMenu.Background resource
         /// </summary>
-        public Brush MenuItem_SubMenu_Background { get; set; }
+#if NET48
+        public Brush MenuItem_SubMenu_Background { get; protected set; }
+#else
+        public Brush? MenuItem_SubMenu_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the MenuItem.SubMenu.Border resource
         /// </summary>
-        public Brush MenuItem_SubMenu_Border { get; set; }
+#if NET48
+        public Brush MenuItem_SubMenu_Border { get; protected set; }
+#else
+        public Brush? MenuItem_SubMenu_Border { get; protected set; }
+#endif
 
         #endregion
 
@@ -158,7 +258,11 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the ProgressBar.Background resource
         /// </summary>
-        public Brush ProgressBar_Background { get; set; }
+#if NET48
+        public Brush ProgressBar_Background { get; protected set; }
+#else
+        public Brush? ProgressBar_Background { get; protected set; }
+#endif
 
         #endregion
 
@@ -167,7 +271,11 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the ScrollViewer.ScrollBar.Background resource
         /// </summary>
-        public Brush ScrollViewer_ScrollBar_Background { get; set; }
+#if NET48
+        public Brush ScrollViewer_ScrollBar_Background { get; protected set; }
+#else
+        public Brush? ScrollViewer_ScrollBar_Background { get; protected set; }
+#endif
 
         #endregion
 
@@ -176,17 +284,29 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the TabItem.Selected.Background resource
         /// </summary>
-        public Brush TabItem_Selected_Background { get; set; }
+#if NET48
+        public Brush TabItem_Selected_Background { get; protected set; }
+#else
+        public Brush? TabItem_Selected_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the TabItem.Static.Background resource
         /// </summary>
-        public Brush TabItem_Static_Background { get; set; }
+#if NET48
+        public Brush TabItem_Static_Background { get; protected set; }
+#else
+        public Brush? TabItem_Static_Background { get; protected set; }
+#endif
 
         /// <summary>
         /// Brush for the TabItem.Static.Border resource
         /// </summary>
-        public Brush TabItem_Static_Border { get; set; }
+#if NET48
+        public Brush TabItem_Static_Border { get; protected set; }
+#else
+        public Brush? TabItem_Static_Border { get; protected set; }
+#endif
 
         #endregion
 
@@ -195,7 +315,11 @@ namespace MPF.UI.Core
         /// <summary>
         /// Brush for the TextBox.Static.Background resource
         /// </summary>
-        public Brush TextBox_Static_Background { get; set; }
+#if NET48
+        public Brush TextBox_Static_Background { get; protected set; }
+#else
+        public Brush? TextBox_Static_Background { get; protected set; }
+#endif
 
         #endregion
 

MPF.UI.Core/UserControls/LogOutput.xaml.cs

@@ -1,19 +1,228 @@
-using System.Windows.Controls;
-using MPF.UI.Core.ViewModels;
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Threading;
+using MPF.Core.Data;
 
 namespace MPF.UI.Core.UserControls
 {
     public partial class LogOutput : UserControl
     {
         /// <summary>
-        /// Read-only access to the current log view model
+        /// Document representing the text
         /// </summary>
-        public LogViewModel LogViewModel => DataContext as LogViewModel;
+        internal FlowDocument Document { get; private set; }
+
+        /// <summary>
+        /// Queue of items that need to be logged
+        /// </summary>
+        internal ProcessingQueue<LogLine> LogQueue { get; private set; }
+
+        /// <summary>
+        /// Paragraph backing the log
+        /// </summary>
+        private readonly Paragraph _paragraph;
+
+        /// <summary>
+        /// Cached value of the last line written
+        /// </summary>
+#if NET48
+        private Run lastLine = null;
+#else
+        private Run? lastLine = null;
+#endif
 
         public LogOutput()
         {
             InitializeComponent();
-            DataContext = new LogViewModel(this);
+
+            // Update the internal state
+            Document = new FlowDocument()
+            {
+                Background = new SolidColorBrush(Color.FromArgb(0xFF, 0x20, 0x20, 0x20))
+            };
+            _paragraph = new Paragraph();
+            Document.Blocks.Add(_paragraph);
+
+            // Setup the processing queue
+            LogQueue = new ProcessingQueue<LogLine>(ProcessLogLine);
+
+            // Add handlers
+            OutputViewer.SizeChanged += OutputViewerSizeChanged;
+            Output.TextChanged += OnTextChanged;
+            ClearButton.Click += OnClearButton;
+            SaveButton.Click += OnSaveButton;
+
+            // Update the internal state
+            Output.Document = Document;
         }
+
+        #region Logging
+
+        /// <summary>
+        /// Enqueue text to the log with formatting
+        /// </summary>
+        /// <param name="logLevel">LogLevel for the log</param>
+        /// <param name="text">Text to write to the log</param>
+        public void EnqueueLog(LogLevel logLevel, string text)
+        {
+            // Null text gets ignored
+            if (text == null)
+                return;
+
+            // Enqueue the text
+            LogQueue.Enqueue(new LogLine(text, logLevel));
+        }
+
+        /// <summary>
+        /// Log line wrapper
+        /// </summary>
+        internal readonly struct LogLine
+        {
+            public readonly string Text;
+            public readonly LogLevel LogLevel;
+
+            public LogLine(string text, LogLevel logLevel)
+            {
+                this.Text = text;
+                this.LogLevel = logLevel;
+            }
+
+            /// <summary>
+            /// Get the foreground Brush for the current LogLevel
+            /// </summary>
+            /// <returns>Brush representing the color</returns>
+            public Brush GetForegroundColor()
+            {
+                switch (this.LogLevel)
+                {
+                    case LogLevel.SECRET:
+                        return Brushes.Blue;
+                    case LogLevel.ERROR:
+                        return Brushes.Red;
+                    case LogLevel.VERBOSE:
+                        return Brushes.Yellow;
+                    case LogLevel.USER:
+                    default:
+                        return Brushes.White;
+                }
+            }
+
+            /// <summary>
+            /// Generate a Run object from the current LogLine
+            /// </summary>
+            /// <returns>Run object based on internal values</returns>
+            public Run GenerateRun()
+            {
+                return new Run { Text = this.Text, Foreground = GetForegroundColor() };
+            }
+        }
+
+        /// <summary>
+        /// Process the log lines in the queue
+        /// </summary>
+        /// <param name="nextLogLine">LogLine item to process</param>
+        internal void ProcessLogLine(LogLine nextLogLine)
+        {
+            // Null text gets ignored
+            string nextText = nextLogLine.Text;
+            if (nextText == null)
+                return;
+
+            try
+            {
+                if (nextText.StartsWith("\r"))
+                    ReplaceLastLine(nextLogLine);
+                else
+                    AppendToTextBox(nextLogLine);
+            }
+            catch (Exception ex)
+            {
+                // In the event that something fails horribly, we want to log
+                AppendToTextBox(new LogLine(ex.ToString(), LogLevel.ERROR));
+            }
+        }
+
+        /// <summary>
+        /// Append log line to the log text box
+        /// </summary>
+        /// <param name="logLine">LogLine value to append</param>
+        private void AppendToTextBox(LogLine logLine)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                var run = logLine.GenerateRun();
+                _paragraph.Inlines.Add(run);
+                lastLine = run;
+            });
+        }
+
+        /// <summary>
+        /// Replace the last line written to the log text box
+        /// </summary>
+        /// <param name="logLine">LogLine value to append</param>
+        private void ReplaceLastLine(LogLine logLine)
+        {
+            Dispatcher.Invoke(() =>
+            {
+#if NET48
+                if (lastLine == null) lastLine = new Run();
+#else
+                lastLine ??= new Run();
+#endif
+                lastLine.Text = logLine.Text;
+                lastLine.Foreground = logLine.GetForegroundColor();
+            });
+        }
+
+#endregion
+
+        #region Helpers
+
+        /// <summary>
+        /// Clear all inlines of the paragraph
+        /// </summary>
+        private void ClearInlines() => _paragraph.Inlines.Clear();
+
+        /// <summary>
+        /// Save all inlines to console.log
+        /// </summary>
+        private void SaveInlines()
+        {
+            using (var sw = new StreamWriter(File.OpenWrite("console.log")))
+            {
+                foreach (var inline in _paragraph.Inlines)
+                {
+                    if (inline is Run run)
+                        sw.Write(run.Text);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Scroll the current view to the bottom
+        /// </summary>
+        public void ScrollToBottom() => OutputViewer.ScrollToBottom();
+
+        #endregion
+
+        #region EventHandlers
+
+        private void OnClearButton(object sender, EventArgs e)
+            => ClearInlines();
+
+        private void OnSaveButton(object sender, EventArgs e)
+            => SaveInlines();
+
+        private void OnTextChanged(object sender, TextChangedEventArgs e)
+            => ScrollToBottom();
+
+        private void OutputViewerSizeChanged(object sender, SizeChangedEventArgs e)
+            => ScrollToBottom();
+
+        #endregion
     }
 }

MPF.UI.Core/ViewModels/DiscInformationViewModel.cs

@@ -1,850 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using MPF.Core.Data;
-using MPF.Core.Utilities;
-using MPF.UI.Core.ComboBoxItems;
-using MPF.UI.Core.Windows;
-using SabreTools.RedumpLib.Data;
-
-namespace MPF.UI.Core.ViewModels
-{
-    public class DiscInformationViewModel
-    {
-        #region Fields
-
-        /// <summary>
-        /// Parent DiscInformationWindow object
-        /// </summary>
-        public DiscInformationWindow Parent { get; private set; }
-
-        /// <summary>
-        /// Application-level Options object
-        /// </summary>
-        public Options Options { get; private set; }
-
-        /// <summary>
-        /// SubmissionInfo object to fill and save
-        /// </summary>
-        public SubmissionInfo SubmissionInfo { get; private set; }
-
-        #endregion
-
-        #region Lists
-
-        /// <summary>
-        /// List of available disc categories
-        /// </summary>
-        public List<Element<DiscCategory>> Categories { get; private set; } = Element<DiscCategory>.GenerateElements().ToList();
-
-        /// <summary>
-        /// List of available regions
-        /// </summary>
-        public List<Element<Region>> Regions { get; private set; } = Element<Region>.GenerateElements().ToList();
-
-        /// <summary>
-        /// List of Redump-supported Regions
-        /// </summary>
-        private static readonly List<Region> RedumpRegions = new List<Region>
-        {
-            Region.Argentina,
-            Region.Asia,
-            Region.AsiaEurope,
-            Region.AsiaUSA,
-            Region.Australia,
-            Region.AustraliaGermany,
-            Region.AustraliaNewZealand,
-            Region.Austria,
-            Region.AustriaSwitzerland,
-            Region.Belarus,
-            Region.Belgium,
-            Region.BelgiumNetherlands,
-            Region.Brazil,
-            Region.Bulgaria,
-            Region.Canada,
-            Region.China,
-            Region.Croatia,
-            Region.Czechia,
-            Region.Denmark,
-            Region.Estonia,
-            Region.Europe,
-            Region.EuropeAsia,
-            Region.EuropeAustralia,
-            Region.EuropeCanada,
-            Region.EuropeGermany,
-            Region.Export,
-            Region.Finland,
-            Region.France,
-            Region.FranceSpain,
-            Region.Germany,
-            Region.GreaterChina,
-            Region.Greece,
-            Region.Hungary,
-            Region.Iceland,
-            Region.India,
-            Region.Ireland,
-            Region.Israel,
-            Region.Italy,
-            Region.Japan,
-            Region.JapanAsia,
-            Region.JapanEurope,
-            Region.JapanKorea,
-            Region.JapanUSA,
-            Region.SouthKorea,
-            Region.LatinAmerica,
-            Region.Lithuania,
-            Region.Netherlands,
-            Region.NewZealand,
-            Region.Norway,
-            Region.Poland,
-            Region.Portugal,
-            Region.Romania,
-            Region.RussianFederation,
-            Region.Scandinavia,
-            Region.Serbia,
-            Region.Singapore,
-            Region.Slovakia,
-            Region.SouthAfrica,
-            Region.Spain,
-            Region.SpainPortugal,
-            Region.Sweden,
-            Region.Switzerland,
-            Region.Taiwan,
-            Region.Thailand,
-            Region.Turkey,
-            Region.UnitedArabEmirates,
-            Region.UnitedKingdom,
-            Region.UKAustralia,
-            Region.Ukraine,
-            Region.UnitedStatesOfAmerica,
-            Region.USAAsia,
-            Region.USAAustralia,
-            Region.USABrazil,
-            Region.USACanada,
-            Region.USAEurope,
-            Region.USAGermany,
-            Region.USAJapan,
-            Region.USAKorea,
-            Region.World,
-        };
-
-        /// <summary>
-        /// List of available languages
-        /// </summary>
-        public List<Element<Language>> Languages { get; private set; } = Element<Language>.GenerateElements().ToList();
-
-        /// <summary>
-        /// List of Redump-supported Languages
-        /// </summary>
-        private static readonly List<Language> RedumpLanguages = new List<Language>
-        {
-            Language.Afrikaans,
-            Language.Albanian,
-            Language.Arabic,
-            Language.Armenian,
-            Language.Basque,
-            Language.Belarusian,
-            Language.Bulgarian,
-            Language.Catalan,
-            Language.Chinese,
-            Language.Croatian,
-            Language.Czech,
-            Language.Danish,
-            Language.Dutch,
-            Language.English,
-            Language.Estonian,
-            Language.Finnish,
-            Language.French,
-            Language.Gaelic,
-            Language.German,
-            Language.Greek,
-            Language.Hebrew,
-            Language.Hindi,
-            Language.Hungarian,
-            Language.Icelandic,
-            Language.Indonesian,
-            Language.Italian,
-            Language.Japanese,
-            Language.Korean,
-            Language.Latin,
-            Language.Latvian,
-            Language.Lithuanian,
-            Language.Macedonian,
-            Language.Norwegian,
-            Language.Polish,
-            Language.Portuguese,
-            Language.Panjabi,
-            Language.Romanian,
-            Language.Russian,
-            Language.Serbian,
-            Language.Slovak,
-            Language.Slovenian,
-            Language.Spanish,
-            Language.Swedish,
-            Language.Tamil,
-            Language.Thai,
-            Language.Turkish,
-            Language.Ukrainian,
-            Language.Vietnamese,
-        };
-
-        /// <summary>
-        /// List of available languages
-        /// </summary>
-        public List<Element<LanguageSelection>> LanguageSelections { get; private set; } = Element<LanguageSelection>.GenerateElements().ToList();
-
-        #endregion
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public DiscInformationViewModel(DiscInformationWindow parent, Options options, SubmissionInfo submissionInfo)
-        {
-            Parent = parent;
-            Options = options;
-            SubmissionInfo = submissionInfo.Clone() as SubmissionInfo ?? new SubmissionInfo();
-
-            // Limit lists, if necessary
-            if (this.Options.EnableRedumpCompatibility)
-            {
-                SetRedumpRegions();
-                SetRedumpLanguages();
-            }
-
-            // Add handlers
-            Parent.AcceptButton.Click += OnAcceptClick;
-            Parent.CancelButton.Click += OnCancelClick;
-            Parent.RingCodeGuideButton.Click += OnRingCodeGuideClick;
-
-            // Update UI with new values
-            ManipulateFields();
-            Load();
-        }
-
-        #region Helpers
-
-        /// <summary>
-        /// Enable tab entry on supported fields
-        /// </summary>
-        private void EnableTabsInInputFields()
-        {
-            // Additional Information
-            Parent.CommentsTextBox.Tab = true;
-
-            // Contents
-            Parent.GeneralContent.Tab = true;
-            Parent.GamesTextBox.Tab = true;
-            Parent.NetYarozeGamesTextBox.Tab = true;
-            Parent.PlayableDemosTextBox.Tab = true;
-            Parent.RollingDemosTextBox.Tab = true;
-            Parent.TechDemosTextBox.Tab = true;
-            Parent.GameFootageTextBox.Tab = true;
-            Parent.VideosTextBox.Tab = true;
-            Parent.PatchesTextBox.Tab = true;
-            Parent.SavegamesTextBox.Tab = true;
-            Parent.ExtrasTextBox.Tab = true;
-
-            // L0
-            Parent.L0MasteringRing.Tab = true;
-            Parent.L0MasteringSID.Tab = true;
-            Parent.L0Toolstamp.Tab = true;
-            Parent.L0MouldSID.Tab = true;
-            Parent.L0AdditionalMould.Tab = true;
-
-            // L1
-            Parent.L1MasteringRing.Tab = true;
-            Parent.L1MasteringSID.Tab = true;
-            Parent.L1Toolstamp.Tab = true;
-            Parent.L1MouldSID.Tab = true;
-            Parent.L1AdditionalMould.Tab = true;
-
-            // L2
-            Parent.L2MasteringRing.Tab = true;
-            Parent.L2MasteringSID.Tab = true;
-            Parent.L2Toolstamp.Tab = true;
-
-            // L3
-            Parent.L3MasteringRing.Tab = true;
-            Parent.L3MasteringSID.Tab = true;
-            Parent.L3Toolstamp.Tab = true;
-        }
-
-        /// <summary>
-        /// Hide any optional, read-only fields if they don't have a value
-        /// </summary>
-        private void HideReadOnlyFields()
-        {
-            if (SubmissionInfo?.FullyMatchedID == null)
-                Parent.FullyMatchedID.Visibility = Visibility.Collapsed;
-            else
-                Parent.FullyMatchedID.Text = SubmissionInfo.FullyMatchedID.ToString();
-            if (SubmissionInfo?.PartiallyMatchedIDs == null)
-                Parent.PartiallyMatchedIDs.Visibility = Visibility.Collapsed;
-            else
-                Parent.PartiallyMatchedIDs.Text = string.Join(", ", SubmissionInfo.PartiallyMatchedIDs);
-            if (SubmissionInfo?.CopyProtection?.AntiModchip == null)
-                Parent.AntiModchip.Visibility = Visibility.Collapsed;
-            else
-                Parent.AntiModchip.Text = SubmissionInfo.CopyProtection.AntiModchip.LongName();
-            if (SubmissionInfo?.TracksAndWriteOffsets?.OtherWriteOffsets == null)
-                Parent.DiscOffset.Visibility = Visibility.Collapsed;
-            else
-                Parent.DiscOffset.Text = SubmissionInfo.TracksAndWriteOffsets.OtherWriteOffsets;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.DMIHash) != true)
-                Parent.DMIHash.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.CommonDiscInfo?.ErrorsCount))
-                Parent.ErrorsCount.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.CommonDiscInfo?.EXEDateBuildDate))
-                Parent.EXEDateBuildDate.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.EDC?.EDC == null)
-                Parent.EDC.Visibility = Visibility.Collapsed;
-            else
-                Parent.EDC.Text = SubmissionInfo.EDC.EDC.LongName();
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.Filename) != true)
-                Parent.Filename.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.Header))
-                Parent.Header.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.InternalName) != true)
-                Parent.InternalName.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.InternalSerialName) != true)
-                Parent.InternalSerialName.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CopyProtection?.LibCrypt == null)
-                Parent.LibCrypt.Visibility = Visibility.Collapsed;
-            else
-                Parent.LibCrypt.Text = SubmissionInfo.CopyProtection.LibCrypt.LongName();
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.CopyProtection?.LibCryptData))
-                Parent.LibCryptData.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.PFIHash) != true)
-                Parent.PFIHash.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.PIC))
-                Parent.PIC.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.PVD))
-                Parent.PVD.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.Multisession) != true)
-                Parent.Multisession.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.RingNonZeroDataStart) != true)
-                Parent.RingNonZeroDataStart.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.CopyProtection?.SecuROMData))
-                Parent.SecuROMData.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.SSHash) != true)
-                Parent.SSHash.Visibility = Visibility.Collapsed;
-            if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.SecuritySectorRanges))
-                Parent.SecuritySectorRanges.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.SSVersion) != true)
-                Parent.SSVersion.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.UniversalHash) != true)
-                Parent.UniversalHash.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.VolumeLabel) != true)
-                Parent.VolumeLabel.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.XeMID) != true)
-                Parent.XeMID.Visibility = Visibility.Collapsed;
-            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.XMID) != true)
-                Parent.XMID.Visibility = Visibility.Collapsed;
-        }
-
-        /// <summary>
-        /// Manipulate fields based on the current disc
-        /// </summary>
-        private void ManipulateFields()
-        {
-            // Enable tabs in all fields, if required
-            if (this.Options.EnableTabsInInputFields)
-                EnableTabsInInputFields();
-
-            // Hide read-only fields that don't have values set
-            HideReadOnlyFields();
-
-            // Different media types mean different fields available
-            UpdateFromDiscType();
-
-            // Different systems mean different fields available
-            UpdateFromSystemType();
-        }
-
-        /// <summary>
-        /// Load the current contents of the base SubmissionInfo to the UI
-        /// </summary>
-        private void Load()
-        {
-            Parent.CategoryComboBox.SelectedIndex = Categories.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Category);
-            Parent.RegionComboBox.SelectedIndex = Regions.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Region);
-            if (SubmissionInfo.CommonDiscInfo.Languages != null)
-                Languages.ForEach(l => l.IsChecked = SubmissionInfo.CommonDiscInfo.Languages.Contains(l));
-            if (SubmissionInfo.CommonDiscInfo.LanguageSelection != null)
-                LanguageSelections.ForEach(ls => ls.IsChecked = SubmissionInfo.CommonDiscInfo.LanguageSelection.Contains(ls));
-
-            // TODO: Figure out if this can be automatically mapped instead
-
-            // Comment Fields
-            if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields != null)
-            {
-                // Additional Information
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.AlternativeTitle))
-                    Parent.AlternativeTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AlternativeTitle];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.AlternativeForeignTitle))
-                    Parent.AlternativeForeignTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AlternativeForeignTitle];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Genre))
-                    Parent.GenreTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Genre];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PostgapType))
-                    Parent.PostgapTypeCheckBox.IsChecked = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PostgapType] != null;
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Series))
-                    Parent.SeriesTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Series];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.VCD))
-                    Parent.VCDCheckBox.IsChecked = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VCD] != null;
-
-                // Physical Identifiers
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.BBFCRegistrationNumber))
-                    Parent.BBFCRegistrationNumberTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.BBFCRegistrationNumber];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.CDProjektID))
-                    Parent.CDProjektIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.CDProjektID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.DiscHologramID))
-                    Parent.DiscHologramIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DiscHologramID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.DNASDiscID))
-                    Parent.DNASDiscIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DNASDiscID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.ISBN))
-                    Parent.ISBNTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ISBN];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.ISSN))
-                    Parent.ISSNTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ISSN];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PPN))
-                    Parent.PPNTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PPN];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.VFCCode))
-                    Parent.VFCCodeTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VFCCode];
-
-                // Publisher Identifiers
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.AcclaimID))
-                    Parent.AcclaimIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AcclaimID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.ActivisionID))
-                    Parent.ActivisionIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ActivisionID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.BandaiID))
-                    Parent.BandaiIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.BandaiID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.ElectronicArtsID))
-                    Parent.ElectronicArtsIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ElectronicArtsID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.FoxInteractiveID))
-                    Parent.FoxInteractiveIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.FoxInteractiveID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.GTInteractiveID))
-                    Parent.GTInteractiveIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.GTInteractiveID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.JASRACID))
-                    Parent.JASRACIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.JASRACID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.KingRecordsID))
-                    Parent.KingRecordsIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KingRecordsID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.KoeiID))
-                    Parent.KoeiIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KoeiID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.KonamiID))
-                    Parent.KonamiIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KonamiID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.LucasArtsID))
-                    Parent.LucasArtsIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.LucasArtsID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.MicrosoftID))
-                    Parent.MicrosoftIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.MicrosoftID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.NaganoID))
-                    Parent.NaganoIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NaganoID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.NamcoID))
-                    Parent.NamcoIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NamcoID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.NipponIchiSoftwareID))
-                    Parent.NipponIchiSoftwareIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NipponIchiSoftwareID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.OriginID))
-                    Parent.OriginIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.OriginID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PonyCanyonID))
-                    Parent.PonyCanyonIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PonyCanyonID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SegaID))
-                    Parent.SegaIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SegaID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SelenID))
-                    Parent.SelenIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SelenID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SierraID))
-                    Parent.SierraIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SierraID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.TaitoID))
-                    Parent.TaitoIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.TaitoID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.UbisoftID))
-                    Parent.UbisoftIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UbisoftID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.ValveID))
-                    Parent.ValveIDTextBox.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ValveID];
-
-                // Read-Only Information
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.DMIHash))
-                    Parent.DMIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Filename))
-                    Parent.Filename.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.InternalName))
-                    Parent.InternalName.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.InternalSerialName))
-                    Parent.InternalSerialName.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Multisession))
-                    Parent.Multisession.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PFIHash))
-                    Parent.PFIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.RingNonZeroDataStart))
-                    Parent.RingNonZeroDataStart.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.RingNonZeroDataStart];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SSHash))
-                    Parent.SSHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SSVersion))
-                    Parent.SSVersion.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.UniversalHash))
-                    Parent.UniversalHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.VolumeLabel))
-                    Parent.VolumeLabel.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VolumeLabel];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.XeMID))
-                    Parent.XeMID.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XeMID];
-                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.XMID))
-                    Parent.XMID.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XMID];
-            }
-
-            // Content Fields
-            if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields != null)
-            {
-                // Games
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.Games))
-                    Parent.GamesTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Games];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.NetYarozeGames))
-                    Parent.NetYarozeGamesTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.NetYarozeGames];
-
-                // Demos
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.PlayableDemos))
-                    Parent.PlayableDemosTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.PlayableDemos];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.RollingDemos))
-                    Parent.RollingDemosTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.RollingDemos];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.TechDemos))
-                    Parent.TechDemosTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.TechDemos];
-
-                // Video
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.GameFootage))
-                    Parent.GameFootageTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.GameFootage];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.Videos))
-                    Parent.VideosTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Videos];
-
-                // Miscellaneous
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.Patches))
-                    Parent.PatchesTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Patches];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.Savegames))
-                    Parent.SavegamesTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Savegames];
-                if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields.ContainsKey(SiteCode.Extras))
-                    Parent.ExtrasTextBox.Text = SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Extras];
-            }
-        }
-
-        /// <summary>
-        /// Save the current contents of the UI to the base SubmissionInfo
-        /// </summary>
-        public void Save()
-        {
-            SubmissionInfo.CommonDiscInfo.Category = (Parent.CategoryComboBox.SelectedItem as Element<DiscCategory>)?.Value ?? DiscCategory.Games;
-            SubmissionInfo.CommonDiscInfo.Region = (Parent.RegionComboBox.SelectedItem as Element<Region>)?.Value ?? Region.World;
-            SubmissionInfo.CommonDiscInfo.Languages = Languages.Where(l => l.IsChecked).Select(l => l?.Value).ToArray();
-            if (!SubmissionInfo.CommonDiscInfo.Languages.Any())
-                SubmissionInfo.CommonDiscInfo.Languages = new Language?[] { null };
-            SubmissionInfo.CommonDiscInfo.LanguageSelection = LanguageSelections.Where(ls => ls.IsChecked).Select(ls => ls?.Value).ToArray();
-
-            // TODO: Figure out if this can be automatically mapped instead
-
-            // Initialize the dictionaries, if needed
-            if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields == null)
-#if NET48
-                SubmissionInfo.CommonDiscInfo.CommentsSpecialFields = new Dictionary<SiteCode?, string>();
-#else
-                SubmissionInfo.CommonDiscInfo.CommentsSpecialFields = new Dictionary<SiteCode, string>();
-#endif
-            if (SubmissionInfo.CommonDiscInfo.ContentsSpecialFields == null)
-#if NET48
-                SubmissionInfo.CommonDiscInfo.ContentsSpecialFields = new Dictionary<SiteCode?, string>();
-#else
-                SubmissionInfo.CommonDiscInfo.ContentsSpecialFields = new Dictionary<SiteCode, string>();
-#endif
-
-            #region Comment Fields
-
-            // Additional Information
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AlternativeTitle] = Parent.AlternativeTitleTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AlternativeForeignTitle] = Parent.AlternativeForeignTitleTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Genre] = Parent.GenreTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PostgapType] = Parent.PostgapTypeCheckBox.IsChecked?.ToString();
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Series] = Parent.SeriesTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VCD] = Parent.VCDCheckBox.IsChecked?.ToString();
-
-            // Physical Identifiers
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.BBFCRegistrationNumber] = Parent.BBFCRegistrationNumberTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.CDProjektID] = Parent.CDProjektIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DiscHologramID] = Parent.DiscHologramIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DNASDiscID] = Parent.DNASDiscIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ISBN] = Parent.ISBNTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ISSN] = Parent.ISSNTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PPN] = Parent.PPNTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VFCCode] = Parent.VFCCodeTextBox.Text;
-
-            // Publisher Identifiers
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.AcclaimID] = Parent.AcclaimIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ActivisionID] = Parent.ActivisionIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.BandaiID] = Parent.BandaiIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ElectronicArtsID] = Parent.ElectronicArtsIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.FoxInteractiveID] = Parent.FoxInteractiveIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.GTInteractiveID] = Parent.GTInteractiveIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.JASRACID] = Parent.JASRACIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KingRecordsID] = Parent.KingRecordsIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KoeiID] = Parent.KoeiIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.KonamiID] = Parent.KonamiIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.LucasArtsID] = Parent.LucasArtsIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.MicrosoftID] = Parent.MicrosoftIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NaganoID] = Parent.NaganoIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NamcoID] = Parent.NamcoIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.NipponIchiSoftwareID] = Parent.NipponIchiSoftwareIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.OriginID] = Parent.OriginIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PonyCanyonID] = Parent.PonyCanyonIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SegaID] = Parent.SegaIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SelenID] = Parent.SelenIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SierraID] = Parent.SierraIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.TaitoID] = Parent.TaitoIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UbisoftID] = Parent.UbisoftIDTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.ValveID] = Parent.ValveIDTextBox.Text;
-
-            // Read-Only Information
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = Parent.DMIHash.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename] = Parent.Filename.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName] = Parent.InternalName.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = Parent.InternalSerialName.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession] = Parent.Multisession.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = Parent.PFIHash.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.RingNonZeroDataStart] = Parent.RingNonZeroDataStart.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = Parent.SSHash.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = Parent.SSVersion.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash] = Parent.UniversalHash.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VolumeLabel] = Parent.VolumeLabel.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XeMID] = Parent.XeMID.Text;
-            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XMID] = Parent.XMID.Text;
-
-            #endregion
-
-            #region Content Fields
-
-            // Games
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Games] = Parent.GamesTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.NetYarozeGames] = Parent.NetYarozeGamesTextBox.Text;
-
-            // Demos
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.PlayableDemos] = Parent.PlayableDemosTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.RollingDemos] = Parent.RollingDemosTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.TechDemos] = Parent.TechDemosTextBox.Text;
-
-            // Video
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.GameFootage] = Parent.GameFootageTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Videos] = Parent.VideosTextBox.Text;
-
-            // Miscellaneous
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Patches] = Parent.PatchesTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Savegames] = Parent.SavegamesTextBox.Text;
-            SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[SiteCode.Extras] = Parent.ExtrasTextBox.Text;
-
-            #endregion
-        }
-
-        /// <summary>
-        /// Repopulate the list of Languages based on Redump support
-        /// </summary>
-        private void SetRedumpLanguages()
-        {
-            this.Languages = RedumpLanguages.Select(l => new Element<Language>(l)).ToList();
-        }
-
-        /// <summary>
-        /// Repopulate the list of Regions based on Redump support
-        /// </summary>
-        private void SetRedumpRegions()
-        {
-            this.Regions = RedumpRegions.Select(r => new Element<Region>(r)).ToList();
-        }
-
-        /// <summary>
-        /// Update visible fields and sections based on the media type
-        /// </summary>
-        private void UpdateFromDiscType()
-        {
-            // Sony-printed discs have layers in the opposite order
-            var system = SubmissionInfo?.CommonDiscInfo?.System;
-            bool reverseOrder = system.HasReversedRingcodes();
-
-            switch (SubmissionInfo?.CommonDiscInfo?.Media)
-            {
-                case DiscType.CD:
-                case DiscType.GDROM:
-                    Parent.L0Info.Header = "Data Side";
-                    Parent.L0MasteringRing.Label = "Mastering Ring";
-                    Parent.L0MasteringSID.Label = "Mastering SID";
-                    Parent.L0Toolstamp.Label = "Toolstamp/Mastering Code";
-                    Parent.L0MouldSID.Label = "Mould SID";
-                    Parent.L0AdditionalMould.Label = "Additional Mould";
-
-                    Parent.L1Info.Header = "Label Side";
-                    Parent.L1MasteringRing.Visibility = Visibility.Collapsed;
-                    Parent.L1MasteringSID.Visibility = Visibility.Collapsed;
-                    Parent.L1Toolstamp.Visibility = Visibility.Collapsed;
-                    Parent.L1MouldSID.Label = "Mould SID";
-                    Parent.L1AdditionalMould.Label = "Additional Mould";
-                    break;
-
-                case DiscType.DVD5:
-                case DiscType.DVD9:
-                case DiscType.HDDVDSL:
-                case DiscType.HDDVDDL:
-                case DiscType.BD25:
-                case DiscType.BD33:
-                case DiscType.BD50:
-                case DiscType.BD66:
-                case DiscType.BD100:
-                case DiscType.BD128:
-                case DiscType.NintendoGameCubeGameDisc:
-                case DiscType.NintendoWiiOpticalDiscSL:
-                case DiscType.NintendoWiiOpticalDiscDL:
-                case DiscType.NintendoWiiUOpticalDiscSL:
-                    // Quad-layer discs
-                    if (SubmissionInfo?.SizeAndChecksums?.Layerbreak3 != default(long))
-                    {
-                        Parent.L2Info.Visibility = Visibility.Visible;
-                        Parent.L3Info.Visibility = Visibility.Visible;
-
-                        Parent.L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
-                        Parent.L0MasteringRing.Label = "Mastering Ring";
-                        Parent.L0MasteringSID.Label = "Mastering SID";
-                        Parent.L0Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L0MouldSID.Label = "Data Side Mould SID";
-                        Parent.L0AdditionalMould.Label = "Data Side Additional Mould";
-
-                        Parent.L1Info.Header = "Layer 1";
-                        Parent.L1MasteringRing.Label = "Mastering Ring";
-                        Parent.L1MasteringSID.Label = "Mastering SID";
-                        Parent.L1Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L1MouldSID.Label = "Label Side Mould SID";
-                        Parent.L1AdditionalMould.Label = "Label Side Additional Mould";
-
-                        Parent.L2Info.Header = "Layer 2";
-                        Parent.L2MasteringRing.Label = "Mastering Ring";
-                        Parent.L2MasteringSID.Label = "Mastering SID";
-                        Parent.L2Toolstamp.Label = "Toolstamp/Mastering Code";
-
-                        Parent.L3Info.Header = reverseOrder ? "Layer 3 (Inner)" : "Layer 3 (Outer)";
-                        Parent.L3MasteringRing.Label = "Mastering Ring";
-                        Parent.L3MasteringSID.Label = "Mastering SID";
-                        Parent.L3Toolstamp.Label = "Toolstamp/Mastering Code";
-                    }
-
-                    // Triple-layer discs
-                    else if (SubmissionInfo?.SizeAndChecksums?.Layerbreak2 != default(long))
-                    {
-                        Parent.L2Info.Visibility = Visibility.Visible;
-
-                        Parent.L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
-                        Parent.L0MasteringRing.Label = "Mastering Ring";
-                        Parent.L0MasteringSID.Label = "Mastering SID";
-                        Parent.L0Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L0MouldSID.Label = "Data Side Mould SID";
-                        Parent.L0AdditionalMould.Label = "Data Side Additional Mould";
-
-                        Parent.L1Info.Header = "Layer 1";
-                        Parent.L1MasteringRing.Label = "Mastering Ring";
-                        Parent.L1MasteringSID.Label = "Mastering SID";
-                        Parent.L1Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L1MouldSID.Label = "Label Side Mould SID";
-                        Parent.L1AdditionalMould.Label = "Label Side Additional Mould";
-
-                        Parent.L2Info.Header = reverseOrder ? "Layer 2 (Inner)" : "Layer 2 (Outer)";
-                        Parent.L2MasteringRing.Label = "Mastering Ring";
-                        Parent.L2MasteringSID.Label = "Mastering SID";
-                        Parent.L2Toolstamp.Label = "Toolstamp/Mastering Code";
-                    }
-
-                    // Double-layer discs
-                    else if (SubmissionInfo?.SizeAndChecksums?.Layerbreak != default(long))
-                    {
-                        Parent.L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
-                        Parent.L0MasteringRing.Label = "Mastering Ring";
-                        Parent.L0MasteringSID.Label = "Mastering SID";
-                        Parent.L0Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L0MouldSID.Label = "Data Side Mould SID";
-                        Parent.L0AdditionalMould.Label = "Data Side Additional Mould";
-
-                        Parent.L1Info.Header = reverseOrder ? "Layer 1 (Inner)" : "Layer 1 (Outer)";
-                        Parent.L1MasteringRing.Label = "Mastering Ring";
-                        Parent.L1MasteringSID.Label = "Mastering SID";
-                        Parent.L1Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L1MouldSID.Label = "Label Side Mould SID";
-                        Parent.L1AdditionalMould.Label = "Label Side Additional Mould";
-                    }
-
-                    // Single-layer discs
-                    else
-                    {
-                        Parent.L0Info.Header = "Data Side";
-                        Parent.L0MasteringRing.Label = "Mastering Ring";
-                        Parent.L0MasteringSID.Label = "Mastering SID";
-                        Parent.L0Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L0MouldSID.Label = "Mould SID";
-                        Parent.L0AdditionalMould.Label = "Additional Mould";
-
-                        Parent.L1Info.Header = "Label Side";
-                        Parent.L1MasteringRing.Label = "Mastering Ring";
-                        Parent.L1MasteringSID.Label = "Mastering SID";
-                        Parent.L1Toolstamp.Label = "Toolstamp/Mastering Code";
-                        Parent.L1MouldSID.Label = "Mould SID";
-                        Parent.L1AdditionalMould.Label = "Additional Mould";
-                    }
-
-                    break;
-
-                // All other media we assume to have no rings
-                default:
-                    Parent.L0Info.Visibility = Visibility.Collapsed;
-                    Parent.L1Info.Visibility = Visibility.Collapsed;
-                    Parent.L2Info.Visibility = Visibility.Collapsed;
-                    Parent.L3Info.Visibility = Visibility.Collapsed;
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Update visible fields and sections based on the system type
-        /// </summary>
-        private void UpdateFromSystemType()
-        {
-            var system = SubmissionInfo?.CommonDiscInfo?.System;
-            switch (system)
-            {
-                case RedumpSystem.SonyPlayStation2:
-                    Parent.LanguageSelectionGrid.Visibility = Visibility.Visible;
-                    break;
-            }
-        }
-
-#endregion
-
-        #region Event Handlers
-
-        /// <summary>
-        /// Handler for AcceptButton Click event
-        /// </summary>
-        private void OnAcceptClick(object sender, RoutedEventArgs e)
-        {
-            Save();
-            Parent.DialogResult = true;
-            Parent.Close();
-        }
-
-        /// <summary>
-        /// Handler for CancelButton Click event
-        /// </summary>
-        private void OnCancelClick(object sender, RoutedEventArgs e)
-        {
-            Parent.DialogResult = false;
-            Parent.Close();
-        }
-
-        /// <summary>
-        /// Handler for RingCodeGuideButton Click event
-        /// </summary>
-        private void OnRingCodeGuideClick(object sender, RoutedEventArgs e)
-        {
-            var ringCodeGuideWindow = new RingCodeGuideWindow()
-            {
-                Owner = Parent,
-                WindowStartupLocation = WindowStartupLocation.CenterOwner,
-            };
-            ringCodeGuideWindow.Show();
-        }
-
-        #endregion
-    }
-}

MPF.UI.Core/ViewModels/LogViewModel.cs

@@ -1,293 +0,0 @@
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using MPF.Core.Data;
-using MPF.UI.Core.UserControls;
-
-namespace MPF.UI.Core.ViewModels
-{
-    public class LogViewModel
-    {
-        #region Fields
-
-        /// <summary>
-        /// Parent OptionsWindow object
-        /// </summary>
-        public LogOutput Parent { get; private set; }
-
-        #endregion
-
-        #region Private State Variables
-
-        /// <summary>
-        /// Paragraph backing the log
-        /// </summary>
-        private readonly Paragraph _paragraph;
-
-        /// <summary>
-        /// Cached value of the last line written
-        /// </summary>
-        private Run lastLine = null;
-
-        /// <summary>
-        /// Queue of items that need to be logged
-        /// </summary>
-        private readonly ProcessingQueue<LogLine> logQueue;
-
-        #endregion
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public LogViewModel(LogOutput parent)
-        {
-            Parent = parent;
-
-            // Add handlers
-            Parent.OutputViewer.SizeChanged += OutputViewerSizeChanged;
-            Parent.Output.TextChanged += OnTextChanged;
-            Parent.ClearButton.Click += OnClearButton;
-            Parent.SaveButton.Click += OnSaveButton;
-
-            // Update the internal state
-            var document = new FlowDocument()
-            {
-                Background = new SolidColorBrush(Color.FromArgb(0xFF, 0x20, 0x20, 0x20))
-            };
-            _paragraph = new Paragraph();
-            document.Blocks.Add(_paragraph);
-            Parent.Output.Document = document;
-
-            logQueue = new ProcessingQueue<LogLine>(ProcessLogLine);
-        }
-
-        #region Logging
-
-        /// <summary>
-        /// Log level for output
-        /// </summary>
-        public enum LogLevel
-        {
-            USER,
-            VERBOSE,
-            ERROR,
-            SECRET,
-        }
-
-        /// <summary>
-        /// Log line wrapper
-        /// </summary>
-        private struct LogLine
-        {
-            public readonly string Text;
-            public readonly LogLevel LogLevel;
-
-            public LogLine(string text, LogLevel logLevel)
-            {
-                this.Text = text;
-                this.LogLevel = logLevel;
-            }
-
-            /// <summary>
-            /// Get the foreground Brush for the current LogLevel
-            /// </summary>
-            /// <returns>Brush representing the color</returns>
-            public Brush GetForegroundColor()
-            {
-                switch (this.LogLevel)
-                {
-                    case LogLevel.SECRET:
-                        return Brushes.Blue;
-                    case LogLevel.ERROR:
-                        return Brushes.Red;
-                    case LogLevel.VERBOSE:
-                        return Brushes.Yellow;
-                    case LogLevel.USER:
-                    default:
-                        return Brushes.White;
-                }
-            }
-
-            /// <summary>
-            /// Generate a Run object from the current LogLine
-            /// </summary>
-            /// <returns>Run object based on internal values</returns>
-            public Run GenerateRun()
-            {
-                return new Run { Text = this.Text, Foreground = GetForegroundColor() };
-            }
-        }
-
-        /// <summary>
-        /// Enqueue text to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void Log(string text) => LogInternal(text, LogLevel.USER);
-
-        /// <summary>
-        /// Enqueue text with a newline to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void LogLn(string text) => Log(text + "\n");
-
-        /// <summary>
-        /// Enqueue error text to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void ErrorLog(string text) => LogInternal(text, LogLevel.ERROR);
-
-        /// <summary>
-        /// Enqueue error text with a newline to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void ErrorLogLn(string text) => ErrorLog(text + "\n");
-
-        /// <summary>
-        /// Enqueue secret text to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void SecretLog(string text) => LogInternal(text, LogLevel.SECRET);
-
-        /// <summary>
-        /// Enqueue secret text with a newline to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void SecretLogLn(string text) => SecretLog(text + "\n");
-
-        /// <summary>
-        /// Enqueue verbose text to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void VerboseLog(string text) => LogInternal(text, LogLevel.VERBOSE);
-
-        /// <summary>
-        /// Enqueue verbose text with a newline to the log
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        public void VerboseLogLn(string text) => VerboseLog(text + "\n");
-
-        /// <summary>
-        /// Reset the progress bar state
-        /// </summary>
-        public void ResetProgressBar()
-        {
-            Parent.Dispatcher.Invoke(() =>
-            {
-                Parent.ProgressBar.Value = 0;
-                Parent.ProgressLabel.Text = string.Empty;
-            });
-        }
-
-        /// <summary>
-        /// Enqueue text to the log with formatting
-        /// </summary>
-        /// <param name="text">Text to write to the log</param>
-        /// <param name="logLevel">LogLevel for the log</param>
-        private void LogInternal(string text, LogLevel logLevel)
-        {
-            // Null text gets ignored
-            if (text == null)
-                return;
-
-            // Enqueue the text
-            logQueue.Enqueue(new LogLine(text, logLevel));
-        }
-
-        /// <summary>
-        /// Process the log lines in the queue
-        /// </summary>
-        /// <param name="nextLogLine">LogLine item to process</param>
-        private void ProcessLogLine(LogLine nextLogLine)
-        {
-            // Null text gets ignored
-            string nextText = Parent.Dispatcher.Invoke(() => nextLogLine.Text);
-            if (nextText == null)
-                return;
-
-            try
-            {
-                if (nextText.StartsWith("\r"))
-                    ReplaceLastLine(nextLogLine);
-                else
-                    AppendToTextBox(nextLogLine);
-            }
-            catch (Exception ex)
-            {
-                // In the event that something fails horribly, we want to log
-                AppendToTextBox(new LogLine(ex.ToString(), LogLevel.ERROR));
-            }
-        }
-
-        /// <summary>
-        /// Append log line to the log text box
-        /// </summary>
-        /// <param name="logLine">LogLine value to append</param>
-        private void AppendToTextBox(LogLine logLine)
-        {
-            Parent.Dispatcher.Invoke(() =>
-            {
-                var run = logLine.GenerateRun();
-                _paragraph.Inlines.Add(run);
-                lastLine = run;
-            });
-        }
-
-        /// <summary>
-        /// Replace the last line written to the log text box
-        /// </summary>
-        /// <param name="logLine">LogLine value to append</param>
-        private void ReplaceLastLine(LogLine logLine)
-        {
-            Parent.Dispatcher.Invoke(() =>
-            {
-                lastLine.Text = logLine.Text;
-                lastLine.Foreground = logLine.GetForegroundColor();
-            });
-        }
-
-        #endregion
-
-        #region Helpers
-
-        /// <summary>
-        /// Scroll the current view to the bottom
-        /// </summary>
-        public void ScrollToBottom()
-        {
-            Parent.OutputViewer.ScrollToBottom();
-        }
-
-        #endregion
-
-        #region EventHandlers
-
-        private void OnClearButton(object sender, EventArgs e)
-        {
-            _paragraph.Inlines.Clear();
-            ResetProgressBar();
-        }
-
-        private void OnSaveButton(object sender, EventArgs e)
-        {
-            using (StreamWriter tw = new StreamWriter(File.OpenWrite("console.log")))
-            {
-                foreach (var inline in _paragraph.Inlines)
-                {
-                    if (inline is Run run)
-                        tw.Write(run.Text);
-                }
-            }
-        }
-
-        private void OnTextChanged(object sender, TextChangedEventArgs e) =>
-            ScrollToBottom();
-
-        private void OutputViewerSizeChanged(object sender, SizeChangedEventArgs e) =>
-            ScrollToBottom();
-
-        #endregion
-    }
-}

MPF.UI.Core/ViewModels/OptionsViewModel.cs

@@ -1,277 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Forms;
-using MPF.Core.Data;
-using MPF.UI.Core.ComboBoxItems;
-using MPF.UI.Core.Windows;
-using SabreTools.RedumpLib.Web;
-using WPFCustomMessageBox;
-
-namespace MPF.UI.Core.ViewModels
-{
-    public class OptionsViewModel
-    {
-        #region Fields
-
-        /// <summary>
-        /// Parent OptionsWindow object
-        /// </summary>
-        public OptionsWindow Parent { get; }
-
-        /// <summary>
-        /// Current set of options
-        /// </summary>
-        public Options Options { get; }
-
-        /// <summary>
-        /// Flag for if settings were saved or not
-        /// </summary>
-        public bool SavedSettings { get; private set; }
-
-        #endregion
-
-        #region Lists
-
-        /// <summary>
-        /// List of available internal programs
-        /// </summary>
-        public List<Element<InternalProgram>> InternalPrograms => PopulateInternalPrograms();
-
-        /// <summary>
-        /// Current list of supported system profiles
-        /// </summary>
-        public List<RedumpSystemComboBoxItem> Systems => RedumpSystemComboBoxItem.GenerateElements().ToList();
-
-        #endregion
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public OptionsViewModel(OptionsWindow parent, Options baseOptions)
-        {
-            Parent = parent;
-            Options = new Options(baseOptions);
-
-            // Add handlers
-            Parent.AaruPathButton.Click += BrowseForPathClick;
-            Parent.DiscImageCreatorPathButton.Click += BrowseForPathClick;
-            Parent.DefaultOutputPathButton.Click += BrowseForPathClick;
-
-            Parent.AcceptButton.Click += OnAcceptClick;
-            Parent.CancelButton.Click += OnCancelClick;
-            Parent.RedumpLoginTestButton.Click += OnRedumpTestClick;
-
-            // Update UI with new values
-            Load();
-        }
-
-        #region Load and Save
-
-        /// <summary>
-        /// Load any options-related elements
-        /// </summary>
-        private void Load()
-        {
-            Parent.InternalProgramComboBox.SelectedIndex = InternalPrograms.FindIndex(r => r == Options.InternalProgram);
-            Parent.DefaultSystemComboBox.SelectedIndex = Systems.FindIndex(r => r == Options.DefaultSystem);
-            Parent.RedumpPasswordBox.Password = Options.RedumpPassword;
-        }
-
-        /// <summary>
-        /// Save any options-related elements
-        /// </summary>
-        private void Save()
-        {
-            var selectedInternalProgram = Parent.InternalProgramComboBox.SelectedItem as Element<InternalProgram>;
-            Options.InternalProgram = selectedInternalProgram?.Value ?? InternalProgram.DiscImageCreator;
-            var selectedDefaultSystem = Parent.DefaultSystemComboBox.SelectedItem as RedumpSystemComboBoxItem;
-            Options.DefaultSystem = selectedDefaultSystem?.Value ?? null;
-            Options.RedumpPassword = Parent.RedumpPasswordBox.Password;
-
-            SavedSettings = true;
-        }
-
-        #endregion
-
-        #region Population
-
-        /// <summary>
-        /// Get a complete list of  supported internal programs
-        /// </summary>
-        private static List<Element<InternalProgram>> PopulateInternalPrograms()
-        {
-            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, InternalProgram.Redumper };
-            return internalPrograms.Select(ip => new Element<InternalProgram>(ip)).ToList();
-        }
-
-        #endregion
-
-        #region UI Commands
-
-        /// <summary>
-        /// Browse and set a path based on the invoking button
-        /// </summary>
-        private void BrowseForPath(System.Windows.Controls.Button button)
-        {
-            // If the button is null, we can't do anything
-            if (button == null)
-                return;
-
-            // Strips button prefix to obtain the setting name
-            string pathSettingName = button.Name.Substring(0, button.Name.IndexOf("Button"));
-
-            // TODO: hack for now, then we'll see
-            bool shouldBrowseForPath = pathSettingName == "DefaultOutputPath";
-
-            string currentPath = TextBoxForPathSetting(pathSettingName)?.Text;
-            string initialDirectory = AppDomain.CurrentDomain.BaseDirectory;
-            if (!shouldBrowseForPath && !string.IsNullOrEmpty(currentPath))
-                initialDirectory = Path.GetDirectoryName(Path.GetFullPath(currentPath));
-
-            CommonDialog dialog = shouldBrowseForPath
-                ? (CommonDialog)CreateFolderBrowserDialog()
-                : CreateOpenFileDialog(initialDirectory);
-            using (dialog)
-            {
-                DialogResult result = dialog.ShowDialog();
-                if (result == DialogResult.OK)
-                {
-                    string path = string.Empty;
-                    bool exists = false;
-
-                    if (shouldBrowseForPath && dialog is FolderBrowserDialog folderBrowserDialog)
-                    {
-                        path = folderBrowserDialog.SelectedPath;
-                        exists = Directory.Exists(path);
-                    }
-                    else if (dialog is OpenFileDialog openFileDialog)
-                    {
-                        path = openFileDialog.FileName;
-                        exists = File.Exists(path);
-                    }
-
-                    if (exists)
-                    {
-                        Options[pathSettingName] = path;
-                        TextBoxForPathSetting(pathSettingName).Text = path;
-                    }
-                    else
-                    {
-                        CustomMessageBox.Show(
-                            "Specified path doesn't exist!",
-                            "Error",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error
-                        );
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Optionally save the current options and close the parent window
-        /// </summary>
-        private void OptionalSaveAndClose(bool save)
-        {
-            // Save if we're supposed to
-            if (save)
-                Save();
-
-            Parent.Close();
-        }
-
-        /// <summary>
-        /// Test Redump login credentials
-        /// </summary>
-#if NET48
-        private bool? TestRedumpLogin()
-#else
-        private async Task<bool?> TestRedumpLogin()
-#endif
-        {
-#if NET48
-            (bool? success, string message) = RedumpWebClient.ValidateCredentials(Parent.RedumpUsernameTextBox.Text, Parent.RedumpPasswordBox.Password);
-#else
-            (bool? success, string message) = await RedumpHttpClient.ValidateCredentials(Parent.RedumpUsernameTextBox.Text, Parent.RedumpPasswordBox.Password);
-#endif
-            if (success == true)
-                CustomMessageBox.Show(Parent, message, "Success", MessageBoxButton.OK, MessageBoxImage.Information);
-            else if (success == false)
-                CustomMessageBox.Show(Parent, message, "Failure", MessageBoxButton.OK, MessageBoxImage.Error);
-            else
-                CustomMessageBox.Show(Parent, message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-
-            return success;
-        }
-
-        #endregion
-
-        #region UI Functionality
-
-        /// <summary>
-        /// Create an open folder dialog box
-        /// </summary>
-        private static FolderBrowserDialog CreateFolderBrowserDialog() => new FolderBrowserDialog();
-
-        /// <summary>
-        /// Create an open file dialog box
-        /// </summary>
-        private static OpenFileDialog CreateOpenFileDialog(string initialDirectory)
-        {
-            return new OpenFileDialog()
-            {
-                InitialDirectory = initialDirectory,
-                Filter = "Executables (*.exe)|*.exe",
-                FilterIndex = 0,
-                RestoreDirectory = true,
-            };
-        }
-
-        /// <summary>
-        /// Find a TextBox by setting name
-        /// </summary>
-        /// <param name="name">Setting name to find</param>
-        /// <returns>TextBox for that setting</returns>
-        private System.Windows.Controls.TextBox TextBoxForPathSetting(string name) =>
-            Parent.FindName(name + "TextBox") as System.Windows.Controls.TextBox;
-
-        #endregion
-
-        #region Event Handlers
-
-        /// <summary>
-        /// Handler for generic Click event
-        /// </summary>
-        private void BrowseForPathClick(object sender, EventArgs e) =>
-            BrowseForPath(sender as System.Windows.Controls.Button);
-
-        /// <summary>
-        /// Handler for AcceptButton Click event
-        /// </summary>
-        private void OnAcceptClick(object sender, EventArgs e) =>
-            OptionalSaveAndClose(true);
-
-        /// <summary>
-        /// Handler for CancelButtom Click event
-        /// </summary>
-        private void OnCancelClick(object sender, EventArgs e) =>
-            OptionalSaveAndClose(false);
-
-        /// <summary>
-        /// Test Redump credentials for validity
-        /// </summary>
-#if NET48
-        private void OnRedumpTestClick(object sender, EventArgs e) =>
-            TestRedumpLogin();
-#else
-        private async void OnRedumpTestClick(object sender, EventArgs e) =>
-            _ = await TestRedumpLogin();
-#endif
-
-        #endregion
-    }
-}

MPF.UI.Core/Windows/DiscInformationWindow.xaml

@@ -4,12 +4,17 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:MPF.UI.Core.UserControls"
+        xmlns:core="clr-namespace:MPF.UI.Core"
+        xmlns:redump="clr-namespace:SabreTools.RedumpLib.Data;assembly=SabreTools.RedumpLib"
         xmlns:windows="clr-namespace:MPF.UI.Core.Windows"
         mc:Ignorable="d"
         Title="Disc Information" Width="515" WindowStyle="None"
         WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"
         BorderBrush="DarkGray" BorderThickness="2">
 
+    <Window.Resources>
+        <core:ElementConverter x:Key="ElementConverter" />
+    </Window.Resources>
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" ResizeBorderThickness="0" />
     </WindowChrome.WindowChrome>
@@ -74,10 +79,12 @@
                                 <StackPanel Orientation="Vertical">
                                     <controls:UserInput Label="Title"
                                                     Text="{Binding SubmissionInfo.CommonDiscInfo.Title, Mode=TwoWay}"/>
-                                    <controls:UserInput x:Name="AlternativeTitleTextBox" Label="Alternative Title"/>
+                                    <controls:UserInput x:Name="AlternativeTitleTextBox" Label="Alternative Title"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)AlternativeTitle], Mode=TwoWay}"/>
                                     <controls:UserInput Label="Foreign Title (Non-Latin)" 
                                                     Text="{Binding SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin, Mode=TwoWay}"/>
-                                    <controls:UserInput x:Name="AlternativeForeignTitleTextBox" Label="Alternative Foreign Title"/>
+                                    <controls:UserInput x:Name="AlternativeForeignTitleTextBox" Label="Alternative Foreign Title"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)AlternativeForeignTitle], Mode=TwoWay}"/>
                                     <controls:UserInput Label="Disc Number / Letter"
                                                     Text="{Binding SubmissionInfo.CommonDiscInfo.DiscNumberLetter, Mode=TwoWay}"/>
                                     <controls:UserInput Label="Disc Title"
@@ -90,8 +97,9 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="CategoryLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Category" />
-                                        <ComboBox x:Name="CategoryComboBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ItemsSource="{Binding Categories}"
-                                          Style="{DynamicResource CustomComboBoxStyle}" />
+                                        <ComboBox x:Name="CategoryComboBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                                  ItemsSource="{Binding Categories}" SelectedItem="{Binding SubmissionInfo.CommonDiscInfo.Category, Converter={StaticResource ElementConverter}, Mode=TwoWay}"
+                                                  Style="{DynamicResource CustomComboBoxStyle}" />
                                     </Grid>
 
                                     <Grid>
@@ -101,8 +109,9 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="RegionLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Region" />
-                                        <ComboBox x:Name="RegionComboBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ItemsSource="{Binding Regions}"
-                                          Style="{DynamicResource CustomComboBoxStyle}" />
+                                        <ComboBox x:Name="RegionComboBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                                  ItemsSource="{Binding Regions}" SelectedItem="{Binding SubmissionInfo.CommonDiscInfo.Region, Converter={StaticResource ElementConverter}, Mode=TwoWay}"
+                                                  Style="{DynamicResource CustomComboBoxStyle}" />
                                     </Grid>
 
                                     <Grid>
@@ -112,7 +121,8 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="LanguagesLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Languages" />
-                                        <ComboBox x:Name="LanguagesComboBox" Grid.Row="0" Grid.Column="1" Height="24" HorizontalAlignment="Stretch" ItemsSource="{Binding Languages}"
+                                        <ComboBox x:Name="LanguagesComboBox" Grid.Row="0" Grid.Column="1" Height="24" HorizontalAlignment="Stretch"
+                                                  ItemsSource="{Binding Languages}"
                                           SelectedIndex="0" Style="{DynamicResource CustomComboBoxStyle}">
                                             <ComboBox.ItemTemplate>
                                                 <DataTemplate>
@@ -129,7 +139,8 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label x:Name="LanguageSelectionLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Language Selection Via" />
-                                        <ComboBox x:Name="LanguageSelectionComboBox" Grid.Row="0" Grid.Column="1" Height="24" HorizontalAlignment="Stretch" ItemsSource="{Binding LanguageSelections}"
+                                        <ComboBox x:Name="LanguageSelectionComboBox" Grid.Row="0" Grid.Column="1" Height="24" HorizontalAlignment="Stretch"
+                                                  ItemsSource="{Binding LanguageSelections}"
                                           SelectedIndex="0" Style="{DynamicResource CustomComboBoxStyle}">
                                             <ComboBox.ItemTemplate>
                                                 <DataTemplate>
@@ -164,7 +175,8 @@
                                     <controls:UserInput x:Name="CommentsTextBox" Label="Comments"
                                                         Text="{Binding SubmissionInfo.CommonDiscInfo.Comments, Mode=TwoWay}" TextHeight="50"
                                                         Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top" />
-                                    <controls:UserInput x:Name="GenreTextBox" Label="Genre"/>
+                                    <controls:UserInput x:Name="GenreTextBox" Label="Genre"
+                                                    Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Genre], Mode=TwoWay}"/>
                                     <controls:UserInput x:Name="ProtectionTextBox" Label="Protection" ToolTip="CAUTION: Only edit if you know what you are doing!"
                                                         Text="{Binding SubmissionInfo.CopyProtection.Protection, Mode=TwoWay}" TextHeight="75" TextWrapping="Wrap"
                                                         VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
@@ -175,9 +187,11 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label/>
-                                        <CheckBox Grid.Column="1" x:Name="PostgapTypeCheckBox" Content="Postgap type (Form 2)" Margin="0,4"/>
+                                        <CheckBox Grid.Column="1" x:Name="PostgapTypeCheckBox" Content="Postgap type (Form 2)" Margin="0,4"
+                                                  IsChecked="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PostgapType], Mode=TwoWay}"/>
                                     </Grid>
-                                    <controls:UserInput x:Name="SeriesTextBox" Label="Series"/>
+                                    <controls:UserInput x:Name="SeriesTextBox" Label="Series"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Series], Mode=TwoWay}"/>
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="0.75*" />
@@ -185,7 +199,8 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Label/>
-                                        <CheckBox Grid.Column="1" x:Name="VCDCheckBox" Content="V-CD" Margin="0,4"/>
+                                        <CheckBox Grid.Column="1" x:Name="VCDCheckBox" Content="V-CD" Margin="0,4"
+                                                  IsChecked="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)VCD], Mode=TwoWay}"/>
                                     </Grid>
                                 </StackPanel>
                             </GroupBox>
@@ -193,43 +208,74 @@
                             <GroupBox Header="Physical Identifiers" Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
                                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                                 <StackPanel Orientation="Vertical">
-                                    <controls:UserInput x:Name="BBFCRegistrationNumberTextBox" Label="BBFC Reg. No."/>
-                                    <controls:UserInput x:Name="CDProjektIDTextBox" Label="CD Projekt ID"/>
-                                    <controls:UserInput x:Name="DiscHologramIDTextBox" Label="Disc Hologram ID"/>
-                                    <controls:UserInput x:Name="DNASDiscIDTextBox" Label="DNAS Disc ID"/>
-                                    <controls:UserInput x:Name="ISBNTextBox" Label="ISBN"/>
-                                    <controls:UserInput x:Name="ISSNTextBox" Label="ISSN"/>
-                                    <controls:UserInput x:Name="PPNTextBox" Label="PPN"/>
-                                    <controls:UserInput x:Name="VFCCodeTextBox" Label="VFC code"/>
+                                    <controls:UserInput x:Name="BBFCRegistrationNumberTextBox" Label="BBFC Reg. No."
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)BBFCRegistrationNumber], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="DiscHologramIDTextBox" Label="Disc Hologram ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DiscHologramID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="DNASDiscIDTextBox" Label="DNAS Disc ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DNASDiscID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="ISBNTextBox" Label="ISBN"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)ISBN], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="ISSNTextBox" Label="ISSN"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)ISSN], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="PPNTextBox" Label="PPN"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PPN], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="VFCCodeTextBox" Label="VFC code"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)VFCCode], Mode=TwoWay}"/>
                                 </StackPanel>
                             </GroupBox>
 
                             <GroupBox Header="Publisher Identifiers" Margin="5" Padding="5" BorderThickness="1" BorderBrush="LightGray"
                                               HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                                 <StackPanel Orientation="Vertical">
-                                    <controls:UserInput x:Name="AcclaimIDTextBox" Label="Acclaim ID"/>
-                                    <controls:UserInput x:Name="ActivisionIDTextBox" Label="Activision ID"/>
-                                    <controls:UserInput x:Name="BandaiIDTextBox" Label="Bandai ID"/>
-                                    <controls:UserInput x:Name="ElectronicArtsIDTextBox" Label="Electronic Arts ID"/>
-                                    <controls:UserInput x:Name="FoxInteractiveIDTextBox" Label="Fox Interactive ID"/>
-                                    <controls:UserInput x:Name="GTInteractiveIDTextBox" Label="GT Interactive ID"/>
-                                    <controls:UserInput x:Name="JASRACIDTextBox" Label="JASRAC ID"/>
-                                    <controls:UserInput x:Name="KingRecordsIDTextBox" Label="King Records ID"/>
-                                    <controls:UserInput x:Name="KoeiIDTextBox" Label="Koei ID"/>
-                                    <controls:UserInput x:Name="KonamiIDTextBox" Label="Konami ID"/>
-                                    <controls:UserInput x:Name="LucasArtsIDTextBox" Label="LucasArts ID"/>
-                                    <controls:UserInput x:Name="MicrosoftIDTextBox" Label="Microsoft ID"/>
-                                    <controls:UserInput x:Name="NaganoIDTextBox" Label="Nagano ID"/>
-                                    <controls:UserInput x:Name="NamcoIDTextBox" Label="Namco ID"/>
-                                    <controls:UserInput x:Name="NipponIchiSoftwareIDTextBox" Label="Nippon Ichi Software ID"/>
-                                    <controls:UserInput x:Name="OriginIDTextBox" Label="Origin ID"/>
-                                    <controls:UserInput x:Name="PonyCanyonIDTextBox" Label="Pony Canyon ID"/>
-                                    <controls:UserInput x:Name="SegaIDTextBox" Label="Sega ID"/>
-                                    <controls:UserInput x:Name="SelenIDTextBox" Label="Selen ID"/>
-                                    <controls:UserInput x:Name="SierraIDTextBox" Label="Sierra ID"/>
-                                    <controls:UserInput x:Name="TaitoIDTextBox" Label="Taito ID"/>
-                                    <controls:UserInput x:Name="UbisoftIDTextBox" Label="Ubisoft ID"/>
-                                    <controls:UserInput x:Name="ValveIDTextBox" Label="Valve ID"/>
+                                    <controls:UserInput x:Name="AcclaimIDTextBox" Label="Acclaim ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)AcclaimID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="ActivisionIDTextBox" Label="Activision ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)ActivisionID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="BandaiIDTextBox" Label="Bandai ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)BandaiID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="CDProjektIDTextBox" Label="CD Projekt ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)CDProjektID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="ElectronicArtsIDTextBox" Label="Electronic Arts ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)ElectronicArtsID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="FoxInteractiveIDTextBox" Label="Fox Interactive ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)FoxInteractiveID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="GTInteractiveIDTextBox" Label="GT Interactive ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)GTInteractiveID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="JASRACIDTextBox" Label="JASRAC ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)JASRACID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="KingRecordsIDTextBox" Label="King Records ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)KingRecordsID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="KoeiIDTextBox" Label="Koei ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)KoeiID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="KonamiIDTextBox" Label="Konami ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)KonamiID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="LucasArtsIDTextBox" Label="LucasArts ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)LucasArtsID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="MicrosoftIDTextBox" Label="Microsoft ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)MicrosoftID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="NaganoIDTextBox" Label="Nagano ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)NaganoID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="NamcoIDTextBox" Label="Namco ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)NamcoID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="NipponIchiSoftwareIDTextBox" Label="Nippon Ichi Software ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)NipponIchiSoftwareID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="OriginIDTextBox" Label="Origin ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)OriginID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="PonyCanyonIDTextBox" Label="Pony Canyon ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PonyCanyonID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="SegaIDTextBox" Label="Sega ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SegaID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="SelenIDTextBox" Label="Selen ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SelenID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="SierraIDTextBox" Label="Sierra ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SierraID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="TaitoIDTextBox" Label="Taito ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)TaitoID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="UbisoftIDTextBox" Label="Ubisoft ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)UbisoftID], Mode=TwoWay}"/>
+                                    <controls:UserInput x:Name="ValveIDTextBox" Label="Valve ID"
+                                                        Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)ValveID], Mode=TwoWay}"/>
                                 </StackPanel>
                             </GroupBox>
                         </StackPanel>
@@ -245,31 +291,41 @@
                             
                             <!-- Games -->
                             <controls:UserInput x:Name="GamesTextBox" Label="Games" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Games], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="NetYarozeGamesTextBox" Label="Net Yaroze Games" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)NetYarozeGames], Mode=TwoWay}"/>
                             
                             <!-- Demos -->
                             <controls:UserInput x:Name="PlayableDemosTextBox" Label="Playable Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)PlayableDemos], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="RollingDemosTextBox" Label="Rolling Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)RollingDemos], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="TechDemosTextBox" Label="Tech Demos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)TechDemos], Mode=TwoWay}"/>
 
                             <!-- Video -->
                             <controls:UserInput x:Name="GameFootageTextBox" Label="Game Footage" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)GameFootage], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="VideosTextBox" Label="Videos" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Videos], Mode=TwoWay}"/>
 
                             <!-- Miscellaneous -->
                             <controls:UserInput x:Name="PatchesTextBox" Label="Patches" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Patches], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="SavegamesTextBox" Label="Savegames" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Savegames], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="ExtrasTextBox" Label="Extras" TextHeight="50"
-                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"/>
+                                                Enter="True" TextWrapping="Wrap" VerticalContentAlignmentValue="Top"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.ContentsSpecialFields[(redump:SiteCode)Extras], Mode=TwoWay}"/>
                         </StackPanel>
                     </ScrollViewer>
                 </TabItem>
@@ -339,50 +395,68 @@
                 <TabItem Header="Read-Only Info" Style="{DynamicResource CustomTabItemStyle}">
                     <ScrollViewer CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MaxHeight="500">
                         <StackPanel Orientation="Vertical">
-                            <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="FullyMatchedID" Label="Fully Matched ID" IsReadOnly="True"
+                                                Text="{Binding SubmissionInfo.FullyMatchedID, Mode=TwoWay}"/>
                             <controls:UserInput x:Name="PartiallyMatchedIDs" Label="Partially Matched ID(s)" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="AntiModchip" Label="Anti-Modchip" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="DiscOffset" Label="Disc Offset" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="DMIHash" Label="DMI Hash" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="EDC" Label="EDC" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="AntiModchip" Label="Anti-Modchip" IsReadOnly="True"
+                                                Text="{Binding SubmissionInfo.CopyProtection.AntiModchip, Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="DiscOffset" Label="Disc Offset" IsReadOnly="True"
+                                                Text="{Binding SubmissionInfo.TracksAndWriteOffsets.OtherWriteOffsets, Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="DMIHash" Label="DMI Hash" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)DMIHash], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="EDC" Label="EDC" IsReadOnly="True"
+                                                Text="{Binding SubmissionInfo.EDC.EDC, Mode=TwoWay}"/>
                             <controls:UserInput x:Name="ErrorsCount" Label="Error(s) Count" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.CommonDiscInfo.ErrorsCount, Mode=TwoWay}"/>
                             <controls:UserInput x:Name="EXEDateBuildDate" Label="EXE/Build Date" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.CommonDiscInfo.EXEDateBuildDate, Mode=TwoWay}"/>
                             <controls:UserInput x:Name="Filename" Label="Filename" IsReadOnly="True"
                                                 TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Filename], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="Header" Label="Header" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="InternalName" Label="Internal Names" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="InternalName" Label="Internal Names" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalName], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)InternalSerialName], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="Multisession" Label="Multisession" IsReadOnly="True" TextHeight="75" TextWrapping="NoWrap"
-                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="LibCrypt" Label="LibCrypt" IsReadOnly="True"/>
+                                                VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)Multisession], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="LibCrypt" Label="LibCrypt" IsReadOnly="True"
+                                                Text="{Binding SubmissionInfo.CopyProtection.LibCrypt, Mode=TwoWay}"/>
                             <controls:UserInput x:Name="LibCryptData" Label="LibCrypt Data" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.CopyProtection.LibCryptData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="PFIHash" Label="PFI Hash" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="PFIHash" Label="PFI Hash" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)PFIHash], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="PIC" Label="PIC" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.PIC, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
                             <controls:UserInput x:Name="PVD" Label="PVD" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="RingNonZeroDataStart" Label="Ring Non-Zero Data Start" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="RingNonZeroDataStart" Label="Ring Non-Zero Data Start" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)RingNonZeroDataStart], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="SSHash" Label="Security Sector Hash" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="SSHash" Label="Security Sector Hash" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSHash], Mode=TwoWay}"/>
                             <controls:UserInput x:Name="SecuritySectorRanges" Label="Security Sector Ranges" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-                            <controls:UserInput x:Name="SSVersion" Label="Security Sector Version" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="UniversalHash" Label="Universal Hash (SHA-1)" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="VolumeLabel" Label="Volume Label" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="XeMID" Label="XeMID" IsReadOnly="True"/>
-                            <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="SSVersion" Label="Security Sector Version" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)SSVersion], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="UniversalHash" Label="Universal Hash (SHA-1)" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)UniversalHash], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="VolumeLabel" Label="Volume Label" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)VolumeLabel], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="XeMID" Label="XeMID" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XeMID], Mode=TwoWay}"/>
+                            <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"
+                                                Text="{Binding Path=SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[(redump:SiteCode)XMID], Mode=TwoWay}"/>
 
                             <!-- TODO: Add track/checksum data once there's a reasonable way to do so -->
                         </StackPanel>

MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs

@@ -1,5 +1,8 @@
-using MPF.Core.Data;
-using MPF.UI.Core.ViewModels;
+using System.Linq;
+using System.Windows;
+using MPF.Core.Data;
+using MPF.Core.UI.ViewModels;
+using MPF.Core.Utilities;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.UI.Core.Windows
@@ -12,15 +15,388 @@ namespace MPF.UI.Core.Windows
         /// <summary>
         /// Read-only access to the current disc information view model
         /// </summary>
-        public DiscInformationViewModel DiscInformationViewModel => DataContext as DiscInformationViewModel;
+        public DiscInformationViewModel DiscInformationViewModel => DataContext as DiscInformationViewModel ?? new DiscInformationViewModel(new Options(), new SubmissionInfo());
 
         /// <summary>
         /// Constructor
         /// </summary>
+#if NET48
         public DiscInformationWindow(Options options, SubmissionInfo submissionInfo)
+#else
+        public DiscInformationWindow(Options options, SubmissionInfo? submissionInfo)
+#endif
         {
             InitializeComponent();
-            DataContext = new DiscInformationViewModel(this, options, submissionInfo);
+            DataContext = new DiscInformationViewModel(options, submissionInfo);
+            DiscInformationViewModel.Load();
+
+            // Limit lists, if necessary
+            if (options.EnableRedumpCompatibility)
+            {
+                DiscInformationViewModel.SetRedumpRegions();
+                DiscInformationViewModel.SetRedumpLanguages();
+            }
+
+            // Add handlers
+            AcceptButton.Click += OnAcceptClick;
+            CancelButton.Click += OnCancelClick;
+            RingCodeGuideButton.Click += OnRingCodeGuideClick;
+
+            // Update UI with new values
+            ManipulateFields(options, submissionInfo);
         }
+
+        #region Helpers
+
+        /// <summary>
+        /// Manipulate fields based on the current disc
+        /// </summary>
+#if NET48
+        private void ManipulateFields(Options options, SubmissionInfo submissionInfo)
+#else
+        private void ManipulateFields(Options options, SubmissionInfo? submissionInfo)
+#endif
+        {
+            // Enable tabs in all fields, if required
+            if (options.EnableTabsInInputFields)
+                EnableTabsInInputFields();
+
+            // Hide read-only fields that don't have values set
+            HideReadOnlyFields(submissionInfo);
+
+            // Different media types mean different fields available
+            UpdateFromDiscType(submissionInfo);
+
+            // Different systems mean different fields available
+            UpdateFromSystemType(submissionInfo);
+        }
+
+        /// <summary>
+        /// Enable tab entry on supported fields
+        /// </summary>
+        /// TODO: See if these can be done by binding
+        private void EnableTabsInInputFields()
+        {
+            // Additional Information
+            CommentsTextBox.Tab = true;
+
+            // Contents
+            GeneralContent.Tab = true;
+            GamesTextBox.Tab = true;
+            NetYarozeGamesTextBox.Tab = true;
+            PlayableDemosTextBox.Tab = true;
+            RollingDemosTextBox.Tab = true;
+            TechDemosTextBox.Tab = true;
+            GameFootageTextBox.Tab = true;
+            VideosTextBox.Tab = true;
+            PatchesTextBox.Tab = true;
+            SavegamesTextBox.Tab = true;
+            ExtrasTextBox.Tab = true;
+
+            // L0
+            L0MasteringRing.Tab = true;
+            L0MasteringSID.Tab = true;
+            L0Toolstamp.Tab = true;
+            L0MouldSID.Tab = true;
+            L0AdditionalMould.Tab = true;
+
+            // L1
+            L1MasteringRing.Tab = true;
+            L1MasteringSID.Tab = true;
+            L1Toolstamp.Tab = true;
+            L1MouldSID.Tab = true;
+            L1AdditionalMould.Tab = true;
+
+            // L2
+            L2MasteringRing.Tab = true;
+            L2MasteringSID.Tab = true;
+            L2Toolstamp.Tab = true;
+
+            // L3
+            L3MasteringRing.Tab = true;
+            L3MasteringSID.Tab = true;
+            L3Toolstamp.Tab = true;
+        }
+
+        /// <summary>
+        /// Hide any optional, read-only fields if they don't have a value
+        /// </summary>
+        /// TODO: Figure out how to bind the PartiallyMatchedIDs array to a text box
+        /// TODO: Convert visibility to a binding
+#if NET48
+        private void HideReadOnlyFields(SubmissionInfo submissionInfo)
+#else
+        private void HideReadOnlyFields(SubmissionInfo? submissionInfo)
+#endif
+        {
+            // If there's no submission information
+            if (submissionInfo == null)
+                return;
+
+            if (submissionInfo.FullyMatchedID == null)
+                FullyMatchedID.Visibility = Visibility.Collapsed;
+            if (submissionInfo.PartiallyMatchedIDs == null)
+                PartiallyMatchedIDs.Visibility = Visibility.Collapsed;
+            else
+                PartiallyMatchedIDs.Text = string.Join(", ", submissionInfo.PartiallyMatchedIDs);
+            if (submissionInfo.CopyProtection?.AntiModchip == null)
+                AntiModchip.Visibility = Visibility.Collapsed;
+            if (submissionInfo.TracksAndWriteOffsets?.OtherWriteOffsets == null)
+                DiscOffset.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.Keys?.Contains(SiteCode.DMIHash) != true)
+                DMIHash.Visibility = Visibility.Collapsed;
+            if (submissionInfo.EDC?.EDC == null)
+                EDC.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.CommonDiscInfo?.ErrorsCount))
+                ErrorsCount.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.CommonDiscInfo?.EXEDateBuildDate))
+                EXEDateBuildDate.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.Filename) != true)
+                Filename.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.Extras?.Header))
+                Header.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.InternalName) != true)
+                InternalName.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.InternalSerialName) != true)
+                InternalSerialName.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.Multisession) != true)
+                Multisession.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CopyProtection?.LibCrypt == null)
+                LibCrypt.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.CopyProtection?.LibCryptData))
+                LibCryptData.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.PFIHash) != true)
+                PFIHash.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.Extras?.PIC))
+                PIC.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.Extras?.PVD))
+                PVD.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.RingNonZeroDataStart) != true)
+                RingNonZeroDataStart.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.CopyProtection?.SecuROMData))
+                SecuROMData.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.SSHash) != true)
+                SSHash.Visibility = Visibility.Collapsed;
+            if (string.IsNullOrWhiteSpace(submissionInfo.Extras?.SecuritySectorRanges))
+                SecuritySectorRanges.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.SSVersion) != true)
+                SSVersion.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.UniversalHash) != true)
+                UniversalHash.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.VolumeLabel) != true)
+                VolumeLabel.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.XeMID) != true)
+                XeMID.Visibility = Visibility.Collapsed;
+            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.XMID) != true)
+                XMID.Visibility = Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// Update visible fields and sections based on the media type
+        /// </summary>
+        /// TODO: See if these can be done by binding
+#if NET48
+        private void UpdateFromDiscType(SubmissionInfo submissionInfo)
+#else
+        private void UpdateFromDiscType(SubmissionInfo? submissionInfo)
+#endif
+        {
+            // Sony-printed discs have layers in the opposite order
+            var system = submissionInfo?.CommonDiscInfo?.System;
+            bool reverseOrder = system.HasReversedRingcodes();
+
+            switch (submissionInfo?.CommonDiscInfo?.Media)
+            {
+                case DiscType.CD:
+                case DiscType.GDROM:
+                    L0Info.Header = "Data Side";
+                    L0MasteringRing.Label = "Mastering Ring";
+                    L0MasteringSID.Label = "Mastering SID";
+                    L0Toolstamp.Label = "Toolstamp/Mastering Code";
+                    L0MouldSID.Label = "Mould SID";
+                    L0AdditionalMould.Label = "Additional Mould";
+
+                    L1Info.Header = "Label Side";
+                    L1MasteringRing.Visibility = Visibility.Collapsed;
+                    L1MasteringSID.Visibility = Visibility.Collapsed;
+                    L1Toolstamp.Visibility = Visibility.Collapsed;
+                    L1MouldSID.Label = "Mould SID";
+                    L1AdditionalMould.Label = "Additional Mould";
+                    break;
+
+                case DiscType.DVD5:
+                case DiscType.DVD9:
+                case DiscType.HDDVDSL:
+                case DiscType.HDDVDDL:
+                case DiscType.BD25:
+                case DiscType.BD33:
+                case DiscType.BD50:
+                case DiscType.BD66:
+                case DiscType.BD100:
+                case DiscType.BD128:
+                case DiscType.NintendoGameCubeGameDisc:
+                case DiscType.NintendoWiiOpticalDiscSL:
+                case DiscType.NintendoWiiOpticalDiscDL:
+                case DiscType.NintendoWiiUOpticalDiscSL:
+                    // Quad-layer discs
+                    if (submissionInfo?.SizeAndChecksums?.Layerbreak3 != default(long))
+                    {
+                        L2Info.Visibility = Visibility.Visible;
+                        L3Info.Visibility = Visibility.Visible;
+
+                        L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
+                        L0MasteringRing.Label = "Mastering Ring";
+                        L0MasteringSID.Label = "Mastering SID";
+                        L0Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Data Side Mould SID";
+                        L0AdditionalMould.Label = "Data Side Additional Mould";
+
+                        L1Info.Header = "Layer 1";
+                        L1MasteringRing.Label = "Mastering Ring";
+                        L1MasteringSID.Label = "Mastering SID";
+                        L1Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Label Side Mould SID";
+                        L1AdditionalMould.Label = "Label Side Additional Mould";
+
+                        L2Info.Header = "Layer 2";
+                        L2MasteringRing.Label = "Mastering Ring";
+                        L2MasteringSID.Label = "Mastering SID";
+                        L2Toolstamp.Label = "Toolstamp/Mastering Code";
+
+                        L3Info.Header = reverseOrder ? "Layer 3 (Inner)" : "Layer 3 (Outer)";
+                        L3MasteringRing.Label = "Mastering Ring";
+                        L3MasteringSID.Label = "Mastering SID";
+                        L3Toolstamp.Label = "Toolstamp/Mastering Code";
+                    }
+
+                    // Triple-layer discs
+                    else if (submissionInfo?.SizeAndChecksums?.Layerbreak2 != default(long))
+                    {
+                        L2Info.Visibility = Visibility.Visible;
+
+                        L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
+                        L0MasteringRing.Label = "Mastering Ring";
+                        L0MasteringSID.Label = "Mastering SID";
+                        L0Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Data Side Mould SID";
+                        L0AdditionalMould.Label = "Data Side Additional Mould";
+
+                        L1Info.Header = "Layer 1";
+                        L1MasteringRing.Label = "Mastering Ring";
+                        L1MasteringSID.Label = "Mastering SID";
+                        L1Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Label Side Mould SID";
+                        L1AdditionalMould.Label = "Label Side Additional Mould";
+
+                        L2Info.Header = reverseOrder ? "Layer 2 (Inner)" : "Layer 2 (Outer)";
+                        L2MasteringRing.Label = "Mastering Ring";
+                        L2MasteringSID.Label = "Mastering SID";
+                        L2Toolstamp.Label = "Toolstamp/Mastering Code";
+                    }
+
+                    // Double-layer discs
+                    else if (submissionInfo?.SizeAndChecksums?.Layerbreak != default(long))
+                    {
+                        L0Info.Header = reverseOrder ? "Layer 0 (Outer)" : "Layer 0 (Inner)";
+                        L0MasteringRing.Label = "Mastering Ring";
+                        L0MasteringSID.Label = "Mastering SID";
+                        L0Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Data Side Mould SID";
+                        L0AdditionalMould.Label = "Data Side Additional Mould";
+
+                        L1Info.Header = reverseOrder ? "Layer 1 (Inner)" : "Layer 1 (Outer)";
+                        L1MasteringRing.Label = "Mastering Ring";
+                        L1MasteringSID.Label = "Mastering SID";
+                        L1Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Label Side Mould SID";
+                        L1AdditionalMould.Label = "Label Side Additional Mould";
+                    }
+
+                    // Single-layer discs
+                    else
+                    {
+                        L0Info.Header = "Data Side";
+                        L0MasteringRing.Label = "Mastering Ring";
+                        L0MasteringSID.Label = "Mastering SID";
+                        L0Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Mould SID";
+                        L0AdditionalMould.Label = "Additional Mould";
+
+                        L1Info.Header = "Label Side";
+                        L1MasteringRing.Label = "Mastering Ring";
+                        L1MasteringSID.Label = "Mastering SID";
+                        L1Toolstamp.Label = "Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Mould SID";
+                        L1AdditionalMould.Label = "Additional Mould";
+                    }
+
+                    break;
+
+                // All other media we assume to have no rings
+                default:
+                    L0Info.Visibility = Visibility.Collapsed;
+                    L1Info.Visibility = Visibility.Collapsed;
+                    L2Info.Visibility = Visibility.Collapsed;
+                    L3Info.Visibility = Visibility.Collapsed;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Update visible fields and sections based on the system type
+        /// </summary>
+        /// TODO: See if these can be done by binding
+#if NET48
+        private void UpdateFromSystemType(SubmissionInfo submissionInfo)
+#else
+        private void UpdateFromSystemType(SubmissionInfo? submissionInfo)
+#endif
+        {
+            var system = submissionInfo?.CommonDiscInfo?.System;
+            switch (system)
+            {
+                case RedumpSystem.SonyPlayStation2:
+                    LanguageSelectionGrid.Visibility = Visibility.Visible;
+                    break;
+            }
+        }
+
+#endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for AcceptButton Click event
+        /// </summary>
+        private void OnAcceptClick(object sender, RoutedEventArgs e)
+        {
+            DiscInformationViewModel.Save();
+            DialogResult = true;
+            Close();
+        }
+
+        /// <summary>
+        /// Handler for CancelButton Click event
+        /// </summary>
+        private void OnCancelClick(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+        /// <summary>
+        /// Handler for RingCodeGuideButton Click event
+        /// </summary>
+        private void OnRingCodeGuideClick(object sender, RoutedEventArgs e)
+        {
+            var ringCodeGuideWindow = new RingCodeGuideWindow()
+            {
+                Owner = this,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            };
+            ringCodeGuideWindow.Show();
+        }
+
+        #endregion
     }
 }

MPF.UI.Core/Windows/MainWindow.xaml

@@ -4,20 +4,23 @@
                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                         xmlns:controls="clr-namespace:MPF.UI.Core.UserControls"
+                        xmlns:core="clr-namespace:MPF.UI.Core"
                         xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
-                        xmlns:viewModels="clr-namespace:MPF.UI.Core.ViewModels"
+                        xmlns:viewModels="clr-namespace:MPF.Core.UI.ViewModels;assembly=MPF.Core"
                         mc:Ignorable="d"
                         Title="Media Preservation Frontend" Width="600" WindowStyle="None"
                         WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" SizeToContent="Height"
                         BorderBrush="DarkGray" BorderThickness="2">
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="0" ResizeBorderThickness="0" />
-    </WindowChrome.WindowChrome>
-
     <Window.DataContext>
         <viewModels:MainViewModel/>
     </Window.DataContext>
+    <Window.Resources>
+        <core:ElementConverter x:Key="ElementConverter" />
+    </Window.Resources>
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" ResizeBorderThickness="0" />
+    </WindowChrome.WindowChrome>
 
     <Grid>
         <StackPanel Orientation="Vertical">
@@ -52,7 +55,8 @@
                             <MenuItem x:Name="OptionsMenuItem" Header="_Options" HorizontalAlignment="Left" Width="185"
                                   Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
                                   Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
-                                  Template="{DynamicResource CustomMenuItemTemplate}" />
+                                  Template="{DynamicResource CustomMenuItemTemplate}"
+                                  IsEnabled="{Binding OptionsMenuItemEnabled}"/>
                             <MenuItem x:Name="DebugViewMenuItem" Header="_Debug Info Window" HorizontalAlignment="Left" Width="185"
                                       Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
                                       Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
@@ -123,7 +127,9 @@
                     </Grid.RowDefinitions>
 
                     <Label x:Name="SystemMediaTypeLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Content="System/Media Type" />
-                    <ComboBox x:Name="SystemTypeComboBox" Grid.Row="0" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left" ItemsSource="{Binding Systems}" SelectedIndex="0" Style="{DynamicResource CustomComboBoxStyle}">
+                    <ComboBox x:Name="SystemTypeComboBox" Grid.Row="0" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left"
+                              ItemsSource="{Binding Systems}" SelectedItem="{Binding Path=CurrentSystem, Converter={StaticResource ElementConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                              IsEnabled="{Binding SystemTypeComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}">
                         <ComboBox.ItemContainerStyle>
                             <Style TargetType="{x:Type ComboBoxItem}">
                                 <Style.Triggers>
@@ -134,15 +140,21 @@
                             </Style>
                         </ComboBox.ItemContainerStyle>
                     </ComboBox>
-                    <ComboBox x:Name="MediaTypeComboBox" Grid.Row="0" Grid.Column="1" Height="22" Width="140" HorizontalAlignment="Right" Style="{DynamicResource CustomComboBoxStyle}" />
+                    <ComboBox x:Name="MediaTypeComboBox" Grid.Row="0" Grid.Column="1" Height="22" Width="140" HorizontalAlignment="Right"
+                              ItemsSource="{Binding MediaTypes}" SelectedItem="{Binding Path=CurrentMediaType, Converter={StaticResource ElementConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                              IsEnabled="{Binding MediaTypeComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}" />
 
                     <Label x:Name="OutputPathLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="Output Path"/>
-                    <TextBox x:Name="OutputPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" Width="345" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
+                    <TextBox x:Name="OutputPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" Width="345" HorizontalAlignment="Left" VerticalContentAlignment="Center"
+                             Text="{Binding OutputPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             IsEnabled="{Binding OutputPathTextBoxEnabled}" />
                     <Button x:Name="OutputPathBrowseButton" Grid.Row="1" Grid.Column="1" Height="22" Width="50" HorizontalAlignment="Right" Content="Browse"
-                            Style="{DynamicResource CustomButtonStyle}"/>
+                            IsEnabled="{Binding OutputPathBrowseButtonEnabled}" Style="{DynamicResource CustomButtonStyle}"/>
 
                     <Label x:Name="DriveLetterLabel" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Drive Letter"/>
-                    <ComboBox x:Name="DriveLetterComboBox" Grid.Row="2" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}">
+                    <ComboBox x:Name="DriveLetterComboBox" Grid.Row="2" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left"
+                              ItemsSource="{Binding Drives}" SelectedItem="{Binding Path=CurrentDrive, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                              IsEnabled="{Binding DriveLetterComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Letter}" />
@@ -151,37 +163,48 @@
                     </ComboBox>
 
                     <Label x:Name="DriveSpeedLabel" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="Drive Speed"/>
-                    <ComboBox x:Name="DriveSpeedComboBox" Grid.Row="3" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}" />
+                    <ComboBox x:Name="DriveSpeedComboBox" Grid.Row="3" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left"
+                              ItemsSource="{Binding DriveSpeeds}" SelectedItem="{Binding Path=DriveSpeed, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                              IsEnabled="{Binding DriveSpeedComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}" />
 
                     <Label x:Name="DumpingProgramLabel" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Content="Dumping Program"/>
-                    <ComboBox x:Name="DumpingProgramComboBox" Grid.Row="4" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}" />
-                    
+                    <ComboBox x:Name="DumpingProgramComboBox" Grid.Row="4" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left"
+                              ItemsSource="{Binding InternalPrograms}" SelectedItem="{Binding Path=CurrentProgram, Converter={StaticResource ElementConverter}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                              IsEnabled="{Binding DumpingProgramComboBoxEnabled}" Style="{DynamicResource CustomComboBoxStyle}" />
+
                     <Label x:Name="ParametersLabel" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="Parameters"/>
-                    <TextBox x:Name="ParametersTextBox" Grid.Row="5" Grid.Column="1" Height="22" Width="370" HorizontalAlignment="Left" IsEnabled="False" VerticalContentAlignment="Center" />
-                    <CheckBox x:Name="EnableParametersCheckBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Right" IsChecked="False" />
+                    <TextBox x:Name="ParametersTextBox" Grid.Row="5" Grid.Column="1" Height="22" Width="370" HorizontalAlignment="Left" VerticalContentAlignment="Center"
+                             Text="{Binding Parameters, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             IsEnabled="{Binding ParametersCheckBoxEnabled}"/>
+                    <CheckBox x:Name="EnableParametersCheckBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Right"
+                             IsChecked="{Binding ParametersCheckBoxEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             IsEnabled="{Binding EnableParametersCheckBoxEnabled}"/>
                 </Grid>
             </GroupBox>
 
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" Header="Controls">
                 <UniformGrid Columns="4" Margin="5,5,5,5">
-                    <Button x:Name="StartStopButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" IsDefault="True" Content="Start Dumping"
-                            IsEnabled="False" Style="{DynamicResource CustomButtonStyle}" />
+                    <Button x:Name="StartStopButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" IsDefault="True"
+                            Content="{Binding StartStopButtonText, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                            IsEnabled="{Binding StartStopButtonEnabled}" Style="{DynamicResource CustomButtonStyle}" />
                     <Button x:Name="MediaScanButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for discs"
-                            Style="{DynamicResource CustomButtonStyle}" />
+                            IsEnabled="{Binding MediaScanButtonEnabled}" Style="{DynamicResource CustomButtonStyle}" />
                     <Button x:Name="UpdateVolumeLabel" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Update Label"
-                            Style="{DynamicResource CustomButtonStyle}" />
+                            IsEnabled="{Binding UpdateVolumeLabelEnabled}" Style="{DynamicResource CustomButtonStyle}" />
                     <Button x:Name="CopyProtectScanButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for protection"
-                            Style="{DynamicResource CustomButtonStyle}" />
+                            IsEnabled="{Binding CopyProtectScanButtonEnabled}" Style="{DynamicResource CustomButtonStyle}" />
                 </UniformGrid>
             </GroupBox>
 
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" Header="Status">
                 <UniformGrid Margin="5,5,5,5" Grid.ColumnSpan="2">
-                    <TextBlock x:Name="StatusLabel" VerticalAlignment="Center" HorizontalAlignment="Center" Text="Waiting for media..." />
+                    <TextBlock x:Name="StatusLabel" VerticalAlignment="Center" HorizontalAlignment="Center"
+                               Text="{Binding Status, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </UniformGrid>
             </GroupBox>
 
-            <Expander Margin="5,5 5 5" MaxHeight="300" HorizontalAlignment="Stretch" Header="Log Output" x:Name="LogPanel">
+            <Expander Margin="5,5 5 5" MaxHeight="300" HorizontalAlignment="Stretch" Header="Log Output" x:Name="LogPanel"
+                      IsExpanded="{Binding LogPanelExpanded}">
                 <controls:LogOutput x:Name="LogOutput"/>
             </Expander>
         </StackPanel>

MPF.UI.Core/Windows/MainWindow.xaml.cs

@@ -1,5 +1,12 @@
 using System;
-using MPF.UI.Core.ViewModels;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using MPF.Core;
+using MPF.Core.UI.ViewModels;
+using SabreTools.RedumpLib.Data;
+using WPFCustomMessageBox;
+using WinForms = System.Windows.Forms;
 
 namespace MPF.UI.Core.Windows
 {
@@ -8,7 +15,7 @@ namespace MPF.UI.Core.Windows
         /// <summary>
         /// Read-only access to the current main view model
         /// </summary>
-        public MainViewModel MainViewModel => DataContext as MainViewModel;
+        public MainViewModel MainViewModel => DataContext as MainViewModel ?? new MainViewModel();
 
         /// <summary>
         /// Constructor
@@ -21,7 +28,440 @@ namespace MPF.UI.Core.Windows
         protected override void OnContentRendered(EventArgs e)
         {
             base.OnContentRendered(e);
-            MainViewModel.Init(this);
+
+            // Disable buttons until we load fully
+            MainViewModel.StartStopButtonEnabled = false;
+            MainViewModel.MediaScanButtonEnabled = false;
+            MainViewModel.UpdateVolumeLabelEnabled = false;
+            MainViewModel.CopyProtectScanButtonEnabled = false;
+
+            // Add the click handlers to the UI
+            AddEventHandlers();
+
+            // Display the debug option in the menu, if necessary
+            if (MainViewModel.Options.ShowDebugViewMenuItem)
+                DebugViewMenuItem.Visibility = Visibility.Visible;
+
+            MainViewModel.Init(LogOutput.EnqueueLog, DisplayUserMessage, ShowDiscInformationWindow);
+
+            // Set the UI color scheme according to the options
+            ApplyTheme();
+
+            // Check for updates, if necessary
+            if (MainViewModel.Options.CheckForUpdatesOnStartup)
+                CheckForUpdates(showIfSame: false);
+
+            // Handle first-run, if necessary
+            if (MainViewModel.Options.FirstRun)
+            {
+                // Show the options window
+                ShowOptionsWindow("Welcome to MPF, Explore the Options");
+            }
         }
+
+        #region UI Functionality
+
+        /// <summary>
+        /// Add all event handlers
+        /// </summary>
+        public void AddEventHandlers()
+        {
+            // Menu Bar Click
+            AboutMenuItem.Click += AboutClick;
+            AppExitMenuItem.Click += AppExitClick;
+            CheckForUpdatesMenuItem.Click += CheckForUpdatesClick;
+            DebugViewMenuItem.Click += DebugViewClick;
+            OptionsMenuItem.Click += OptionsMenuItemClick;
+
+            // User Area Click
+            CopyProtectScanButton.Click += CopyProtectScanButtonClick;
+            EnableParametersCheckBox.Click += EnableParametersCheckBoxClick;
+            MediaScanButton.Click += MediaScanButtonClick;
+            UpdateVolumeLabel.Click += UpdateVolumeLabelClick;
+            OutputPathBrowseButton.Click += OutputPathBrowseButtonClick;
+            StartStopButton.Click += StartStopButtonClick;
+
+            // User Area SelectionChanged
+            SystemTypeComboBox.SelectionChanged += SystemTypeComboBoxSelectionChanged;
+            MediaTypeComboBox.SelectionChanged += MediaTypeComboBoxSelectionChanged;
+            DriveLetterComboBox.SelectionChanged += DriveLetterComboBoxSelectionChanged;
+            DriveSpeedComboBox.SelectionChanged += DriveSpeedComboBoxSelectionChanged;
+            DumpingProgramComboBox.SelectionChanged += DumpingProgramComboBoxSelectionChanged;
+
+            // User Area TextChanged
+            OutputPathTextBox.TextChanged += OutputPathTextBoxTextChanged;
+        }
+
+        /// <summary>
+        /// Browse for an output file path
+        /// </summary>
+        public void BrowseFile()
+        {
+            // Get the current path, if possible
+            string currentPath = MainViewModel.OutputPath;
+            if (string.IsNullOrWhiteSpace(currentPath) && !string.IsNullOrWhiteSpace(MainViewModel.Options.DefaultOutputPath))
+                currentPath = Path.Combine(MainViewModel.Options.DefaultOutputPath, "track.bin");
+            else if (string.IsNullOrWhiteSpace(currentPath))
+                currentPath = "track.bin";
+            if (string.IsNullOrWhiteSpace(currentPath))
+                currentPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "track.bin");
+
+            // Get the full path
+            currentPath = Path.GetFullPath(currentPath);
+
+            // Get the directory
+            var directory = Path.GetDirectoryName(currentPath);
+
+            // Get the filename
+            string filename = Path.GetFileName(currentPath);
+
+            WinForms.FileDialog fileDialog = new WinForms.SaveFileDialog
+            {
+                FileName = filename,
+                InitialDirectory = directory,
+            };
+            WinForms.DialogResult result = fileDialog.ShowDialog();
+
+            if (result == WinForms.DialogResult.OK)
+            {
+                MainViewModel.OutputPath = fileDialog.FileName;
+            }
+        }
+
+        /// <summary>
+        /// Check for available updates
+        /// </summary>
+        /// <param name="showIfSame">True to show the box even if it's the same, false to only show if it's different</param>
+        public void CheckForUpdates(bool showIfSame)
+        {
+            (bool different, string message, var url) = MainViewModel.CheckForUpdates();
+
+            // If we have a new version, put it in the clipboard
+            if (different)
+                Clipboard.SetText(url);
+
+            if (showIfSame || different)
+                CustomMessageBox.Show(this, message, "Version Update Check", MessageBoxButton.OK, different ? MessageBoxImage.Exclamation : MessageBoxImage.Information);
+        }
+
+        /// <summary>
+        /// Display a user message using a CustomMessageBox
+        /// </summary>
+        /// <param name="title">Title to display to the user</param>
+        /// <param name="message">Message to display to the user</param>
+        /// <param name="optionCount">Number of options to display</param>
+        /// <param name="flag">true for inquiry, false otherwise</param>
+        /// <returns>true for positive, false for negative, null for neutral</returns>
+        public bool? DisplayUserMessage(string title, string message, int optionCount, bool flag)
+        {
+            // Set the correct button style
+            MessageBoxButton button;
+            switch (optionCount)
+            {
+                case 1:
+                    button = MessageBoxButton.OK;
+                    break;
+                case 2:
+                    button = MessageBoxButton.YesNo;
+                    break;
+                case 3:
+                    button = MessageBoxButton.YesNoCancel;
+                    break;
+
+                // This should not happen, but default to "OK"
+                default:
+                    button = MessageBoxButton.OK;
+                    break;
+            }
+
+            // Set the correct icon
+            MessageBoxImage image = flag ? MessageBoxImage.Question : MessageBoxImage.Exclamation;
+
+            // Display and get the result
+            MessageBoxResult result = CustomMessageBox.Show(this, message, title, button, image);
+            switch (result)
+            {
+                case MessageBoxResult.OK:
+                case MessageBoxResult.Yes:
+                    return true;
+
+                case MessageBoxResult.No:
+                    return false;
+
+                case MessageBoxResult.Cancel:
+                case MessageBoxResult.None:
+                default:
+                    return null;
+            }
+        }
+
+        /// <summary>
+        /// Build a dummy SubmissionInfo and display it for testing
+        /// </summary>
+        public void ShowDebugDiscInfoWindow()
+        {
+            var submissionInfo = MainViewModel.CreateDebugSubmissionInfo();
+            var result = ShowDiscInformationWindow(submissionInfo);
+            InfoTool.ProcessSpecialFields(result.Item2);
+        }
+
+        /// <summary>
+        /// Show the disc information window
+        /// </summary>
+        /// <param name="submissionInfo">SubmissionInfo object to display and possibly change</param>
+        /// <returns>Dialog open result</returns>
+#if NET48
+        public (bool?, SubmissionInfo) ShowDiscInformationWindow(SubmissionInfo submissionInfo)
+#else
+        public (bool?, SubmissionInfo?) ShowDiscInformationWindow(SubmissionInfo? submissionInfo)
+#endif
+        {
+            if (MainViewModel.Options.ShowDiscEjectReminder)
+                CustomMessageBox.Show(this, "It is now safe to eject the disc", "Eject", MessageBoxButton.OK, MessageBoxImage.Information);
+
+            var discInformationWindow = new DiscInformationWindow(MainViewModel.Options, submissionInfo)
+            {
+                Focusable = true,
+                Owner = this,
+                ShowActivated = true,
+                ShowInTaskbar = true,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            };
+            bool? result = discInformationWindow.ShowDialog();
+
+            // Copy back the submission info changes, if necessary
+            if (result == true)
+#if NET48
+                submissionInfo = discInformationWindow.DiscInformationViewModel.SubmissionInfo.Clone() as SubmissionInfo;
+#else
+                submissionInfo = (discInformationWindow.DiscInformationViewModel.SubmissionInfo.Clone() as SubmissionInfo)!;
+#endif
+
+#if NET48
+            return (result, submissionInfo);
+#else
+            return (result, submissionInfo!);
+#endif
+        }
+
+        /// <summary>
+        /// Show the Options window
+        /// </summary>
+#if NET48
+        public void ShowOptionsWindow(string title = null)
+#else
+        public void ShowOptionsWindow(string? title = null)
+#endif
+        {
+            var optionsWindow = new OptionsWindow(MainViewModel.Options)
+            {
+                Focusable = true,
+                Owner = this,
+                ShowActivated = true,
+                ShowInTaskbar = true,
+                Title = title ?? "Options",
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            };
+
+            optionsWindow.Closed += OnOptionsUpdated;
+            optionsWindow.Show();
+        }
+
+        /// <summary>
+        /// Set the UI color scheme according to the options
+        /// </summary>
+        private void ApplyTheme()
+        {
+            Theme theme;
+            if (MainViewModel.Options.EnableDarkMode)
+                theme = new DarkModeTheme();
+            else
+                theme = new LightModeTheme();
+
+            theme.Apply();
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for OptionsWindow OnUpdated event
+        /// </summary>
+#if NET48
+        public void OnOptionsUpdated(object sender, EventArgs e)
+#else
+        public void OnOptionsUpdated(object? sender, EventArgs e)
+#endif
+        {
+            // Get the options window
+            var optionsWindow = (sender as OptionsWindow);
+            if (optionsWindow?.OptionsViewModel == null)
+                return;
+
+            bool savedSettings = optionsWindow.OptionsViewModel.SavedSettings;
+            var options = optionsWindow.OptionsViewModel.Options;
+            MainViewModel.UpdateOptions(savedSettings, options);
+
+            // Set the UI color scheme according to the options
+            ApplyTheme();
+        }
+
+        #region Menu Bar
+
+        /// <summary>
+        /// Handler for AboutMenuItem Click event
+        /// </summary>
+        public void AboutClick(object sender, RoutedEventArgs e)
+        {
+            string aboutText = MainViewModel.CreateAboutText();
+            CustomMessageBox.Show(this, aboutText, "About", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        /// <summary>
+        /// Handler for AppExitMenuItem Click event
+        /// </summary>
+        public void AppExitClick(object sender, RoutedEventArgs e) =>
+            Application.Current.Shutdown();
+
+        /// <summary>
+        /// Handler for CheckForUpdatesMenuItem Click event
+        /// </summary>
+        public void CheckForUpdatesClick(object sender, RoutedEventArgs e)
+            => CheckForUpdates(showIfSame: true);
+
+        /// <summary>
+        /// Handler for DebugViewMenuItem Click event
+        /// </summary>
+        public void DebugViewClick(object sender, RoutedEventArgs e) =>
+            ShowDebugDiscInfoWindow();
+
+        /// <summary>
+        /// Handler for OptionsMenuItem Click event
+        /// </summary>
+        public void OptionsMenuItemClick(object sender, RoutedEventArgs e) =>
+            ShowOptionsWindow();
+
+        #endregion
+
+        #region User Area
+
+        /// <summary>
+        /// Handler for CopyProtectScanButton Click event
+        /// </summary>
+        public async void CopyProtectScanButtonClick(object sender, RoutedEventArgs e)
+        {
+            var (output, error) = await MainViewModel.ScanAndShowProtection();
+
+            if (!MainViewModel.LogPanelExpanded)
+            {
+                if (!string.IsNullOrEmpty(output) && string.IsNullOrEmpty(error))
+                    CustomMessageBox.Show(this, output, "Detected Protection(s)", MessageBoxButton.OK, MessageBoxImage.Information);
+                else
+                    CustomMessageBox.Show(this, "An exception occurred, see the log for details", "Error!", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        /// <summary>
+        /// Handler for DriveLetterComboBox SelectionChanged event
+        /// </summary>
+        public void DriveLetterComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.InitializeUIValues(removeEventHandlers: true, rescanDrives: false);
+        }
+
+        /// <summary>
+        /// Handler for DriveSpeedComboBox SelectionChanged event
+        /// </summary>
+        public void DriveSpeedComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for DumpingProgramComboBox SelectionChanged event
+        /// </summary>
+        public void DumpingProgramComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.ChangeDumpingProgram();
+        }
+
+        /// <summary>
+        /// Handler for EnableParametersCheckBox Click event
+        /// </summary>
+        public void EnableParametersCheckBoxClick(object sender, RoutedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.ToggleParameters();
+        }
+
+        /// <summary>
+        /// Handler for MediaScanButton Click event
+        /// </summary>
+        public void MediaScanButtonClick(object sender, RoutedEventArgs e) =>
+            MainViewModel.InitializeUIValues(removeEventHandlers: true, rescanDrives: true);
+
+        /// <summary>
+        /// Handler for MediaTypeComboBox SelectionChanged event
+        /// </summary>
+        public void MediaTypeComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.ChangeMediaType(e.RemovedItems, e.AddedItems);
+        }
+
+        /// <summary>
+        /// Handler for OutputPathBrowseButton Click event
+        /// </summary>
+        public void OutputPathBrowseButtonClick(object sender, RoutedEventArgs e)
+        {
+            BrowseFile();
+            MainViewModel.EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for OutputPathTextBox TextChanged event
+        /// </summary>
+        public void OutputPathTextBoxTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for StartStopButton Click event
+        /// </summary>
+        public void StartStopButtonClick(object sender, RoutedEventArgs e) =>
+            MainViewModel.ToggleStartStop();
+
+        /// <summary>
+        /// Handler for SystemTypeComboBox SelectionChanged event
+        /// </summary>
+        public void SystemTypeComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+                MainViewModel.ChangeSystem();
+        }
+
+        /// <summary>
+        /// Handler for UpdateVolumeLabel Click event
+        /// </summary>
+        public void UpdateVolumeLabelClick(object sender, RoutedEventArgs e)
+        {
+            if (MainViewModel.CanExecuteSelectionChanged)
+            {
+                if (MainViewModel.Options.FastUpdateLabel)
+                    MainViewModel.FastUpdateLabel(removeEventHandlers: true);
+                else
+                    MainViewModel.InitializeUIValues(removeEventHandlers: true, rescanDrives: false);
+            }
+        }
+
+        #endregion
+
+        #endregion // Event Handlers
     }
 }

MPF.UI.Core/Windows/OptionsWindow.xaml

@@ -6,10 +6,13 @@
                         xmlns:core="clr-namespace:MPF.UI.Core"
                         xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
                         mc:Ignorable="d"
-                        Title="Options" Width="515.132" WindowStyle="None"
+                        Width="515.132" WindowStyle="None"
                         WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"
                         BorderBrush="DarkGray" BorderThickness="2">
 
+    <Window.Resources>
+        <core:ElementConverter x:Key="ElementConverter" />
+    </Window.Resources>
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" ResizeBorderThickness="0" />
     </WindowChrome.WindowChrome>
@@ -29,7 +32,11 @@
                 <Image Grid.Column="0" Source="/Images/Icon.ico" Height="20" Width="20" Margin="1" />
                 <Label Grid.Column="1" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" MouseDown="TitleMouseDown">
                     <Label.Content>
-                        <TextBlock TextAlignment="Center"><Bold>Options</Bold></TextBlock>
+                        <TextBlock>
+                            <TextBlock.Inlines>
+                                <Run FontWeight="Bold" Text="{Binding Title, Mode=OneWay}"/>
+                            </TextBlock.Inlines>
+                        </TextBlock>
                     </Label.Content>
                     <Label.ContextMenu>
                         <ContextMenu Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
@@ -60,28 +67,84 @@
                     </Button>
                 </Grid>
             </Grid>
-            
+
             <TabControl Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                         Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
                         Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
                         Style="{DynamicResource CustomTabControlStyle}">
-                <TabItem Header="User Interface" Style="{DynamicResource CustomTabItemStyle}">
-                    <UniformGrid Columns="2" Rows="3">
-                        <CheckBox VerticalAlignment="Center" Content="Enable Dark Mode"
-                            IsChecked="{Binding Options.EnableDarkMode}"
-                            ToolTip="(Experimental) Enable dark mode across the entire application" Margin="0,4"
-                        />
-                        <CheckBox VerticalAlignment="Center" Content="Check for Updates on Startup"
-                                  IsChecked="{Binding Options.CheckForUpdatesOnStartup}"
-                                  ToolTip="Check for updates when the application starts" Margin="0,4"
-                        />
-                        <CheckBox VerticalAlignment="Center" Content="Fast Update Label"
-                                  IsChecked="{Binding Options.FastUpdateLabel}"
-                                  ToolTip="Bypasses disc checks to quickly update the output path. Use with caution!" Margin="0,4"
-                        />
-                    </UniformGrid>
+                <TabItem Header="General" Style="{DynamicResource CustomTabItemStyle}">
+                    <StackPanel>
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="User Interface">
+                            <UniformGrid Columns="2" Rows="2">
+                                <CheckBox VerticalAlignment="Center" Content="Enable Dark Mode"
+                                          IsChecked="{Binding Options.EnableDarkMode}"
+                                          ToolTip="(Experimental) Enable dark mode across the entire application" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Check for Updates on Startup"
+                                          IsChecked="{Binding Options.CheckForUpdatesOnStartup}"
+                                          ToolTip="Check for updates when the application starts" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Fast Update Label"
+                                          IsChecked="{Binding Options.FastUpdateLabel}"
+                                          ToolTip="Bypasses disc checks to quickly update the output path. Use with caution!" Margin="0,4"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
+
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Detection">
+                            <UniformGrid Columns="2" Rows="3">
+                                <CheckBox x:Name="SkipMediaTypeDetectionCheckBox" VerticalAlignment="Center" Content="Skip Type Detect"
+                                          IsChecked="{Binding Options.SkipMediaTypeDetection}"
+                                          ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Skip System Detect"
+                                          IsChecked="{Binding Options.SkipSystemDetection}"
+                                          ToolTip="Disable trying to guess system (may improve performance at startup)" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="No Fixed Drives"
+                                        IsChecked="{Binding Options.IgnoreFixedDrives}"
+                                        ToolTip="Ignore hard drives and other fixed drives" Margin="0,4"
+                                />
+                                <Label/>
+                                <!-- Empty label for padding -->
+
+                                <Label VerticalAlignment="Center" Content="Default System:" HorizontalAlignment="Right" />
+                                <ComboBox x:Name="DefaultSystemComboBox" Height="22" Width="200" HorizontalAlignment="Left"
+                                          ItemsSource="{Binding Systems}" SelectedItem="{Binding Options.DefaultSystem, Converter={StaticResource ElementConverter}, Mode=TwoWay}"
+                                          SelectedIndex="0" Style="{DynamicResource CustomComboBoxStyle}">
+                                    <ComboBox.ItemContainerStyle>
+                                        <Style TargetType="{x:Type ComboBoxItem}">
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IsHeader}" Value="True">
+                                                    <Setter Property="IsEnabled" Value="False"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </ComboBox.ItemContainerStyle>
+                                </ComboBox>
+                            </UniformGrid>
+                        </GroupBox>
+
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Logging">
+                            <UniformGrid Columns="2" Rows="1">
+                                <CheckBox VerticalAlignment="Center" Content="Verbose Logging"
+                                          IsChecked="{Binding Options.VerboseLogging}"
+                                          ToolTip="Display all logging statements" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Auto-Open Log"
+                                          IsChecked="{Binding Options.OpenLogWindowAtStartup}"
+                                          ToolTip="Open the log panel when the program launches" Margin="0,4"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
+                    </StackPanel>
                 </TabItem>
-                
+
                 <TabItem Header="Paths" Style="{DynamicResource CustomTabItemStyle}">
                     <Grid Margin="5,5,5,5">
                         <Grid.ColumnDefinitions>
@@ -99,26 +162,31 @@
                         </Grid.RowDefinitions>
 
                         <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Aaru Path" />
-                        <TextBox x:Name="AaruPathTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.AaruPath}" VerticalContentAlignment="Center" />
+                        <TextBox x:Name="AaruPathTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                 Text="{Binding Options.AaruPath}" VerticalContentAlignment="Center" />
                         <Button x:Name="AaruPathButton" Grid.Row="0" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
 
                         <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DiscImageCreator Path" />
-                        <TextBox x:Name="DiscImageCreatorPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.DiscImageCreatorPath}" VerticalContentAlignment="Center" />
+                        <TextBox x:Name="DiscImageCreatorPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                 Text="{Binding Options.DiscImageCreatorPath}" VerticalContentAlignment="Center" />
                         <Button x:Name="DiscImageCreatorPathButton" Grid.Row="1" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
 
                         <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Redumper Path" />
-                        <TextBox x:Name="RedumperPathTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.RedumperPath}" VerticalContentAlignment="Center" />
+                        <TextBox x:Name="RedumperPathTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                 Text="{Binding Options.RedumperPath}" VerticalContentAlignment="Center" />
                         <Button x:Name="RedumperPathButton" Grid.Row="2" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
 
                         <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Dumping Program" />
                         <ComboBox x:Name="InternalProgramComboBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
-                                  ItemsSource="{Binding InternalPrograms}" Style="{DynamicResource CustomComboBoxStyle}" />
+                                  ItemsSource="{Binding InternalPrograms}" SelectedItem="{Binding Options.InternalProgram, Converter={StaticResource ElementConverter}, Mode=TwoWay}"
+                                  Style="{DynamicResource CustomComboBoxStyle}" />
 
                         <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path" />
-                        <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.DefaultOutputPath}" VerticalContentAlignment="Center" />
+                        <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                                 Text="{Binding Options.DefaultOutputPath}" VerticalContentAlignment="Center" />
                         <Button x:Name="DefaultOutputPathButton" Grid.Row="4" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
                     </Grid>
@@ -127,45 +195,12 @@
                 <TabItem Header="Dumping" Style="{DynamicResource CustomTabItemStyle}">
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Dumping">
-                            <UniformGrid Columns="2" Rows="9">
-                                <CheckBox x:Name="SkipMediaTypeDetectionCheckBox" VerticalAlignment="Center" Content="Skip Type Detect"
-                                     IsChecked="{Binding Options.SkipMediaTypeDetection}"
-                                     ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" Margin="0,4"
-                                     />
-
-                                <CheckBox VerticalAlignment="Center" Content="Skip System Detect"
-                                     IsChecked="{Binding Options.SkipSystemDetection}"
-                                     ToolTip="Disable trying to guess system (may improve performance at startup)" Margin="0,4"
-                                     />
-
-                                <Label VerticalAlignment="Center" Content="Default System:" HorizontalAlignment="Right" />
-                                <ComboBox x:Name="DefaultSystemComboBox" Height="22" Width="200" HorizontalAlignment="Left" ItemsSource="{Binding Systems}" SelectedIndex="0" Style="{DynamicResource CustomComboBoxStyle}">
-                                    <ComboBox.ItemContainerStyle>
-                                        <Style TargetType="{x:Type ComboBoxItem}">
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsHeader}" Value="True">
-                                                    <Setter Property="IsEnabled" Value="False"/>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </ComboBox.ItemContainerStyle>
-                                </ComboBox>
-
-                                <CheckBox VerticalAlignment="Center" Content="No Fixed Drives"
-                                     IsChecked="{Binding Options.IgnoreFixedDrives}"
-                                     ToolTip="Ignore hard drives and other fixed drives" Margin="0,4"
-                                     />
-
+                            <UniformGrid Columns="2" Rows="7">
                                 <CheckBox VerticalAlignment="Center" Content="Show Separate Window"
                                      IsChecked="{Binding Options.ToolsInSeparateWindow}"
                                      ToolTip="Show program output in separate command window instead of in the log. Enable this if you have a weaker system as there is an increased processing load otherwise." Margin="0,4"
                                      />
 
-                                <CheckBox VerticalAlignment="Center" Content="Protection Scan"
-                                    IsChecked="{Binding Options.ScanForProtection}"
-                                    ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0"
-                                    />
-
                                 <CheckBox VerticalAlignment="Center" Content="Output Protection File"
                                     IsChecked="{Binding Options.OutputSeparateProtectionFile}" IsEnabled="{Binding Options.ScanForProtection}"
                                     ToolTip="Output protection information to a separate file" Margin="0,4,0,0"
@@ -181,6 +216,11 @@
                                      ToolTip="Enable showing the disc information output after dumping" Margin="0,4"
                                       />
 
+                                <CheckBox VerticalAlignment="Center" Content="Pull All Information"
+                                     IsChecked="{Binding Options.PullAllInformation}"
+                                     ToolTip="Enable pulling all comment and content data after dumping" Margin="0,4"
+                                      />
+
                                 <CheckBox VerticalAlignment="Center" Content="Enable Tab Input"
                                      IsChecked="{Binding Options.EnableTabsInInputFields}"
                                      ToolTip="Enable entering tabs in supported input fields instead of tab navigation" Margin="0,4"
@@ -201,6 +241,11 @@
                                      ToolTip="Enable adding placeholder text in the output for required and optional fields" Margin="0,4"
                                      />
 
+                                <CheckBox VerticalAlignment="Center" Content="Add Filename Suffix"
+                                     IsChecked="{Binding Options.AddFilenameSuffix}"
+                                     ToolTip="Enable appending the output filename to the generated files" Margin="0,4"
+                                     />
+
                                 <CheckBox VerticalAlignment="Center" Content="Output Submission JSON"
                                      IsChecked="{Binding Options.OutputSubmissionJSON}"
                                      ToolTip="Enable outputting a compressed JSON version of the submission info" Margin="0,4"
@@ -215,9 +260,38 @@
                                      IsChecked="{Binding Options.CompressLogFiles}"
                                      ToolTip="Compress output log files to reduce space" Margin="0,4"
                                      />
+
+                                <CheckBox VerticalAlignment="Center" Content="Delete Unnecessary Files"
+                                     IsChecked="{Binding Options.DeleteUnnecessaryFiles}"
+                                     ToolTip="Delete unnecesary output files to reduce space" Margin="0,4"
+                                     />
                             </UniformGrid>
                         </GroupBox>
-                        
+
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Protection">
+                            <UniformGrid Columns="2" Rows="2">
+                                <CheckBox VerticalAlignment="Center" Content="Enable Protection Scan"
+                                          IsChecked="{Binding Options.ScanForProtection}"
+                                          ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Scan Archive Contents"
+                                          IsChecked="{Binding Options.ScanArchivesForProtection}"
+                                          ToolTip="Enable scanning archive contents during protection scanning (may drastically increase scanning time but is more accurate)" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Include Executable Packers"
+                                          IsChecked="{Binding Options.ScanPackersForProtection}"
+                                          ToolTip="Include executable packers in outputted protections" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Include Debug Information"
+                                          IsChecked="{Binding Options.IncludeDebugProtectionInformation}"
+                                          ToolTip="Include debug information during protection scans" Margin="0,4"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
+
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Default Speeds" Grid.ColumnSpan="2">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -232,7 +306,7 @@
                                     <RowDefinition />
                                     <RowDefinition />
                                 </Grid.RowDefinitions>
-                                
+
                                 <Label Grid.Row="0" Grid.Column="0" Content="CD" />
                                 <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForCDAsCollection}}"
@@ -265,142 +339,121 @@
                     </StackPanel>
                 </TabItem>
 
-                <TabItem Header="Protection Scanning" Style="{DynamicResource CustomTabItemStyle}">
+                <TabItem Header="Programs" Style="{DynamicResource CustomTabItemStyle}">
                     <StackPanel>
-                        <UniformGrid Columns="2" Rows="2">
-                            <CheckBox VerticalAlignment="Center" Content="Scan Archive Contents"
-                                     IsChecked="{Binding Options.ScanArchivesForProtection}"
-                                     ToolTip="Enable scanning archive contents during protection scanning (may drastically increase scanning time but is more accurate)" Margin="0,4"
-                                     />
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Aaru">
+                            <UniformGrid Columns="2" Rows="3">
+                                <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
+                                          IsChecked="{Binding Options.AaruEnableDebug}"
+                                          ToolTip="Enable debug output in logs" Margin="0,4"
+                                />
 
-                            <CheckBox VerticalAlignment="Center" Content="Include Executable Packers"
-                                     IsChecked="{Binding Options.ScanPackersForProtection}"
-                                     ToolTip="Include executable packers in outputted protections" Margin="0,4"
-                                     />
+                                <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
+                                          IsChecked="{Binding Options.AaruEnableVerbose}"
+                                          ToolTip="Enable verbose output in logs" Margin="0,4"
+                                />
 
-                            <CheckBox VerticalAlignment="Center" Content="Include Debug Information"
-                                     IsChecked="{Binding Options.IncludeDebugProtectionInformation}"
-                                     ToolTip="Include debug information during protection scans" Margin="0,4"
-                                     />
-                        </UniformGrid>
+                                <CheckBox VerticalAlignment="Center" Content="Force Dumping"
+                                          IsChecked="{Binding Options.AaruForceDumping}"
+                                          ToolTip="Enable forcing dump even if there are issues" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Strip Personal Data"
+                                          IsChecked="{Binding Options.AaruStripPersonalData}"
+                                          ToolTip="Enable stripping of personally identifiable information from metadata" Margin="0,4,0,0"
+                                />
+
+                                <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                                         Text="{Binding Options.AaruRereadCount}"
+                                         ToolTip="Specifies how many rereads are attempted for sector and subchannel errors"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
+
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="DiscImageCreator">
+                            <UniformGrid Columns="2" Rows="6">
+                                <CheckBox VerticalAlignment="Center" Content="Quiet Mode"
+                                          IsChecked="{Binding Options.DICQuietMode}"
+                                          ToolTip="Disable sounds (beeps) during and after operations" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Paranoid Mode"
+                                          IsChecked="{Binding Options.DICParanoidMode}"
+                                          ToolTip="Enable pedantic and super-safe flags" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Use CMI Flag"
+                                          IsChecked="{Binding Options.DICUseCMIFlag}"
+                                          ToolTip="Enable the CMI flag for supported disc types (DVD/HD-DVD only)" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Reset After Dump"
+                                          IsChecked="{Binding Options.DICResetDriveAfterDump}"
+                                          ToolTip="Reset disc drives after dumping; useful for some older machines" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Multi-Sector Read"
+                                          IsChecked="{Binding Options.DICMultiSectorRead}"
+                                          ToolTip="Enable the /mr flag for BD drive dumping" Margin="0,4"
+                                />
+                                <Label/>  <!-- Empty label for padding -->
+
+                                <Label Content="Multi-Sector Read Value:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                                          Text="{Binding Options.DICMultiSectorReadValue}" IsEnabled="{Binding Options.DICMultiSectorRead}"
+                                          ToolTip="Set the default value for the /mr flag"
+                                />
+
+                                <Label Content="CD Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                                          Text="{Binding Options.DICRereadCount}"
+                                          ToolTip="Specifies how many rereads are attempted on C2 error [CD only]"
+                                />
+
+                                <Label Content="DVD/HD-DVD/BD Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                                          Text="{Binding Options.DICDVDRereadCount}"
+                                          ToolTip="Specifies how many rereads are attempted on read error [DVD/HD-DVD/BD only]"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
+
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redumper">
+                            <UniformGrid Columns="2" Rows="3">
+                                <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
+                                          IsChecked="{Binding Options.RedumperEnableDebug}"
+                                          ToolTip="Enable debug output in logs" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
+                                          IsChecked="{Binding Options.RedumperEnableVerbose}"
+                                          ToolTip="Enable verbose output in logs" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Enable BE Drive Reading"
+                                          IsChecked="{Binding Options.RedumperUseBEReading}"
+                                          ToolTip="Enable setting drive read method to BE_CDDA by default" Margin="0,4"
+                                />
+
+                                <CheckBox VerticalAlignment="Center" Content="Set Generic Drive Type"
+                                          IsChecked="{Binding Options.RedumperUseGenericDriveType}"
+                                          ToolTip="Enable setting drive type to Generic by default" Margin="0,4"
+                                />
+
+                                <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                                         Text="{Binding Options.RedumperRereadCount}"
+                                          ToolTip="Specifies how many rereads are attempted on read error"
+                                />
+                            </UniformGrid>
+                        </GroupBox>
                     </StackPanel>
                 </TabItem>
 
-                <TabItem Header="Aaru" Style="{DynamicResource CustomTabItemStyle}">
-                    <UniformGrid Columns="2" Rows="3">
-                        <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
-                            IsChecked="{Binding Options.AaruEnableDebug}"
-                            ToolTip="Enable debug output in logs" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
-                            IsChecked="{Binding Options.AaruEnableVerbose}"
-                            ToolTip="Enable verbose output in logs" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Force Dumping"
-                            IsChecked="{Binding Options.AaruForceDumping}"
-                            ToolTip="Enable forcing dump even if there are issues" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Strip Personal Data"
-                            IsChecked="{Binding Options.AaruStripPersonalData}"
-                            ToolTip="Enable stripping of personally identifiable information from metadata" Margin="0,4,0,0"
-                            />
-
-                        <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
-                            Text="{Binding Options.AaruRereadCount}"
-                            ToolTip="Specifies how many rereads are attempted for sector and subchannel errors"
-                            />
-                    </UniformGrid>
-                </TabItem>
-
-                <TabItem Header="DiscImageCreator" Style="{DynamicResource CustomTabItemStyle}">
-                    <UniformGrid Columns="2" Rows="6">
-                        <CheckBox VerticalAlignment="Center" Content="Quiet Mode"
-                            IsChecked="{Binding Options.DICQuietMode}"
-                            ToolTip="Disable sounds (beeps) during and after operations" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Paranoid Mode"
-                            IsChecked="{Binding Options.DICParanoidMode}"
-                            ToolTip="Enable pedantic and super-safe flags" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Use CMI Flag"
-                            IsChecked="{Binding Options.DICUseCMIFlag}"
-                            ToolTip="Enable the CMI flag for supported disc types (DVD/HD-DVD only)" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Reset After Dump"
-                            IsChecked="{Binding Options.DICResetDriveAfterDump}"
-                            ToolTip="Reset disc drives after dumping; useful for some older machines" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Multi-Sector Read"
-                            IsChecked="{Binding Options.DICMultiSectorRead}"
-                            ToolTip="Enable the /mr flag for BD drive dumping" Margin="0,4"
-                            />
-                        <Label/> <!-- Empty label for padding -->
-
-                        <Label Content="Multi-Sector Read Value:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
-                            Text="{Binding Options.DICMultiSectorReadValue}" IsEnabled="{Binding Options.DICMultiSectorRead}"
-                            ToolTip="Set the default value for the /mr flag"
-                            />
-
-                        <Label Content="CD Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
-                            Text="{Binding Options.DICRereadCount}"
-                            ToolTip="Specifies how many rereads are attempted on C2 error [CD only]"
-                            />
-
-                        <Label Content="DVD/HD-DVD/BD Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
-                            Text="{Binding Options.DICDVDRereadCount}"
-                            ToolTip="Specifies how many rereads are attempted on read error [DVD/HD-DVD/BD only]"
-                            />
-                    </UniformGrid>
-                </TabItem>
-
-                <TabItem Header="Redumper" Style="{DynamicResource CustomTabItemStyle}">
-                    <UniformGrid Columns="2" Rows="2">
-                        <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
-                            IsChecked="{Binding Options.RedumperEnableDebug}"
-                            ToolTip="Enable debug output in logs" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
-                            IsChecked="{Binding Options.RedumperEnableVerbose}"
-                            ToolTip="Enable verbose output in logs" Margin="0,4"
-                            />
-                        
-                        <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
-                            Text="{Binding Options.RedumperRereadCount}"
-                            ToolTip="Specifies how many rereads are attempted on read error"
-                            />
-                    </UniformGrid>
-                </TabItem>
-
-                <TabItem Header="Logging" Style="{DynamicResource CustomTabItemStyle}">
-                    <UniformGrid Columns="2">
-                        <CheckBox VerticalAlignment="Center" Content="Verbose Logging"
-                            IsChecked="{Binding Options.VerboseLogging}"
-                            ToolTip="Display all logging statements" Margin="0,4"
-                            />
-
-                        <CheckBox VerticalAlignment="Center" Content="Auto-Open Log"
-                            IsChecked="{Binding Options.OpenLogWindowAtStartup}"
-                            ToolTip="Open the log panel when the program launches" Margin="0,4"
-                            />
-                    </UniformGrid>
-                </TabItem>
-
                 <TabItem Header="Login Info" Style="{DynamicResource CustomTabItemStyle}">
                     <StackPanel>
-                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump Credentials">
+                        <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump">
                             <UniformGrid Columns="5">
                                 <Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
                                 <TextBox x:Name="RedumpUsernameTextBox" Height="22" HorizontalAlignment="Stretch"
@@ -426,12 +479,14 @@
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
-                    <Label/> <!-- Empty label for padding -->
+                    <Label/>
+                    <!-- Empty label for padding -->
                     <Button Name="AcceptButton" Height="25" Width="80" IsDefault="True" Content="Accept"
                             Style="{DynamicResource CustomButtonStyle}" />
                     <Button Name="CancelButton" Height="25" Width="80" IsCancel="True" Content="Cancel"
                             Style="{DynamicResource CustomButtonStyle}" />
-                    <Label/> <!-- Empty label for padding -->
+                    <Label/>
+                    <!-- Empty label for padding -->
                 </UniformGrid>
             </GroupBox>
         </StackPanel>

MPF.UI.Core/Windows/OptionsWindow.xaml.cs

@@ -1,5 +1,11 @@
-using MPF.Core.Data;
-using MPF.UI.Core.ViewModels;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Forms;
+using MPF.Core.Data;
+using MPF.Core.UI.ViewModels;
+using WPFCustomMessageBox;
 
 namespace MPF.UI.Core.Windows
 {
@@ -11,7 +17,7 @@ namespace MPF.UI.Core.Windows
         /// <summary>
         /// Read-only access to the current options view model
         /// </summary>
-        public OptionsViewModel OptionsViewModel => DataContext as OptionsViewModel;
+        public OptionsViewModel OptionsViewModel => DataContext as OptionsViewModel ?? new OptionsViewModel(new Options());
 
         /// <summary>
         /// Constructor
@@ -19,13 +25,212 @@ namespace MPF.UI.Core.Windows
         public OptionsWindow(Options options)
         {
             InitializeComponent();
-            DataContext = new OptionsViewModel(this, options);
+            DataContext = new OptionsViewModel(options);
 
-#if NET6_0_OR_GREATER
-            this.SkipMediaTypeDetectionCheckBox.IsEnabled = false;
-            this.SkipMediaTypeDetectionCheckBox.IsChecked = false;
-            this.SkipMediaTypeDetectionCheckBox.ToolTip = "This feature is not enabled for .NET 6";
-#endif
+            // Set initial value for binding
+            RedumpPasswordBox.Password = options.RedumpPassword;
+
+            // Add handlers
+            AaruPathButton.Click += BrowseForPathClick;
+            DiscImageCreatorPathButton.Click += BrowseForPathClick;
+            DefaultOutputPathButton.Click += BrowseForPathClick;
+
+            AcceptButton.Click += OnAcceptClick;
+            CancelButton.Click += OnCancelClick;
+            RedumpPasswordBox.PasswordChanged += OnPasswordChanged;
+            RedumpLoginTestButton.Click += OnRedumpTestClick;
         }
+
+        /// <summary>
+        /// Handler for OptionsWindow OnContentRendered event
+        /// </summary>
+        protected override void OnContentRendered(EventArgs e)
+        {
+            base.OnContentRendered(e);
+
+            // Set the window title
+            OptionsViewModel.Title = this.Title;
+        }
+
+        #region UI Commands
+
+        /// <summary>
+        /// Browse and set a path based on the invoking button
+        /// </summary>
+#if NET48
+        private void BrowseForPath(Window parent, System.Windows.Controls.Button button)
+#else
+        private void BrowseForPath(Window parent, System.Windows.Controls.Button? button)
+#endif
+        {
+            // If the button is null, we can't do anything
+            if (button == null)
+                return;
+
+            // Strips button prefix to obtain the setting name
+#if NET48
+            string pathSettingName = button.Name.Substring(0, button.Name.IndexOf("Button"));
+#else
+            string pathSettingName = button.Name[..button.Name.IndexOf("Button")];
+#endif
+
+            // TODO: hack for now, then we'll see
+            bool shouldBrowseForPath = pathSettingName == "DefaultOutputPath";
+
+            var currentPath = TextBoxForPathSetting(parent, pathSettingName)?.Text;
+            var initialDirectory = AppDomain.CurrentDomain.BaseDirectory;
+            if (!shouldBrowseForPath && !string.IsNullOrEmpty(currentPath))
+                initialDirectory = Path.GetDirectoryName(Path.GetFullPath(currentPath));
+
+            CommonDialog dialog = shouldBrowseForPath
+                ? (CommonDialog)CreateFolderBrowserDialog()
+                : CreateOpenFileDialog(initialDirectory);
+            using (dialog)
+            {
+                DialogResult result = dialog.ShowDialog();
+                if (result == System.Windows.Forms.DialogResult.OK)
+                {
+                    string path = string.Empty;
+                    bool exists = false;
+
+                    if (shouldBrowseForPath && dialog is FolderBrowserDialog folderBrowserDialog)
+                    {
+                        path = folderBrowserDialog.SelectedPath;
+                        exists = Directory.Exists(path);
+                    }
+                    else if (dialog is OpenFileDialog openFileDialog)
+                    {
+                        path = openFileDialog.FileName;
+                        exists = File.Exists(path);
+                    }
+
+                    if (exists)
+                    {
+                        OptionsViewModel.Options[pathSettingName] = path;
+                        var textBox = TextBoxForPathSetting(parent, pathSettingName);
+                        if (textBox != null)
+                            textBox.Text = path;
+                    }
+                    else
+                    {
+                        CustomMessageBox.Show(
+                            "Specified path doesn't exist!",
+                            "Error",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Error
+                        );
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Find a TextBox by setting name
+        /// </summary>
+        /// <param name="name">Setting name to find</param>
+        /// <returns>TextBox for that setting</returns>
+#if NET48
+        private static System.Windows.Controls.TextBox TextBoxForPathSetting(Window parent, string name) =>
+#else
+        private static System.Windows.Controls.TextBox? TextBoxForPathSetting(Window parent, string name) =>
+#endif
+            parent.FindName(name + "TextBox") as System.Windows.Controls.TextBox;
+
+        /// <summary>
+        /// Create an open folder dialog box
+        /// </summary>
+#if NET48
+        private static FolderBrowserDialog CreateFolderBrowserDialog() => new FolderBrowserDialog();
+#else
+        private static FolderBrowserDialog CreateFolderBrowserDialog() => new();
+#endif
+
+        /// <summary>
+        /// Create an open file dialog box
+        /// </summary>
+#if NET48
+        private static OpenFileDialog CreateOpenFileDialog(string initialDirectory)
+#else
+        private static OpenFileDialog CreateOpenFileDialog(string? initialDirectory)
+#endif
+        {
+            return new OpenFileDialog()
+            {
+                InitialDirectory = initialDirectory,
+                Filter = "Executables (*.exe)|*.exe",
+                FilterIndex = 0,
+                RestoreDirectory = true,
+            };
+        }
+
+        /// <summary>
+        /// Test Redump credentials for validity
+        /// </summary>
+#if NET48
+        private void ValidateRedumpCredentials()
+#else
+        private async Task ValidateRedumpCredentials()
+#endif
+        {
+#if NET48
+            (bool? success, string message) = OptionsViewModel.TestRedumpLogin(RedumpUsernameTextBox.Text, RedumpPasswordBox.Password);
+#else
+            (bool? success, string? message) = await OptionsViewModel.TestRedumpLogin(RedumpUsernameTextBox.Text, RedumpPasswordBox.Password);
+#endif
+
+            if (success == true)
+                CustomMessageBox.Show(this, message, "Success", MessageBoxButton.OK, MessageBoxImage.Information);
+            else if (success == false)
+                CustomMessageBox.Show(this, message, "Failure", MessageBoxButton.OK, MessageBoxImage.Error);
+            else
+                CustomMessageBox.Show(this, message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+
+#endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for generic Click event
+        /// </summary>
+        private void BrowseForPathClick(object sender, EventArgs e) =>
+            BrowseForPath(this, sender as System.Windows.Controls.Button);
+
+        /// <summary>
+        /// Handler for AcceptButton Click event
+        /// </summary>
+        private void OnAcceptClick(object sender, EventArgs e)
+        {
+            OptionsViewModel.SavedSettings = true;
+            Close();
+        }
+
+        /// <summary>
+        /// Handler for CancelButtom Click event
+        /// </summary>
+        private void OnCancelClick(object sender, EventArgs e)
+        {
+            OptionsViewModel.SavedSettings = false;
+            Close();
+        }
+
+        /// <summary>
+        /// Handler for RedumpPasswordBox PasswordChanged event
+        /// </summary>
+        private void OnPasswordChanged(object sender, EventArgs e)
+        {
+            OptionsViewModel.Options.RedumpPassword = RedumpPasswordBox.Password;
+        }
+
+        /// <summary>
+        /// Test Redump credentials for validity
+        /// </summary>
+#if NET48
+        private void OnRedumpTestClick(object sender, EventArgs e) => ValidateRedumpCredentials();
+#else
+        private async void OnRedumpTestClick(object sender, EventArgs e) => await ValidateRedumpCredentials();
+#endif
+
+        #endregion
     }
 }

MPF.sln

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF", "MPF\MPF.csproj", "{7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Test", "MPF.Test\MPF.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Library", "MPF.Library\MPF.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Check", "MPF.Check\MPF.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}"
@@ -19,14 +17,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\ISSUE_TEMPLATE\informational.md = .github\ISSUE_TEMPLATE\informational.md
 		.github\ISSUE_TEMPLATE\issue-report.md = .github\ISSUE_TEMPLATE\issue-report.md
 		publish-nix.sh = publish-nix.sh
-		README.md = README.md
 		publish-win.bat = publish-win.bat
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Core", "MPF.Core\MPF.Core.csproj", "{70B1265D-FE49-472A-A83D-0B462152D37A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Modules", "MPF.Modules\MPF.Modules.csproj", "{8A4254BD-552F-4238-B8EB-D59AACD768B9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.UI.Core", "MPF.UI.Core\MPF.UI.Core.csproj", "{EA3768DB-694A-4653-82E4-9FF71B8963F3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MPF", "MPF", "{4160167D-681D-480B-ABC6-06AC869E5769}"
@@ -45,10 +41,6 @@ Global
 		{7CC064D2-38AB-4A05-8519-28660DE4562A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CC064D2-38AB-4A05-8519-28660DE4562A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CC064D2-38AB-4A05-8519-28660DE4562A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51AB0928-13F9-44BF-A407-B6957A43A056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51AB0928-13F9-44BF-A407-B6957A43A056}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,10 +49,6 @@ Global
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A4254BD-552F-4238-B8EB-D59AACD768B9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,10 +60,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{7B1B75EB-8940-466F-BD51-76471A57F9BE} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{7CC064D2-38AB-4A05-8519-28660DE4562A} = {4160167D-681D-480B-ABC6-06AC869E5769}
-		{51AB0928-13F9-44BF-A407-B6957A43A056} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{8CFDE289-E171-4D49-A40D-5293265C1253} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{70B1265D-FE49-472A-A83D-0B462152D37A} = {4160167D-681D-480B-ABC6-06AC869E5769}
-		{8A4254BD-552F-4238-B8EB-D59AACD768B9} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3} = {4160167D-681D-480B-ABC6-06AC869E5769}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

MPF/App.xaml.cs

@@ -1,16 +1,7 @@
-using System.Windows;
-
-namespace MPF
+namespace MPF
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    /// <remarks>
-    /// This application is not fully MVVM. The following steps are needed to get there:
-    /// - Use commands instead of event handlers, where at all possible
-    /// - Reduce the amount of manual UI adjustments needed, instead binding to the view models
-    /// </remarks>
-    public partial class App : Application
-    {
-    }
+    public partial class App : System.Windows.Application { }
 }

MPF/MPF.csproj

@@ -2,27 +2,21 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows;net7.0-windows</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Images\Icon.ico</ApplicationIcon>
     <Title>MPF</Title>
-    <AssemblyName>MPF</AssemblyName>
     <Description>Frontend for various dumping programs</Description>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6.4</Version>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
+    <VersionPrefix>2.7.4</VersionPrefix>
     <InternalsVisibleTo>MPF.Test</InternalsVisibleTo>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>false</NrtShowRevision>
+  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,24 +25,18 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
     <ProjectReference Include="..\MPF.UI.Core\MPF.UI.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <Reference Include="PresentationFramework.Aero" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.9.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SabreTools.RedumpLib" Version="1.1.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

README.md

@@ -15,11 +15,11 @@ For those who like to test the newest features, download the latest AppVeyor WIP
 
 ## Media Preservation Frontend (MPF)
 
-MPF is the main, UI-centric application of the MPF suite. This program allows users to use Redumper, Aaru, DiscImageCreator, or dd for Windows in a more user-friendly way. Each backend dumping program is supported as fully as possible to ensure that all information is captured on output. There are many customization options and quality of life settings that can be access through the Options menu.
+MPF is the main, UI-centric application of the MPF suite. This program allows users to use Redumper, Aaru, or DiscImageCreator in a more user-friendly way. Each backend dumping program is supported as fully as possible to ensure that all information is captured on output. There are many customization options and quality of life settings that can be access through the Options menu.
 
 ### System Requirements
 
-- Windows 8.1 (x86 or x64) or newer
+- Windows 8.1 (x64) or newer
     - Users who wish to use MPF on Windows 7 need to disable strong name validation due to `Microsoft.Management.Infrastructure` being unsigned. Add the following registry keys (accurate at time of writing):
     ```
         [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\*,31bf3856ad364e35]
@@ -27,63 +27,47 @@ MPF is the main, UI-centric application of the MPF suite. This program allows us
     ```
     - Alternatively, look at this [StackOverflow question](https://stackoverflow.com/questions/403731/strong-name-validation-failed) for more information.
 
-- .NET Framework 4.8 or .NET 6.0 Runtimes
+- .NET Framework 4.8, .NET 6.0, or .NET 7.0 Runtimes
 - As much hard drive space as the amount of discs you will be dumping (20+ GB recommended)
 
 Ensure that your operating system is as up-to-date as possible, since some features may rely on those updates.
 
 ### Support Limitations
 
-.NET 6 has some known limitations that are documented in code and in some prior support tickets:
+The main UI has some known limitations that are documented in code and in some prior support tickets:
 
 - Windows-only due to reliance on WPF and Winforms
     - MAUI is not a viable alternative due to lack of out-of-box support for Linux
-    - Avalonia is being heavily considered
-- No media type detection due to lack of alternatives to IMAPI2
+    - Avalonia is being heavily considered as an alternative
 
 ### Build Instructions
 
-To build for .NET Framework 4.8 (Windows only), ensure that the .NET Framework 4.8 SDK is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, or Terminal:
+To build for .NET Framework 4.8, .NET 6.0, or .NET 7.0 (all Windows only), ensure that the .NET 7.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, or Terminal:
 
 ```
-dotnet restore
-msbuild MPF\MPF.csproj -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+dotnet build MPF\MPF.csproj --framework [net48|net6.0-windows|net7.0-windows] --runtime win-x64 --self-contained
 ```
 
-To build for .NET 6.0 (Windows only), ensure that the .NET 6.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, or Terminal:
-
-```
-dotnet build MPF\MPF.csproj --framework net6.0-windows --runtime [win7-x64|win8-x64|win81-x64|win10-x64]
-```
-
-Choose one of `[win7-x64|win8-x64|win81-x64|win10-x64]` depending on the machine you are targeting. `win10-x64` also includes Windows 11.
-
+You may also run `publish-win.bat` (on Windows) or `publish-nix.sh` (on Linux) to build and package all variants MPF and MPF.Check at once. The Windows script additionally requires 7-zip commandline, Git for Windows, and .NET Framework 4.8 SDK to be installed and in PATH. The Linux script additionally requires `zip` and Git to be installed and in PATH.
 
 ## Media Preservation Frontend Checker (MPF.Check)
 
-MPF.Check is a commandline-only program that allows users to generate submission information from their personal rips. This program supports the outputs from Redumper, Aaru, DiscImageCreator, dd for Windows, Cleanrip, and UmdImageCreator. Running this program without any parameters will display the help text, including all supported parameters.
+MPF.Check is a commandline-only program that allows users to generate submission information from their personal rips. This program supports the outputs from Redumper, Aaru, DiscImageCreator, Cleanrip, and UmdImageCreator. Running this program without any parameters will display the help text, including all supported parameters.
 
 ### System Requirements
 
-- Windows 8.1 (x86 or x64) or newer, GNU/Linux x64, or OSX x64
-- .NET Framework 4.8 (Windows or `mono` only) or .NET 6.0 Runtimes
+- Windows 8.1 (x64) or newer, GNU/Linux x64, or OSX x64
+- .NET Framework 4.8 (Windows or `mono` only), .NET 6.0, or .NET 7.0 Runtimes
 
 ### Build Instructions
 
-To build for .NET Framework 4.8 (Windows only), ensure that the .NET Framework 4.8 SDK is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, or Terminal:
+To build for .NET Framework 4.8 (Windows only), .NET 6.0, and .NET 7.0 (both all supported OSes), ensure that the .NET 7.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, Terminal, or shell:
 
 ```
-dotnet restore
-msbuild MPF.Check\MPF.Check.csproj -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+dotnet build MPF.Check\MPF.Check.csproj --framework [net48|net6.0|net7.0] --runtime [win-x64|linux-x64|osx-x64] --self-contained
 ```
 
-To build for .NET 6.0 (All supported OSes), ensure that the .NET 6.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, Terminal, or shell:
-
-```
-dotnet build MPF.Check\MPF.Check.csproj --framework net6.0 --runtime [win7-x64|win8-x64|win81-x64|win10-x64|linux-x64|osx-x64]
-```
-
-Choose one of `[win7-x64|win8-x64|win81-x64|win10-x64|linux-x64|osx-x64]` depending on the machine you are targeting. `win10-x64` also includes Windows 11.
+Choose one of `[win-x64|linux-x64|osx-x64]` depending on the machine you are targeting.
 
 ## Information
 

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 2.6.4-{build}
+version: 2.7.4-{build}
 
 # pull request template
 pull_requests:
@@ -8,110 +8,68 @@ pull_requests:
 # vm template
 image: Visual Studio 2022
 
-# environment variables
-environment:
-  EnableNuGetPackageRestore: true
-
-# install dependencies
-install:
-- ps: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-
-# pre-build script
-before_build:
-- nuget restore
-
 # build step
 build_script:
   - dotnet restore
 
-  # .NET Framework 4.8
-  - msbuild MPF\MPF.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
-  - msbuild MPF.Check\MPF.Check.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+  # .NET Framework 4.8 Debug
+  - dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT%
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT%
 
-  # .NET 6.0
-  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true
+  # .NET Framework 4.8 Release
+  - dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:DebugType=None -p:DebugSymbols=false
+
+  # .NET 6.0 Debug
+  - dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+
+  # .NET 6.0 Release
+  - dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+
+  # .NET 7.0 Debug
+  - dotnet publish MPF\MPF.csproj -f net7.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r linux-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
+
+  # .NET 7.0 Release
+  - dotnet publish MPF\MPF.csproj -f net7.0-windows -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r linux-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+  - dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
 
 # post-build step
 after_build:
 
 # Aaru
 - ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip
-- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net48\publish\Programs\Aaru *
-- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Aaru *
-- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Aaru *
-- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Aaru *
-- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Aaru *
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Aaru *
 
 # DiscImageCreator
 - ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/11660558/DiscImageCreator_20230606.zip
-- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net48\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Creator Release_ANSI\*
 
 # Redumper
-- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_195/redumper-2023.07.19_build195-win64.zip
-- 7z e redumper-2023.07.19_build195-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.07.19_build195-win64\bin\*
-- 7z e redumper-2023.07.19_build195-win64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Redumper redumper-2023.07.19_build195-win64\bin\*
-- 7z e redumper-2023.07.19_build195-win64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Redumper redumper-2023.07.19_build195-win64\bin\*
-- 7z e redumper-2023.07.19_build195-win64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Redumper redumper-2023.07.19_build195-win64\bin\*
-- 7z e redumper-2023.07.19_build195-win64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Redumper redumper-2023.07.19_build195-win64\bin\*
+- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_246/redumper-2023.10.31_build246-win64.zip
+- 7z e redumper-2023.10.31_build246-win64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.10.31_build246-win64\bin\*
 
-# Subdump
-- ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48\publish *
-- mkdir MPF\bin\Debug\net48\publish\Programs\Subdump
-- mv MPF\bin\Debug\net48\publish\subdump_fua_0x28.exe MPF\bin\Debug\net48\publish\Programs\Subdump\subdump.exe
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
-- mkdir MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump
-- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump\subdump.exe
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
-- mkdir MPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Subdump
-- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Subdump\subdump.exe
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
-- mkdir MPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Subdump
-- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Subdump\subdump.exe
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
-- mkdir MPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Subdump
-- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Subdump\subdump.exe
+# Create MPF Debug archives
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_%APPVEYOR_BUILD_NUMBER%_net6.0_win-x64_debug.zip *
 
-# MPF
-- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win7-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win7-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win8-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win8-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win81-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win81-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win10-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win10-x64.zip *
-
-# MPF.Check
-- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win7-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win7-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win8-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win8-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win81-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win81-x64.zip *
-- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win10-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win10-x64.zip *
+# Create MPF.Check Debug archives
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_win-x64_debug.zip *
 - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip *
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_linux-x64_debug.zip *
 - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\
-- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip *
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_osx-x64_debug.zip *
 
 # success/failure tracking
 on_success:
@@ -123,28 +81,12 @@ on_failure:
 
 # artifact linking
 artifacts:
-- path: MPF_net48.zip
-  name: MPF (.NET Framework 4.8)
-- path: MPF_net6.0_win7-x64.zip
-  name: MPF (.NET 6.0, Windows 7 x64)
-- path: MPF_net6.0_win8-x64.zip
-  name: MPF (.NET 6.0, Windows 8 x64)
-- path: MPF_net6.0_win81-x64.zip
-  name: MPF (.NET 6.0, Windows 8.1 x64)
-- path: MPF_net6.0_win10-x64.zip
-  name: MPF (.NET 6.0, Windows 10 x64)
+- path: MPF_%APPVEYOR_BUILD_NUMBER%_net6.0_win-x64_debug.zip
+  name: MPF (.NET 6.0, Debug, Windows x64)
 
-- path: MPF.Check_net48.zip
-  name: MPF Check (.NET Framework 4.8)
-- path: MPF.Check_net6.0_win7-x64.zip
-  name: MPF.Check (.NET 6.0, Windows 7 x64)
-- path: MPF.Check_net6.0_win8-x64.zip
-  name: MPF.Check (.NET 6.0, Windows 8 x64)
-- path: MPF.Check_net6.0_win81-x64.zip
-  name: MPF.Check (.NET 6.0, Windows 8.1 x64)
-- path: MPF.Check_net6.0_win10-x64.zip
-  name: MPF.Check (.NET 6.0, Windows 10 x64)
-- path: MPF.Check_net6.0_linux-x64.zip
-  name: MPF.Check (.NET 6.0, Linux x64)
-- path: MPF.Check_net6.0_osx-x64.zip
-  name: MPF.Check (.NET 6.0, OSX x64)
+- path: MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_win-x64_debug.zip
+  name: MPF.Check (.NET 6.0, Debug, Windows x64)
+- path: MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_linux-x64_debug.zip
+  name: MPF.Check (.NET 6.0, Debug, Linux x64)
+- path: MPF.Check_%APPVEYOR_BUILD_NUMBER%_net6.0_osx-x64_debug.zip
+  name: MPF.Check (.NET 6.0, Debug, OSX x64)

publish-nix.sh

@@ -1,8 +1,9 @@
-#! /bin/bash
+#! /bin/bash
 
 # This batch file assumes the following:
-# - .NET 6.0 (or newer) SDK is installed and in PATH
+# - .NET 7.0 (or newer) SDK is installed and in PATH
 # - zip is installed and in PATH
+# - Git is installed and in PATH
 # - The relevant commandline programs are already downloaded
 #   and put into their respective folders
 #
@@ -15,43 +16,77 @@
 # Set the current directory as a variable
 BUILD_FOLDER=$PWD
 
+# Set the current commit hash
+COMMIT=`git log --pretty=%H -1`
+
 # Restore Nuget packages for all builds
 echo "Restoring Nuget packages"
 dotnet restore
 
-# .NET 6.0
-echo "Building .NET 6.0 releases"
-#dotnet publish MPF/MPF.csproj --framework net6.0-windows --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-#dotnet publish MPF/MPF.csproj --framework net6.0-windows --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-#dotnet publish MPF/MPF.csproj --framework net6.0-windows --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-#dotnet publish MPF/MPF.csproj --framework net6.0-windows --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check/MPF.Check.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true
+# .NET 6.0 Debug
+echo "Building .NET 6.0 debug"
+#dotnet publish MPF/MPF.csproj -f net6.0-windows -r win-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r win-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r linux-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r osx-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
 
-# Create MPF archives
-#cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win7-x64/publish/
-#zip -r $BUILD_FOLDER/MPF_net6.0_win7-x64.zip .
-#cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win8-x64/publish/
-#zip -r $BUILD_FOLDER/MPF_net6.0_win8-x64.zip .
-#cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win81-x64/publish/
-#zip -r $BUILD_FOLDER/MPF_net6.0_win81-x64.zip .
-#cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win10-x64/publish/
-#zip -r $BUILD_FOLDER/MPF_net6.0_win10-x64.zip .
+# .NET 6.0 Release
+echo "Building .NET 6.0 release"
+#dotnet publish MPF/MPF.csproj -f net6.0-windows -r win-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r win-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r linux-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net6.0 -r osx-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
 
-# Create MPF.Check archives
-cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win7-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_win7-x64.zip .
-cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win8-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_win8-x64.zip .
-cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win81-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_win81-x64.zip .
-cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win10-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_win10-x64.zip .
+# .NET 7.0 Debug
+echo "Building .NET 7.0 debug"
+#dotnet publish MPF/MPF.csproj -f net7.0-windows -r win-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r win-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r linux-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r osx-x64 -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+
+# .NET 7.0 Release
+echo "Building .NET 7.0 release"
+#dotnet publish MPF/MPF.csproj -f net7.0-windows -r win-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r win-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r linux-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false
+
+# Create MPF Debug archives
+#cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win-x64/publish/
+#zip -r $BUILD_FOLDER/MPF_net6.0_win-x64_debug.zip .
+#cd $BUILD_FOLDER/MPF/bin/Debug/net7.0-windows/win-x64/publish/
+#zip -r $BUILD_FOLDER/MPF_net7.0_win-x64_debug.zip .
+
+# Create MPF Release archives
+#cd $BUILD_FOLDER/MPF/bin/Release/net6.0-windows/win-x64/publish/
+#zip -r $BUILD_FOLDER/MPF_net6.0_win-x64_release.zip .
+#cd $BUILD_FOLDER/MPF/bin/Release/net7.0-windows/win-x64/publish/
+#zip -r $BUILD_FOLDER/MPF_net7.0_win-x64_release.zip .
+
+# Create MPF.Check Debug archives
+cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_win-x64_debug.zip .
 cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/linux-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64.zip .
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64_debug.zip .
 cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/osx-x64/publish/
-zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64.zip .
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64_debug.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/win-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_win-x64_debug.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/linux-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_linux-x64_debug.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/osx-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_osx-x64_debug.zip .
+
+# Create MPF.Check Release archives
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/win-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_win-x64_release.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/linux-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64_release.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/osx-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64_release.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/win-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_win-x64_release.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/linux-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_linux-x64_release.zip .
+cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/osx-x64/publish/
+zip -r $BUILD_FOLDER/MPF.Check_net7.0_osx-x64_release.zip .

publish-win.bat

@@ -2,8 +2,9 @@
 
 REM This batch file assumes the following:
 REM - .NET Framework 4.8 SDK is installed and in PATH
-REM - .NET 6.0 (or newer) SDK is installed and in PATH
+REM - .NET 7.0 (or newer) SDK is installed and in PATH
 REM - 7-zip commandline (7z.exe) is installed and in PATH
+REM - Git for Windows is installed and in PATH
 REM - The relevant commandline programs are already downloaded
 REM   and put into their respective folders
 REM
@@ -13,52 +14,95 @@ REM in an unpredictable way and result in an incomplete output.
 REM Set the current directory as a variable
 set BUILD_FOLDER=%~dp0
 
+REM Set the current commit hash
+for /f %%i in ('git log --pretty^=%%H -1') do set COMMIT=%%i
+
 REM Restore Nuget packages for all builds
 echo Restoring Nuget packages
 dotnet restore
 
-REM .NET Framework 4.8
-echo Building .NET Framework 4.8 releases
-msbuild MPF\MPF.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
-msbuild MPF.Check\MPF.Check.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+REM .NET Framework 4.8 Debug
+echo Building .NET Framework 4.8 debug
+dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %COMMIT%
+dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %COMMIT%
 
-REM .NET 6.0
-echo Building .NET 6.0 releases
-dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true
-dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true
+REM .NET Framework 4.8 Release
+echo Building .NET Framework 4.8 release
+dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:DebugType=None -p:DebugSymbols=false
 
-REM Create MPF archives
-cd %BUILD_FOLDER%\MPF\bin\Debug\net48\publish\
-7z a -tzip %BUILD_FOLDER%\MPF_net48.zip *
-cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win7-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win7-x64.zip *
-cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win8-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win8-x64.zip *
-cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win81-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win81-x64.zip *
-cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win10-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win10-x64.zip *
+REM .NET 6.0 Debug
+echo Building .NET 6.0 debug
+dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
 
-REM Create MPF.Check archives
-cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net48\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net48.zip *
-cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win7-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win7-x64.zip *
-cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win8-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win8-x64.zip *
-cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win81-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win81-x64.zip *
-cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win10-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win10-x64.zip *
+REM .NET 6.0 Release
+echo Building .NET 6.0 release
+dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+
+REM .NET 7.0 Debug
+echo Building .NET 7.0 debug
+dotnet publish MPF\MPF.csproj -f net7.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r win-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r linux-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true
+
+REM .NET 7.0 Release
+echo Building .NET 7.0 release
+dotnet publish MPF\MPF.csproj -f net7.0-windows -r win-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r win-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r linux-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
+
+REM Create MPF Debug archives
+cd %BUILD_FOLDER%\MPF\bin\Debug\net48\win7-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net48_debug.zip *
+cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win-x64_debug.zip *
+cd %BUILD_FOLDER%\MPF\bin\Debug\net7.0-windows\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net7.0_win-x64_debug.zip *
+
+REM Create MPF Release archives
+cd %BUILD_FOLDER%\MPF\bin\Release\net48\win7-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net48_release.zip *
+cd %BUILD_FOLDER%\MPF\bin\Release\net6.0-windows\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win-x64_release.zip *
+cd %BUILD_FOLDER%\MPF\bin\Release\net7.0-windows\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF_net7.0_win-x64_release.zip *
+
+REM Create MPF.Check Debug archives
+cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net48\win7-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net48_debug.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win-x64_debug.zip *
 cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip *
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_debug.zip *
 cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\
-7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip *
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_debug.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_win-x64_debug.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\linux-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_debug.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\osx-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_debug.zip *
+
+REM Create MPF.Check Release archives
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net48\win7-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net48_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win-x64_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\linux-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\osx-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\win-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_win-x64_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\linux-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_release.zip *
+cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\osx-x64\publish\
+7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_release.zip *