Bump version

* ClrMamePro format is for CDs, dont assume hashes are in CleanRip logs

* Rename folder

* Rename folder again

* Update changelog

* Don't trust cleanrip log hashes if any are missing

CHANGELIST.md

@@ -1,3 +1,24 @@
+### 3.1.5 (2024-04-05)
+
+- Handle `.0.physical` files from Redumpers
+- Read C2 error count from Redumper logs
+- Read last instance of hash data from Redumper
+- Add Konami Python 2 system detection
+- Fix outdated information in README
+- Fix missing information in README
+- Language selections unchecked by default
+- Update BinaryObjectScanner to 3.1.3
+- Fix information pulling for redumper (fuzz6001)
+- Update packages
+- Update BinaryObjectScanner to 3.1.4
+- Detect Xbox Series X discs (Deterous)
+- Enable Windows targeting for test project
+- Fix test project project includes
+- Fix CleanRip hash output for Check (Deterous)
+- Enable label-side mastering SID and toolstamp
+- Enable remaining fields for label-side information
+- Update BinaryObjectScanner to 3.1.5
+
 ### 3.1.4 (2024-03-16)
 
 - Update BinaryObjectScanner to 3.1.2

MPF.Check/MPF.Check.csproj

@@ -11,7 +11,7 @@
     <Nullable>enable</Nullable>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <VersionPrefix>3.1.4</VersionPrefix>
+    <VersionPrefix>3.1.5</VersionPrefix>
 
     <!-- Package Properties -->
     <Title>MPF Check</Title>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.2" GeneratePathProperty="true">
+    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.5" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SabreTools.RedumpLib" Version="1.3.6" />

MPF.Core/Data/Drive.cs

@@ -291,6 +291,12 @@ namespace MPF.Core.Data
                 return RedumpSystem.funworldPhotoPlay;
             }
 
+            // Konami Python 2
+            if (Directory.Exists(Path.Combine(this.Name, "PY2.D")))
+            {
+                return RedumpSystem.KonamiPython2;
+            }
+
             #endregion
 
             #region Consoles
@@ -363,17 +369,43 @@ namespace MPF.Core.Data
             }
             catch { }
 
-            // Microsoft Xbox One
+            // Microsoft Xbox One and Series X
             try
             {
-                if (Directory.Exists(Path.Combine(this.Name, "MSXC"))
-#if NET20 || NET35
-                    && Directory.GetFiles(Path.Combine(this.Name, "MSXC")).Any())
-#else
-                    && Directory.EnumerateFiles(Path.Combine(this.Name, "MSXC")).Any())
-#endif
+                if (Directory.Exists(Path.Combine(this.Name, "MSXC")))
                 {
-                    return RedumpSystem.MicrosoftXboxOne;
+                    try
+                    {
+#if NET20 || NET35
+                        string catalogjs = Path.Combine(this.Name, Path.Combine("MSXC", Path.Combine("Metadata", "catalog.js")));
+#else
+                        string catalogjs = Path.Combine(this.Name, "MSXC", "Metadata", "catalog.js");
+#endif
+                        if (!File.Exists(catalogjs))
+                            return RedumpSystem.MicrosoftXboxOne;
+
+                        SabreTools.Models.Xbox.Catalog? catalog = SabreTools.Serialization.Deserializers.Catalog.DeserializeFile(catalogjs);
+                        if (catalog != null && catalog.Version != null && catalog.Packages != null)
+                        {
+                            if (!double.TryParse(catalog.Version, out double version))
+                                return RedumpSystem.MicrosoftXboxOne;
+
+                            if (version < 4)
+                                return RedumpSystem.MicrosoftXboxOne;
+
+                            foreach (var package in catalog.Packages)
+                            {
+                                if (package.Generation != "9")
+                                    return RedumpSystem.MicrosoftXboxOne;
+                            }
+
+                            return RedumpSystem.MicrosoftXboxSeriesXS;
+                        }
+                    }
+                    catch
+                    {
+                        return RedumpSystem.MicrosoftXboxOne;
+                    }
                 }
             }
             catch { }

