From ccde87828652df5af7f98e2fba4fce042aa5315d Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 5 Apr 2024 15:58:44 -0400
Subject: [PATCH] Update BinaryObjectScanner to 3.1.5

---
 CHANGELIST.md                           | 1 +
 MPF.Check/MPF.Check.csproj              | 2 +-
 MPF.Core/Data/Drive.cs                  | 3 +--
 MPF.Core/InfoTool.cs                    | 2 +-
 MPF.Core/MPF.Core.csproj                | 6 +++---
 MPF.Core/Modules/Aaru/Parameters.cs     | 2 +-
 MPF.Core/Modules/Redumper/Parameters.cs | 2 +-
 MPF/MPF.csproj                          | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 7f2b8d88..e8fb2237 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -17,6 +17,7 @@
 - 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)
 
diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj
index 81147b4a..84a0bc9a 100644
--- a/MPF.Check/MPF.Check.csproj
+++ b/MPF.Check/MPF.Check.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.4" 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" />
diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs
index e8f19c8c..50d562ab 100644
--- a/MPF.Core/Data/Drive.cs
+++ b/MPF.Core/Data/Drive.cs
@@ -384,8 +384,7 @@ namespace MPF.Core.Data
                         if (!File.Exists(catalogjs))
                             return RedumpSystem.MicrosoftXboxOne;
 
-                        var deserializer = new SabreTools.Serialization.Files.Catalog();
-                        SabreTools.Models.Xbox.Catalog? catalog = deserializer.Deserialize(catalogjs);
+                        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))
diff --git a/MPF.Core/InfoTool.cs b/MPF.Core/InfoTool.cs
index f99bfd37..35a5adc4 100644
--- a/MPF.Core/InfoTool.cs
+++ b/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
             {
diff --git a/MPF.Core/MPF.Core.csproj b/MPF.Core/MPF.Core.csproj
index df947297..1f771fbd 100644
--- a/MPF.Core/MPF.Core.csproj
+++ b/MPF.Core/MPF.Core.csproj
@@ -48,16 +48,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.4" 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.2.0" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.1" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.2" />
     <PackageReference Include="SabreTools.RedumpLib" Version="1.3.6" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.3" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/MPF.Core/Modules/Aaru/Parameters.cs b/MPF.Core/Modules/Aaru/Parameters.cs
index 3e8c0336..ccf12f56 100644
--- a/MPF.Core/Modules/Aaru/Parameters.cs
+++ b/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;
 
diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs
index 9ce35cf9..d13694f2 100644
--- a/MPF.Core/Modules/Redumper/Parameters.cs
+++ b/MPF.Core/Modules/Redumper/Parameters.cs
@@ -928,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)
                     {
diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj
index 29327f66..56925e21 100644
--- a/MPF/MPF.csproj
+++ b/MPF/MPF.csproj
@@ -70,7 +70,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.4" 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" />