MPF.Core/InfoTool.cs

@@ -168,7 +168,7 @@ namespace MPF.Core
         {
             try
             {
-                return new SabreTools.Serialization.Files.PIC().Deserialize(pic);
+                return SabreTools.Serialization.Deserializers.PIC.DeserializeFile(pic);
             }
             catch
             {

MPF.Core/MPF.Core.csproj

@@ -10,7 +10,7 @@
     <Nullable>enable</Nullable>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <VersionPrefix>3.1.4</VersionPrefix>
+    <VersionPrefix>3.1.5</VersionPrefix>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
@@ -48,16 +48,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.2" GeneratePathProperty="true">
+    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.5" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LibIRD" Version="0.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="psxt001z.Library" Version="0.21.0-beta4" />
-    <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.0" />
+    <PackageReference Include="SabreTools.Hashing" Version="1.2.0" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.2" />
     <PackageReference Include="SabreTools.RedumpLib" Version="1.3.6" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.0" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.5.0" />
   </ItemGroup>
 
 </Project>

MPF.Core/Modules/Aaru/Parameters.cs

@@ -2486,7 +2486,7 @@ namespace MPF.Core.Modules.Aaru
             cueSheet.Files = [.. cueFiles];
             if (cueSheet != null && cueSheet != default)
             {
-                var ms = new SabreTools.Serialization.Streams.CueSheet().Serialize(cueSheet);
+                var ms = SabreTools.Serialization.Serializers.CueSheet.SerializeStream(cueSheet);
                 if (ms == null)
                     return null;
 

MPF.Core/Modules/CleanRip/Parameters.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using MPF.Core.Converters;
 using MPF.Core.Data;
+using SabreTools.Hashing;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 
@@ -72,8 +73,9 @@ namespace MPF.Core.Modules.CleanRip
             // Get the Datafile information
             var datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt");
 
-            // Fill in the hash data
-            info.TracksAndWriteOffsets!.ClrMameProData = InfoTool.GenerateDatfile(datafile);
+            // ClrMameProData format is only for CDs
+            if (this.Type == MediaType.CDROM)
+                info.TracksAndWriteOffsets!.ClrMameProData = InfoTool.GenerateDatfile(datafile);
 
             // Get the individual hash data, as per internal
             if (InfoTool.GetISOHashValues(datafile, out long size, out var crc32, out var md5, out var sha1))
@@ -182,6 +184,17 @@ namespace MPF.Core.Modules.CleanRip
                         sha1 = line.Substring(7);
                 }
 
+                // Ensure all checksums were found in log
+                if (crc == string.Empty || md5 == string.Empty || sha1 == string.Empty)
+                {
+                    if (HashTool.GetStandardHashes(iso, out long isoSize, out string? isoCRC, out string? isoMD5, out string? isoSHA1))
+                    {
+                        crc = isoCRC ?? crc;
+                        md5 = isoMD5 ?? md5;
+                        sha1 = isoSHA1 ?? sha1;
+                    }
+                }
+
                 return new Datafile
                 {
                     Games =

MPF.Core/Modules/Redumper/Parameters.cs

@@ -231,7 +231,7 @@ namespace MPF.Core.Modules.Redumper
                             missingFiles.Add($"{basePath}.dat");
                         if (!File.Exists($"{basePath}.manufacturer") && !File.Exists($"{basePath}.1.manufacturer") && !File.Exists($"{basePath}.2.manufacturer"))
                             missingFiles.Add($"{basePath}.manufacturer");
-                        if (!File.Exists($"{basePath}.physical") && !File.Exists($"{basePath}.1.physical") && !File.Exists($"{basePath}.2.physical"))
+                        if (!File.Exists($"{basePath}.physical") && !File.Exists($"{basePath}.0.physical") && !File.Exists($"{basePath}.1.physical") && !File.Exists($"{basePath}.2.physical"))
                             missingFiles.Add($"{basePath}.physical");
                         if (!File.Exists($"{basePath}.state"))
                             missingFiles.Add($"{basePath}.state");
@@ -256,7 +256,7 @@ namespace MPF.Core.Modules.Redumper
                             missingFiles.Add($"{basePath}.log");
                         else if (GetDatfile($"{basePath}.log") == null)
                             missingFiles.Add($"{basePath}.dat");
-                        if (!File.Exists($"{basePath}.physical") && !File.Exists($"{basePath}.1.physical") && !File.Exists($"{basePath}.2.physical"))
+                        if (!File.Exists($"{basePath}.physical") && !File.Exists($"{basePath}.0.physical") && !File.Exists($"{basePath}.1.physical") && !File.Exists($"{basePath}.2.physical"))
                             missingFiles.Add($"{basePath}.physical");
                         if (!File.Exists($"{basePath}.state"))
                             missingFiles.Add($"{basePath}.state");
@@ -320,8 +320,11 @@ namespace MPF.Core.Modules.Redumper
                     info.TracksAndWriteOffsets.OtherWriteOffsets = cdWriteOffset;
 
                     // Attempt to get the error count
-                    long errorCount = GetErrorCount($"{basePath}.log");
-                    info.CommonDiscInfo.ErrorsCount = (errorCount == -1 ? "Error retrieving error count" : errorCount.ToString());
+                    if (GetErrorCount($"{basePath}.log", out long redumpErrors, out long c2Errors))
+                    {
+                        info.CommonDiscInfo.ErrorsCount = (redumpErrors == -1 ? "Error retrieving error count" : redumpErrors.ToString());
+                        info.DumpingInfo.C2ErrorsCount = (c2Errors == -1 ? "Error retrieving error count" : c2Errors.ToString());
+                    }
 
                     // Attempt to get multisession data
                     string cdMultiSessionInfo = GetMultisessionInformation($"{basePath}.log") ?? string.Empty;
@@ -385,9 +388,14 @@ namespace MPF.Core.Modules.Redumper
                                 break;
                         }
 
-                        info.Extras!.PIC = GetPIC($"{basePath}.physical", trimLength) ?? string.Empty;
+                        info.Extras!.PIC = GetPIC($"{basePath}.physical", trimLength)
+                            ?? GetPIC($"{basePath}.0.physical", trimLength)
+                            ?? GetPIC($"{basePath}.1.physical", trimLength)
+                            ?? string.Empty;
 
-                        var di = InfoTool.GetDiscInformation($"{basePath}.physical");
+                        var di = InfoTool.GetDiscInformation($"{basePath}.physical")
+                            ?? InfoTool.GetDiscInformation($"{basePath}.0.physical")
+                            ?? InfoTool.GetDiscInformation($"{basePath}.1.physical");
                         info.SizeAndChecksums!.PICIdentifier = InfoTool.GetPICIdentifier(di);
                     }
 
@@ -549,6 +557,8 @@ namespace MPF.Core.Modules.Redumper
                     info.Artifacts["manufacturer2"] = GetBase64(GetFullFile($"{basePath}.2.manufacturer")) ?? string.Empty;
                 if (File.Exists($"{basePath}.physical"))
                     info.Artifacts["physical"] = GetBase64(GetFullFile($"{basePath}.physical")) ?? string.Empty;
+                if (File.Exists($"{basePath}.0.physical"))
+                    info.Artifacts["physical0"] = GetBase64(GetFullFile($"{basePath}.0.physical")) ?? string.Empty;
                 if (File.Exists($"{basePath}.1.physical"))
                     info.Artifacts["physical1"] = GetBase64(GetFullFile($"{basePath}.1.physical")) ?? string.Empty;
                 if (File.Exists($"{basePath}.2.physical"))
@@ -918,7 +928,7 @@ namespace MPF.Core.Modules.Redumper
                         logFiles.Add($"{basePath}.toc");
 
                     // Include .hash and .skeleton for all files in cuesheet
-                    var cueSheet = new SabreTools.Serialization.Files.CueSheet().Deserialize($"{basePath}.cue");
+                    var cueSheet = SabreTools.Serialization.Deserializers.CueSheet.DeserializeFile($"{basePath}.cue");
                     string? baseDir = Path.GetDirectoryName(basePath);
                     if (cueSheet?.Files != null && baseDir != null)
                     {
@@ -958,6 +968,8 @@ namespace MPF.Core.Modules.Redumper
                         logFiles.Add($"{basePath}.2.manufacturer");
                     if (File.Exists($"{basePath}.physical"))
                         logFiles.Add($"{basePath}.physical");
+                    if (File.Exists($"{basePath}.0.physical"))
+                        logFiles.Add($"{basePath}.0.physical");
                     if (File.Exists($"{basePath}.1.physical"))
                         logFiles.Add($"{basePath}.1.physical");
                     if (File.Exists($"{basePath}.2.physical"))
@@ -976,6 +988,8 @@ namespace MPF.Core.Modules.Redumper
                         logFiles.Add($"{basePath}.log");
                     if (File.Exists($"{basePath}.physical"))
                         logFiles.Add($"{basePath}.physical");
+                    if (File.Exists($"{basePath}.0.physical"))
+                        logFiles.Add($"{basePath}.0.physical");
                     if (File.Exists($"{basePath}.1.physical"))
                         logFiles.Add($"{basePath}.1.physical");
                     if (File.Exists($"{basePath}.2.physical"))
@@ -1429,25 +1443,31 @@ namespace MPF.Core.Modules.Redumper
 
             try
             {
-                // Fast forward to the dat line
                 using var sr = File.OpenText(log);
-                while (!sr.EndOfStream && sr.ReadLine()?.TrimStart()?.StartsWith("dat:") == false) ;
-                if (sr.EndOfStream)
-                    return null;
+                string? datString = null;
 
-                // Now that we're at the relevant entries, read each line in and concatenate
-                var datString = string.Empty;
-                var line = sr.ReadLine()?.Trim();
-                while (line?.StartsWith("<rom") == true)
+                // Find all occurrences of the hash information 
+                while (!sr.EndOfStream)
                 {
-                    datString += line + "\n";
+                    // Fast forward to the dat line
+                    while (!sr.EndOfStream && sr.ReadLine()?.TrimStart()?.StartsWith("dat:") == false) ;
                     if (sr.EndOfStream)
                         break;
 
-                    line = sr.ReadLine()?.Trim();
+                    // Now that we're at the relevant entries, read each line in and concatenate
+                    datString = string.Empty;
+                    var line = sr.ReadLine()?.Trim();
+                    while (line?.StartsWith("<rom") == true)
+                    {
+                        datString += line + "\n";
+                        if (sr.EndOfStream)
+                            break;
+
+                        line = sr.ReadLine()?.Trim();
+                    }
                 }
 
-                return datString.TrimEnd('\n');
+                return datString?.TrimEnd('\n');
             }
             catch
             {
@@ -1655,47 +1675,54 @@ namespace MPF.Core.Modules.Redumper
         }
 
         /// <summary>
-        /// Get the detected error count from the input files, if possible
+        /// Get the detected error counts from the input files, if possible
         /// </summary>
         /// <param name="log">Log file location</param>
-        /// <returns>Error count if possible, -1 on error</returns>
-        public static long GetErrorCount(string log)
+        /// <returns>True if error counts could be retrieved, false otherwise</returns>
+        public static bool GetErrorCount(string log, out long redumpErrors, out long c2Errors)
         {
+            // Set the default values for error counts
+            redumpErrors = -1; c2Errors = -1;
+
             // If the file doesn't exist, we can't get info from it
             if (!File.Exists(log))
-                return -1;
+                return false;
 
             try
             {
-                // Fast forward to the errors lines
                 using var sr = File.OpenText(log);
-                while (!sr.EndOfStream && sr.ReadLine()?.Trim()?.StartsWith("CD-ROM [") == false) ;
-                if (sr.EndOfStream)
-                    return 0;
 
-                // Now that we're at the relevant lines, find the error count
+                // Find the error counts
                 while (!sr.EndOfStream)
                 {
-                    // Skip forward to the "REDUMP.ORG" line
-                    var line = string.Empty;
-                    while (!sr.EndOfStream && (line = sr.ReadLine()?.Trim())?.StartsWith("REDUMP.ORG errors") == false) ;
-                    if (string.IsNullOrEmpty(line))
+                    var line = sr.ReadLine()?.Trim();
+                    if (line == null)
                         break;
 
+                    // C2: <error count>
+                    if (line.StartsWith("C2:"))
+                    {
+                        string[] parts = line.Split(' ');
+                        if (!long.TryParse(parts[1], out c2Errors))
+                            c2Errors = -1;
+                    }
+
                     // REDUMP.ORG errors: <error count>
-                    string[] parts = line!.Split(' ');
-                    if (long.TryParse(parts[2], out long redump))
-                        return redump;
-                    else
-                        return -1;
+                    else if (line.StartsWith("REDUMP.ORG errors:"))
+                    {
+                        string[] parts = line!.Split(' ');
+                        if (!long.TryParse(parts[2], out redumpErrors))
+                            redumpErrors = -1;
+                    }
                 }
 
-                return -1;
+                // If the Redump error count is -1, then an issue occurred
+                return redumpErrors != -1;
             }
             catch
             {
                 // We don't care what the exception is right now
-                return -1;
+                return false;
             }
         }
 
@@ -1726,7 +1753,7 @@ namespace MPF.Core.Modules.Redumper
                         return line.Substring("EXE date: ".Length);
                     }
 
-                    line = sr.ReadLine();   
+                    line = sr.ReadLine();
                 }
 
                 return null;

MPF.Core/SubmissionInfoTool.cs

@@ -452,7 +452,7 @@ namespace MPF.Core
                     break;
 
                 case RedumpSystem.SonyPlayStation2:
-                    info.CommonDiscInfo!.LanguageSelection = [LanguageSelection.BiosSettings, LanguageSelection.LanguageSelector, LanguageSelection.OptionsMenu];
+                    info.CommonDiscInfo!.LanguageSelection = [];
                     break;
 
                 case RedumpSystem.SonyPlayStation3:

MPF.Test/MPF.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MPF\MPF.csproj" />
+    <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage" Version="17.10.0-preview-24080-01" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24080-01" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="17.10.0-release-24177-07" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SabreTools.RedumpLib" Version="1.3.6" />
     <PackageReference Include="xunit" Version="2.7.0" />

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

@@ -14,7 +14,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <VersionPrefix>3.1.4</VersionPrefix>
+    <VersionPrefix>3.1.5</VersionPrefix>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>

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

@@ -477,16 +477,16 @@ namespace MPF.UI.Core.Windows
 
 #if NET35
                     _L1Info!.Header = "Label Side";
-                    _L1MasteringRing!.Visibility = Visibility.Collapsed;
-                    _L1MasteringSID!.Visibility = Visibility.Collapsed;
-                    _L1Toolstamp!.Visibility = Visibility.Collapsed;
+                    _L1MasteringRing!.Label = "Mastering Ring";
+                    _L1MasteringSID!.Label = "Mastering SID";
+                    _L1Toolstamp!.Label = "Mastering SID";
                     _L1MouldSID!.Label = "Mould SID";
                     _L1AdditionalMould!.Label = "Additional Mould";
 #else
                     L1Info.Header = "Label Side";
-                    L1MasteringRing.Visibility = Visibility.Collapsed;
-                    L1MasteringSID.Visibility = Visibility.Collapsed;
-                    L1Toolstamp.Visibility = Visibility.Collapsed;
+                    L1MasteringRing.Label = "Mastering Ring";
+                    L1MasteringSID.Label = "Mastering SID";
+                    L1Toolstamp.Label = "Mastering SID";
                     L1MouldSID.Label = "Mould SID";
                     L1AdditionalMould.Label = "Additional Mould";
 #endif
@@ -687,16 +687,16 @@ namespace MPF.UI.Core.Windows
 
 #if NET35
                         _L1Info!.Header = "Label Side";
-                        _L1MasteringRing!.Visibility = Visibility.Collapsed;
-                        _L1MasteringSID!.Visibility = Visibility.Collapsed;
-                        _L1Toolstamp!.Visibility = Visibility.Collapsed;
+                        _L1MasteringRing!.Label = "Mastering Ring";
+                        _L1MasteringSID!.Label = "Mastering SID";
+                        _L1Toolstamp!.Label = "Toolstamp/Mastering Code";
                         _L1MouldSID!.Label = "Mould SID";
                         _L1AdditionalMould!.Label = "Additional Mould";
 #else
                         L1Info.Header = "Label Side";
-                        L1MasteringRing.Visibility = Visibility.Collapsed;
-                        L1MasteringSID.Visibility = Visibility.Collapsed;
-                        L1Toolstamp.Visibility = Visibility.Collapsed;
+                        L1MasteringRing.Label = "Mastering Ring";
+                        L1MasteringSID.Label = "Mastering SID";
+                        L1Toolstamp.Label = "Toolstamp/Mastering Code";
                         L1MouldSID.Label = "Mould SID";
                         L1AdditionalMould.Label = "Additional Mould";
 #endif

MPF.sln

@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build_check.yml = .github\workflows\build_check.yml
 		.github\workflows\build_ui.yml = .github\workflows\build_ui.yml
+		.github\workflows\check_pr.yml = .github\workflows\check_pr.yml
 	EndProjectSection
 EndProject
 Global

MPF/MPF.csproj

@@ -16,7 +16,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <VersionPrefix>3.1.4</VersionPrefix>
+    <VersionPrefix>3.1.5</VersionPrefix>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
@@ -70,7 +70,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.2" GeneratePathProperty="true">
+    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.5" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SabreTools.RedumpLib" Version="1.3.6" />

README.md

@@ -56,16 +56,14 @@ dotnet build MPF/MPF.csproj --framework net8.0-windows --runtime [win-x86|win-x6
 dotnet build MPF.Check/MPF.Check.csproj --framework net8.0 --runtime [win-x86|win-x64|linux-x64|osx-x64]
 ```
 
-Choose one of `win-x64`, `linux-x64`, or `osx-x64` depending on the machine you are targeting.
+Choose one of `win-x86`, `win-x64`, `linux-x64`, or `osx-x64` depending on the machine you are targeting.
 
 ### Build Scripts
 
-Windows users may run `publish-win.ps1` and Linux users may run `publish-nix.sh` to perform a full release build.
+Windows users may run `publish-win.ps1` and Linux users may run `publish-nix.sh` to perform a full release build. Both scripts will build and package all variants of MPF UI and MPF.Check with commandline switches to control what is included.
 
-- `publish-win.ps1` will build and package all variants of MPF UI and MPF.Check
-  - The script requires [7-zip commandline](https://www.7-zip.org/download.html) and [Git for Windows](https://git-scm.com/downloads) to be installed and in `PATH`
-- `publish-nix.sh` will _only_ build and package all variants of MPF.Check
-  - The script requires `zip` and `git` to be installed and in `PATH`
+- `publish-win.ps1` requires [7-zip commandline](https://www.7-zip.org/download.html) and [Git for Windows](https://git-scm.com/downloads) to be installed and in `PATH`
+- `publish-nix.sh` requires `zip` and `git` to be installed and in `PATH`
 
 ## Information
 

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 3.1.4-{build}
+version: 3.1.5-{build}
 
 # pull request template
 pull_requests: