Bump version

Deserializer base

.github/workflows/build_nupkg.yml

@@ -0,0 +1,43 @@
+name: Nuget Pack
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Pack
+      run: dotnet pack
+
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'Nuget Package'
+        path: 'SabreTools.Serialization/bin/Release/*.nupkg'
+
+    - name: Upload to rolling
+      uses: ncipollo/release-action@v1.14.0
+      with:
+        allowUpdates: True
+        artifacts: 'SabreTools.Serialization/bin/Release/*.nupkg'
+        body: 'Last built commit: ${{ github.sha }}'
+        name: 'Rolling Release'
+        prerelease: True
+        replacesArtifacts: True
+        tag: "rolling"
+        updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -0,0 +1,17 @@
+name: Build PR
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+      
+    - name: Build
+      run: dotnet build

AttractMode.cs

@@ -1,14 +0,0 @@
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// Separated value serializer/deserializer for AttractMode romlists
-    /// </summary>
-    public static class AttractMode
-    {
-        public const string HeaderWithoutRomname = "#Name;Title;Emulator;CloneOf;Year;Manufacturer;Category;Players;Rotation;Control;Status;DisplayCount;DisplayType;AltRomname;AltTitle;Extra;Buttons";
-        public const int HeaderWithoutRomnameCount = 17;
-
-        public const string HeaderWithRomname = "#Romname;Title;Emulator;Cloneof;Year;Manufacturer;Category;Players;Rotation;Control;Status;DisplayCount;DisplayType;AltRomname;AltTitle;Extra;Buttons;Favourite;Tags;PlayedCount;PlayedTime;FileIsAvailable";
-        public const int HeaderWithRomnameCount = 22;
-    }
-}

Bytes/AACS.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.AACS;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class AACS : IByteSerializer<MediaKeyBlock>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MediaKeyBlock Deserialize(byte[] data, int offset)
-#else
-        public MediaKeyBlock? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.AACS().Deserialize(dataStream);
-        }
-    }
-}

Bytes/BDPlus.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.BDPlus;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class BDPlus : IByteSerializer<SVM>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public SVM Deserialize(byte[] data, int offset)
-#else
-        public SVM? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.BDPlus().Deserialize(dataStream);
-        }
-    }
-}

Bytes/BFPK.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.BFPK;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class BFPK : IByteSerializer<Archive>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Archive Deserialize(byte[] data, int offset)
-#else
-        public Archive? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.BFPK().Deserialize(dataStream);
-        }
-    }
-}

Bytes/BSP.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class BSP : IByteSerializer<Models.BSP.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.BSP.File Deserialize(byte[] data, int offset)
-#else
-        public Models.BSP.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.BSP().Deserialize(dataStream);
-        }
-    }
-}

Bytes/CFB.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.CFB;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class CFB : IByteSerializer<Binary>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Binary Deserialize(byte[] data, int offset)
-#else
-        public Binary? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.CFB().Deserialize(dataStream);
-        }
-    }
-}

Bytes/CIA.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class CIA : IByteSerializer<Models.N3DS.CIA>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.N3DS.CIA Deserialize(byte[] data, int offset)
-#else
-        public Models.N3DS.CIA? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.CIA().Deserialize(dataStream);
-        }
-    }
-}

Bytes/GCF.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class GCF : IByteSerializer<Models.GCF.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.GCF.File Deserialize(byte[] data, int offset)
-#else
-        public Models.GCF.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.GCF().Deserialize(dataStream);
-        }
-    }
-}

Bytes/InstallShieldCabinet.Deserializer.cs

@@ -1,30 +0,0 @@
-using System.IO;
-using SabreTools.Models.InstallShieldCabinet;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    // TODO: Add multi-cabinet reading
-    public partial class InstallShieldCabinet : IByteSerializer<Cabinet>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Cabinet Deserialize(byte[] data, int offset)
-#else
-        public Cabinet? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.InstallShieldCabinet().Deserialize(dataStream);
-        }
-    }
-}

Bytes/LinearExecutable.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.LinearExecutable;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class LinearExecutable : IByteSerializer<Executable>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Executable Deserialize(byte[] data, int offset)
-#else
-        public Executable? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.LinearExecutable().Deserialize(dataStream);
-        }
-    }
-}

Bytes/MSDOS.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.MSDOS;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class MSDOS : IByteSerializer<Executable>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Executable Deserialize(byte[] data, int offset)
-#else
-        public Executable? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.MSDOS().Deserialize(dataStream);
-        }
-    }
-}

Bytes/MicrosoftCabinet.Deserializer.cs

@@ -1,30 +0,0 @@
-using System.IO;
-using SabreTools.Models.MicrosoftCabinet;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    // TODO: Add multi-cabinet reading
-    public partial class MicrosoftCabinet : IByteSerializer<Cabinet>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Cabinet Deserialize(byte[] data, int offset)
-#else
-        public Cabinet? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.MicrosoftCabinet().Deserialize(dataStream);
-        }
-    }
-}

Bytes/MoPaQ.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.MoPaQ;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class MoPaQ : IByteSerializer<Archive>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Archive Deserialize(byte[] data, int offset)
-#else
-        public Archive? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.MoPaQ().Deserialize(dataStream);
-        }
-    }
-}

Bytes/N3DS.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.N3DS;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class N3DS : IByteSerializer<Cart>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Cart Deserialize(byte[] data, int offset)
-#else
-        public Cart? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.N3DS().Deserialize(dataStream);
-        }
-    }
-}

Bytes/NCF.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class NCF : IByteSerializer<Models.NCF.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.NCF.File Deserialize(byte[] data, int offset)
-#else
-        public Models.NCF.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.NCF().Deserialize(dataStream);
-        }
-    }
-}

Bytes/NewExecutable.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.NewExecutable;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class NewExecutable : IByteSerializer<Executable>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Executable Deserialize(byte[] data, int offset)
-#else
-        public Executable? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.NewExecutable().Deserialize(dataStream);
-        }
-    }
-}

Bytes/Nitro.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.Nitro;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class Nitro : IByteSerializer<Cart>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Cart Deserialize(byte[] data, int offset)
-#else
-        public Cart? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.Nitro().Deserialize(dataStream);
-        }
-    }
-}

Bytes/PAK.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class PAK : IByteSerializer<Models.PAK.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.PAK.File Deserialize(byte[] data, int offset)
-#else
-        public Models.PAK.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.PAK().Deserialize(dataStream);
-        }
-    }
-}

Bytes/PFF.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.PFF;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class PFF : IByteSerializer<Archive>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Archive Deserialize(byte[] data, int offset)
-#else
-        public Archive? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.PFF().Deserialize(dataStream);
-        }
-    }
-}

Bytes/PlayJAudio.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.PlayJ;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class PlayJAudio : IByteSerializer<AudioFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public AudioFile Deserialize(byte[] data, int offset)
-#else
-        public AudioFile? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.PlayJAudio().Deserialize(dataStream);
-        }
-    }
-}

Bytes/PlayJPlaylist.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.PlayJ;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class PlayJPlaylist : IByteSerializer<Playlist>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Playlist Deserialize(byte[] data, int offset)
-#else
-        public Playlist? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.PlayJPlaylist().Deserialize(dataStream);
-        }
-    }
-}

Bytes/PortableExecutable.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.PortableExecutable;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class PortableExecutable : IByteSerializer<Executable>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Executable Deserialize(byte[] data, int offset)
-#else
-        public Executable? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.PortableExecutable().Deserialize(dataStream);
-        }
-    }
-}

Bytes/Quantum.Deserializer.cs

@@ -1,29 +0,0 @@
-using System.IO;
-using SabreTools.Models.Quantum;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class Quantum : IByteSerializer<Archive>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Archive Deserialize(byte[] data, int offset)
-#else
-        public Archive? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.Quantum().Deserialize(dataStream);
-        }
-    }
-}

Bytes/SGA.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class SGA : IByteSerializer<Models.SGA.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.SGA.File Deserialize(byte[] data, int offset)
-#else
-        public Models.SGA.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.SGA().Deserialize(dataStream);
-        }
-    }
-}

Bytes/VBSP.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class VBSP : IByteSerializer<Models.VBSP.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.VBSP.File Deserialize(byte[] data, int offset)
-#else
-        public Models.VBSP.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.VBSP().Deserialize(dataStream);
-        }
-    }
-}

Bytes/VPK.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class VPK : IByteSerializer<Models.VPK.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.VPK.File Deserialize(byte[] data, int offset)
-#else
-        public Models.VPK.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.VPK().Deserialize(dataStream);
-        }
-    }
-}

Bytes/WAD.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class WAD : IByteSerializer<Models.WAD.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.WAD.File Deserialize(byte[] data, int offset)
-#else
-        public Models.WAD.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.WAD().Deserialize(dataStream);
-        }
-    }
-}

Bytes/XCP.Deserializer.cs

@@ -1,28 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Bytes
-{
-    public partial class XZP : IByteSerializer<Models.XZP.File>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.XZP.File Deserialize(byte[] data, int offset)
-#else
-        public Models.XZP.File? Deserialize(byte[]? data, int offset)
-#endif
-        {
-            // If the data is invalid
-            if (data == null)
-                return null;
-
-            // If the offset is out of bounds
-            if (offset < 0 || offset >= data.Length)
-                return null;
-
-            // Create a memory stream and parse that
-            MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
-            return new Streams.XZP().Deserialize(dataStream);
-        }
-    }
-}

Enums.cs

@@ -1,13 +0,0 @@
-namespace SabreTools.Serialization
-{
-    public enum Hash
-    {
-        CRC,
-        MD5,
-        SHA1,
-        SHA256,
-        SHA384,
-        SHA512,
-        SpamSum,
-    }
-}

Files/ArchiveDotOrg.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class ArchiveDotOrg : XmlFile<Models.ArchiveDotOrg.Files>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/ArchiveDotOrg.Serializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class ArchiveDotOrg : XmlFile<Models.ArchiveDotOrg.Files>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/AttractMode.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.AttractMode;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class AttractMode : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path)
-#else
-        public MetadataFile? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.AttractMode().Deserialize(stream);
-            }
-        }
-    }
-}

Files/AttractMode.Serializer.cs

@@ -1,32 +0,0 @@
-using System.IO;
-using SabreTools.Models.AttractMode;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class AttractMode : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path)
-#else
-        public bool Serialize(MetadataFile? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.AttractMode().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/ClrMamePro.Deserializer.cs

@@ -1,28 +0,0 @@
-using SabreTools.Models.ClrMamePro;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class ClrMamePro : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path) => Deserialize(path, true);
-#else
-        public MetadataFile? Deserialize(string? path) => Deserialize(path, true);
-#endif
-
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path, bool quotes)
-#else
-        public MetadataFile? Deserialize(string? path, bool quotes)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.ClrMamePro().Deserialize(stream, quotes);
-            }
-        }
-    }
-}

Files/ClrMamePro.Serializer.cs

@@ -1,39 +0,0 @@
-using System.IO;
-using SabreTools.Models.ClrMamePro;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class ClrMamePro : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path) => Serialize(obj, path, true);
-#else
-        public bool Serialize(MetadataFile? obj, string? path) => Serialize(obj, path, true);
-#endif
-
-        /// <inheritdoc cref="Serialize(MetadataFile, string)"/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path, bool quotes)
-#else
-        public bool Serialize(MetadataFile? obj, string? path, bool quotes)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.ClrMamePro().Serialize(obj, quotes))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/CueSheet.Serializer.cs

@@ -1,31 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class CueSheet : IFileSerializer<Models.CueSheets.CueSheet>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(Models.CueSheets.CueSheet obj, string path)
-#else
-        public bool Serialize(Models.CueSheets.CueSheet? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.CueSheet().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/DosCenter.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.DosCenter;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class DosCenter : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path)
-#else
-        public MetadataFile? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.DosCenter().Deserialize(stream);
-            }
-        }
-    }
-}

Files/DosCenter.Serializer.cs

@@ -1,31 +0,0 @@
-using SabreTools.Models.DosCenter;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class DosCenter : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path)
-#else
-        public bool Serialize(MetadataFile? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.DosCenter().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/EverdriveSMDB.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.EverdriveSMDB;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class EverdriveSMDB : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path)
-#else
-        public MetadataFile? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.EverdriveSMDB().Deserialize(stream);
-            }
-        }
-    }
-}

Files/EverdriveSMDB.Serializer.cs

@@ -1,31 +0,0 @@
-using SabreTools.Models.EverdriveSMDB;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class EverdriveSMDB : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path)
-#else
-        public bool Serialize(MetadataFile? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.EverdriveSMDB().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/Hashfile.Deserializer.cs

@@ -1,27 +0,0 @@
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class Hashfile : IFileSerializer<Models.Hashfile.Hashfile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public Models.Hashfile.Hashfile Deserialize(string path) => Deserialize(path, Hash.CRC);
-#else
-        public Models.Hashfile.Hashfile? Deserialize(string? path) => Deserialize(path, Hash.CRC);
-#endif
-
-        /// <inheritdoc/>
-#if NET48
-        public Models.Hashfile.Hashfile Deserialize(string path, Hash hash)
-#else
-        public Models.Hashfile.Hashfile? Deserialize(string? path, Hash hash)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.Hashfile().Deserialize(stream, hash);
-            }
-        }
-    }
-}

Files/Hashfile.Serializer.cs

@@ -1,37 +0,0 @@
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class Hashfile : IFileSerializer<Models.Hashfile.Hashfile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(Models.Hashfile.Hashfile obj, string path) => Serialize(obj, path, Hash.CRC);
-#else
-        public bool Serialize(Models.Hashfile.Hashfile? obj, string? path) => Serialize(obj, path, Hash.CRC);
-#endif
-
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(Models.Hashfile.Hashfile obj, string path, Hash hash)
-#else
-        public bool Serialize(Models.Hashfile.Hashfile? obj, string? path, Hash hash)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.Hashfile().Serialize(obj, hash))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/Listrom.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.Listrom;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class Listrom : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path)
-#else
-        public MetadataFile? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.Listrom().Deserialize(stream);
-            }
-        }
-    }
-}

Files/Listrom.Serializer.cs

@@ -1,31 +0,0 @@
-using SabreTools.Models.Listrom;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class Listrom : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path)
-#else
-        public bool Serialize(MetadataFile? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.Listrom().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/Listxml.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class Listxml : XmlFile<Models.Listxml.Mame>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/Listxml.Serializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class Listxml : XmlFile<Models.Listxml.Mame>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/Logiqx.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class Logiqx : XmlFile<Models.Logiqx.Datafile>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/Logiqx.Serializer.cs

@@ -1,11 +0,0 @@
-using SabreTools.Models.Logiqx;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class Logiqx : XmlFile<Datafile>
-    {
-        /// <inheritdoc cref="Serialize(Datafile, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(Datafile obj, string path)
-            => Serialize(obj, path, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId);
-    }
-}

Files/M1.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class M1 : XmlFile<Models.Listxml.M1>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/M1.Serializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class M1 : XmlFile<Models.Listxml.M1>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/OfflineList.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class OfflineList : XmlFile<Models.OfflineList.Dat>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/OfflineList.Serializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class OfflineList : XmlFile<Models.OfflineList.Dat>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/OpenMSX.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class OpenMSX : XmlFile<Models.OpenMSX.SoftwareDb>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/OpenMSX.Serializer.cs

@@ -1,11 +0,0 @@
-using SabreTools.Models.OpenMSX;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class OpenMSX : XmlFile<SoftwareDb>
-    {
-        /// <inheritdoc cref="Serialize(SoftwareDb, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(SoftwareDb obj, string path)
-            => Serialize(obj, path, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId);
-    }
-}

Files/PIC.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.PIC;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class PIC : IFileSerializer<DiscInformation>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public DiscInformation Deserialize(string path)
-#else
-        public DiscInformation? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.PIC().Deserialize(stream);
-            }
-        }
-    }
-}

Files/PIC.Serializer.cs

@@ -1,31 +0,0 @@
-using SabreTools.Models.PIC;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class PIC : IFileSerializer<DiscInformation>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(DiscInformation obj, string path)
-#else
-        public bool Serialize(DiscInformation? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.PIC().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/RomCenter.Deserializer.cs

@@ -1,21 +0,0 @@
-using SabreTools.Models.RomCenter;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class RomCenter : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path)
-#else
-        public MetadataFile? Deserialize(string? path)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.RomCenter().Deserialize(stream);
-            }
-        }
-    }
-}

Files/RomCenter.Serializer.cs

@@ -1,31 +0,0 @@
-using SabreTools.Models.RomCenter;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class RomCenter : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path)
-#else
-        public bool Serialize(MetadataFile? obj, string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.RomCenter().Serialize(obj))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/SeparatedValue.Deserializer.cs

@@ -1,28 +0,0 @@
-using SabreTools.Models.SeparatedValue;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class SeparatedValue : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path) => Deserialize(path, ',');
-#else
-        public MetadataFile? Deserialize(string? path) => Deserialize(path, ',');
-#endif
-
-        /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(string path, char delim)
-#else
-        public MetadataFile? Deserialize(string? path, char delim)
-#endif
-        {
-            using (var stream = PathProcessor.OpenStream(path))
-            {
-                return new Streams.SeparatedValue().Deserialize(stream, delim);
-            }
-        }
-    }
-}

Files/SeparatedValue.Serializer.cs

@@ -1,38 +0,0 @@
-using SabreTools.Models.SeparatedValue;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class SeparatedValue : IFileSerializer<MetadataFile>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path) => Serialize(obj, path, ',');
-#else
-        public bool Serialize(MetadataFile? obj, string? path) => Serialize(obj, path, ',');
-#endif
-
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(MetadataFile obj, string path, char delim)
-#else
-        public bool Serialize(MetadataFile? obj, string? path, char delim)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.SeparatedValue().Serialize(obj, delim))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = System.IO.File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                    return true;
-                }
-            }
-        }
-    }
-}

Files/SoftwareList.Deserializer.cs

@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class SoftwareList : XmlFile<Models.SoftwareList.SoftwareList>
-    {
-        // All serialization logic is in the base class
-    }
-}

Files/SoftwareList.Serializer.cs

@@ -1,9 +0,0 @@
-namespace SabreTools.Serialization.Files
-{
-    public partial class SoftwareList : XmlFile<Models.SoftwareList.SoftwareList>
-    {
-        /// <inheritdoc cref="SerializeToFile(Models.SoftwareList.SoftwareList, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(Models.SoftwareList.SoftwareList obj, string path)
-            => Serialize(obj, path, Serialization.SoftawreList.DocTypeName, Serialization.SoftawreList.DocTypePubId, Serialization.SoftawreList.DocTypeSysId, Serialization.SoftawreList.DocTypeSysId);
-    }
-}

Files/XMID.Deserializer.cs

@@ -1,216 +0,0 @@
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class XMID : IFileSerializer<Models.Xbox.XMID>
-    {
-        /// <inheritdoc/>
-        /// <remarks>This treats the input path like a parseable string</remarks>
-#if NET48
-        public Models.Xbox.XMID Deserialize(string path)
-#else
-        public Models.Xbox.XMID? Deserialize(string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return null;
-
-            string xmid = path.TrimEnd('\0');
-            if (string.IsNullOrWhiteSpace(xmid))
-                return null;
-
-            return ParseXMID(xmid);
-        }
-
-        /// <summary>
-        /// Parse an XGD2/3 XMID string
-        /// </summary>
-        /// <param name="xmidString">XMID string to attempt to parse</param>
-        /// <returns>Filled XMID on success, null on error</returns>
-#if NET48
-        private static Models.Xbox.XMID ParseXMID(string xmidString)
-#else
-        private static Models.Xbox.XMID? ParseXMID(string? xmidString)
-#endif
-        {
-            if (xmidString == null || xmidString.Length != 8)
-                return null;
-
-            var xmid = new Models.Xbox.XMID();
-
-            xmid.PublisherIdentifier = xmidString.Substring(0, 2);
-            if (string.IsNullOrEmpty(PublisherName(xmid)))
-                return null;
-
-            xmid.GameID = xmidString.Substring(2, 3);
-            xmid.VersionNumber = xmidString.Substring(5, 2);
-            xmid.RegionIdentifier = xmidString[7];
-            if (InternalRegion(xmid) == null)
-                return null;
-
-            return xmid;
-        }
-
-        #region Helpers
-
-        /// <summary>
-        /// Human-readable name derived from the publisher identifier
-        /// </summary>
-#if NET48
-        public static string PublisherName(Models.Xbox.XMID xmid) => GetPublisher(xmid.PublisherIdentifier);
-#else
-        public static string? PublisherName(Models.Xbox.XMID xmid) => GetPublisher(xmid.PublisherIdentifier);
-#endif
-
-        /// <summary>
-        /// Internally represented region
-        /// </summary>
-#if NET48
-        public static string InternalRegion(Models.Xbox.XMID xmid) => GetRegion(xmid.RegionIdentifier);
-#else
-        public static string? InternalRegion(Models.Xbox.XMID xmid) => GetRegion(xmid.RegionIdentifier);
-#endif
-
-        /// <summary>
-        /// Get the full name of the publisher from the 2-character identifier
-        /// </summary>
-        /// <param name="publisherIdentifier">Case-sensitive 2-character identifier</param>
-        /// <returns>Publisher name, if possible</returns>
-        /// <see cref="https://xboxdevwiki.net/Xbe#Title_ID"/>
-#if NET48
-        private static string GetPublisher(string publisherIdentifier)
-#else
-        private static string? GetPublisher(string? publisherIdentifier)
-#endif
-        {
-            switch (publisherIdentifier)
-            {
-                case "AC": return "Acclaim Entertainment";
-                case "AH": return "ARUSH Entertainment";
-                case "AQ": return "Aqua System";
-                case "AS": return "ASK";
-                case "AT": return "Atlus";
-                case "AV": return "Activision";
-                case "AY": return "Aspyr Media";
-                case "BA": return "Bandai";
-                case "BL": return "Black Box";
-                case "BM": return "BAM! Entertainment";
-                case "BR": return "Broccoli Co.";
-                case "BS": return "Bethesda Softworks";
-                case "BU": return "Bunkasha Co.";
-                case "BV": return "Buena Vista Games";
-                case "BW": return "BBC Multimedia";
-                case "BZ": return "Blizzard";
-                case "CC": return "Capcom";
-                case "CK": return "Kemco Corporation"; // TODO: Confirm
-                case "CM": return "Codemasters";
-                case "CV": return "Crave Entertainment";
-                case "DC": return "DreamCatcher Interactive";
-                case "DX": return "Davilex";
-                case "EA": return "Electronic Arts (EA)";
-                case "EC": return "Encore inc";
-                case "EL": return "Enlight Software";
-                case "EM": return "Empire Interactive";
-                case "ES": return "Eidos Interactive";
-                case "FI": return "Fox Interactive";
-                case "FS": return "From Software";
-                case "GE": return "Genki Co.";
-                case "GV": return "Groove Games";
-                case "HE": return "Tru Blu (Entertainment division of Home Entertainment Suppliers)";
-                case "HP": return "Hip games";
-                case "HU": return "Hudson Soft";
-                case "HW": return "Highwaystar";
-                case "IA": return "Mad Catz Interactive";
-                case "IF": return "Idea Factory";
-                case "IG": return "Infogrames";
-                case "IL": return "Interlex Corporation";
-                case "IM": return "Imagine Media";
-                case "IO": return "Ignition Entertainment";
-                case "IP": return "Interplay Entertainment";
-                case "IX": return "InXile Entertainment"; // TODO: Confirm
-                case "JA": return "Jaleco";
-                case "JW": return "JoWooD";
-                case "KB": return "Kemco"; // TODO: Confirm
-                case "KI": return "Kids Station Inc."; // TODO: Confirm
-                case "KN": return "Konami";
-                case "KO": return "KOEI";
-                case "KU": return "Kobi and / or GAE (formerly Global A Entertainment)"; // TODO: Confirm
-                case "LA": return "LucasArts";
-                case "LS": return "Black Bean Games (publishing arm of Leader S.p.A.)";
-                case "MD": return "Metro3D";
-                case "ME": return "Medix";
-                case "MI": return "Microïds";
-                case "MJ": return "Majesco Entertainment";
-                case "MM": return "Myelin Media";
-                case "MP": return "MediaQuest"; // TODO: Confirm
-                case "MS": return "Microsoft Game Studios";
-                case "MW": return "Midway Games";
-                case "MX": return "Empire Interactive"; // TODO: Confirm
-                case "NK": return "NewKidCo";
-                case "NL": return "NovaLogic";
-                case "NM": return "Namco";
-                case "OX": return "Oxygen Interactive";
-                case "PC": return "Playlogic Entertainment";
-                case "PL": return "Phantagram Co., Ltd.";
-                case "RA": return "Rage";
-                case "SA": return "Sammy";
-                case "SC": return "SCi Games";
-                case "SE": return "SEGA";
-                case "SN": return "SNK";
-                case "SS": return "Simon & Schuster";
-                case "SU": return "Success Corporation";
-                case "SW": return "Swing! Deutschland";
-                case "TA": return "Takara";
-                case "TC": return "Tecmo";
-                case "TD": return "The 3DO Company (or just 3DO)";
-                case "TK": return "Takuyo";
-                case "TM": return "TDK Mediactive";
-                case "TQ": return "THQ";
-                case "TS": return "Titus Interactive";
-                case "TT": return "Take-Two Interactive Software";
-                case "US": return "Ubisoft";
-                case "VC": return "Victor Interactive Software";
-                case "VN": return "Vivendi Universal (just took Interplays publishing rights)"; // TODO: Confirm
-                case "VU": return "Vivendi Universal Games";
-                case "VV": return "Vivendi Universal Games"; // TODO: Confirm
-                case "WE": return "Wanadoo Edition";
-                case "WR": return "Warner Bros. Interactive Entertainment"; // TODO: Confirm
-                case "XI": return "XPEC Entertainment and Idea Factory";
-                case "XK": return "Xbox kiosk disk?"; // TODO: Confirm
-                case "XL": return "Xbox special bundled or live demo disk?"; // TODO: Confirm
-                case "XM": return "Evolved Games"; // TODO: Confirm
-                case "XP": return "XPEC Entertainment";
-                case "XR": return "Panorama";
-                case "YB": return "YBM Sisa (South-Korea)";
-                case "ZD": return "Zushi Games (formerly Zoo Digital Publishing)";
-                default: return null;
-            }
-        }
-
-        /// <summary>
-        /// Determine the region based on the XGD serial character
-        /// </summary>
-        /// <param name="region">Character denoting the region</param>
-        /// <returns>Region, if possible</returns>
-#if NET48
-        private static string GetRegion(char region)
-#else
-        private static string? GetRegion(char region)
-#endif
-        {
-            switch (region)
-            {
-                case 'W': return "World";
-                case 'A': return "USA";
-                case 'J': return "Japan / Asia";
-                case 'E': return "Europe";
-                case 'K': return "USA / Japan";
-                case 'L': return "USA / Europe";
-                case 'H': return "Japan / Europe";
-                default: return null;
-            }
-        }
-
-        #endregion
-    }
-}

Files/XMID.Serializer.cs

@@ -1,15 +0,0 @@
-using System;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class XMID : IFileSerializer<Models.Xbox.XMID>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(Models.Xbox.XMID obj, string path) => throw new NotImplementedException();
-#else
-        public bool Serialize(Models.Xbox.XMID? obj, string? path) => throw new NotImplementedException();
-#endif
-    }
-}

Files/XeMID.Deserializer.cs

@@ -1,275 +0,0 @@
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class XeMID : IFileSerializer<Models.Xbox.XeMID>
-    {
-        /// <inheritdoc/>
-        /// <remarks>This treats the input path like a parseable string</remarks>
-#if NET48
-        public Models.Xbox.XeMID Deserialize(string path)
-#else
-        public Models.Xbox.XeMID? Deserialize(string? path)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return null;
-
-            string xemid = path.TrimEnd('\0');
-            if (string.IsNullOrWhiteSpace(xemid))
-                return null;
-
-            return ParseXeMID(xemid);
-        }
-
-        /// <summary>
-        /// Parse an XGD2/3 XeMID string
-        /// </summary>
-        /// <param name="xemidString">XeMID string to attempt to parse</param>
-        /// <returns>Filled XeMID on success, null on error</returns>
-#if NET48
-        private static Models.Xbox.XeMID ParseXeMID(string xemidString)
-#else
-        private static Models.Xbox.XeMID? ParseXeMID(string? xemidString)
-#endif
-        {
-            if (xemidString == null
-                || (xemidString.Length != 13 && xemidString.Length != 14
-                    && xemidString.Length != 21 && xemidString.Length != 22))
-                return null;
-
-            var xemid = new Models.Xbox.XeMID();
-
-            xemid.PublisherIdentifier = xemidString.Substring(0, 2);
-            if (string.IsNullOrEmpty(PublisherName(xemid)))
-                return null;
-
-            xemid.PlatformIdentifier = xemidString[2];
-            if (xemid.PlatformIdentifier != '2')
-                return null;
-
-            xemid.GameID = xemidString.Substring(3, 3);
-            xemid.SKU = xemidString.Substring(6, 2);
-            xemid.RegionIdentifier = xemidString[8];
-            if (InternalRegion(xemid) == null)
-                return null;
-
-            if (xemidString.Length == 13 || xemidString.Length == 21)
-            {
-                xemid.BaseVersion = xemidString.Substring(9, 1);
-                xemid.MediaSubtypeIdentifier = xemidString[10];
-                if (string.IsNullOrEmpty(MediaSubtype(xemid)))
-                    return null;
-
-                xemid.DiscNumberIdentifier = xemidString.Substring(11, 2);
-            }
-            else if (xemidString.Length == 14 || xemidString.Length == 22)
-            {
-                xemid.BaseVersion = xemidString.Substring(9, 2);
-                xemid.MediaSubtypeIdentifier = xemidString[11];
-                if (string.IsNullOrEmpty(MediaSubtype(xemid)))
-                    return null;
-
-                xemid.DiscNumberIdentifier = xemidString.Substring(12, 2);
-            }
-
-            if (xemidString.Length == 21)
-                xemid.CertificationSubmissionIdentifier = xemidString.Substring(13);
-            else if (xemidString.Length == 22)
-                xemid.CertificationSubmissionIdentifier = xemidString.Substring(14);
-
-            return xemid;
-        }
-
-        #region Helpers
-
-        /// <summary>
-        /// Human-readable name derived from the publisher identifier
-        /// </summary>
-#if NET48
-        public static string PublisherName(Models.Xbox.XeMID xemid) => GetPublisher(xemid.PublisherIdentifier);
-#else
-        public static string? PublisherName(Models.Xbox.XeMID xemid) => GetPublisher(xemid.PublisherIdentifier);
-#endif
-
-        /// <summary>
-        /// Internally represented region
-        /// </summary>
-#if NET48
-        public static string InternalRegion(Models.Xbox.XeMID xemid) => GetRegion(xemid.RegionIdentifier);
-#else
-        public static string? InternalRegion(Models.Xbox.XeMID xemid) => GetRegion(xemid.RegionIdentifier);
-#endif
-
-        /// <summary>
-        /// Human-readable subtype derived from the media identifier
-        /// </summary>
-#if NET48
-        public static string MediaSubtype(Models.Xbox.XeMID xemid) => GetMediaSubtype(xemid.MediaSubtypeIdentifier);
-#else
-        public static string? MediaSubtype(Models.Xbox.XeMID xemid) => GetMediaSubtype(xemid.MediaSubtypeIdentifier);
-#endif
-
-        /// <summary>
-        /// Determine the XGD type based on the XGD2/3 media type identifier character
-        /// </summary>
-        /// <param name="mediaTypeIdentifier">Character denoting the media type</param>
-        /// <returns>Media subtype as a string, if possible</returns>
-#if NET48
-        private static string GetMediaSubtype(char mediaTypeIdentifier)
-#else
-        private static string? GetMediaSubtype(char mediaTypeIdentifier)
-#endif
-        {
-            switch (mediaTypeIdentifier)
-            {
-                case 'F': return "XGD3";
-                case 'X': return "XGD2";
-                case 'Z': return "Games on Demand / Marketplace Demo";
-                default: return null;
-            }
-        }
-
-        /// <summary>
-        /// Get the full name of the publisher from the 2-character identifier
-        /// </summary>
-        /// <param name="publisherIdentifier">Case-sensitive 2-character identifier</param>
-        /// <returns>Publisher name, if possible</returns>
-        /// <see cref="https://xboxdevwiki.net/Xbe#Title_ID"/>
-#if NET48
-        private static string GetPublisher(string publisherIdentifier)
-#else
-        private static string? GetPublisher(string? publisherIdentifier)
-#endif
-        {
-            switch (publisherIdentifier)
-            {
-                case "AC": return "Acclaim Entertainment";
-                case "AH": return "ARUSH Entertainment";
-                case "AQ": return "Aqua System";
-                case "AS": return "ASK";
-                case "AT": return "Atlus";
-                case "AV": return "Activision";
-                case "AY": return "Aspyr Media";
-                case "BA": return "Bandai";
-                case "BL": return "Black Box";
-                case "BM": return "BAM! Entertainment";
-                case "BR": return "Broccoli Co.";
-                case "BS": return "Bethesda Softworks";
-                case "BU": return "Bunkasha Co.";
-                case "BV": return "Buena Vista Games";
-                case "BW": return "BBC Multimedia";
-                case "BZ": return "Blizzard";
-                case "CC": return "Capcom";
-                case "CK": return "Kemco Corporation"; // TODO: Confirm
-                case "CM": return "Codemasters";
-                case "CV": return "Crave Entertainment";
-                case "DC": return "DreamCatcher Interactive";
-                case "DX": return "Davilex";
-                case "EA": return "Electronic Arts (EA)";
-                case "EC": return "Encore inc";
-                case "EL": return "Enlight Software";
-                case "EM": return "Empire Interactive";
-                case "ES": return "Eidos Interactive";
-                case "FI": return "Fox Interactive";
-                case "FS": return "From Software";
-                case "GE": return "Genki Co.";
-                case "GV": return "Groove Games";
-                case "HE": return "Tru Blu (Entertainment division of Home Entertainment Suppliers)";
-                case "HP": return "Hip games";
-                case "HU": return "Hudson Soft";
-                case "HW": return "Highwaystar";
-                case "IA": return "Mad Catz Interactive";
-                case "IF": return "Idea Factory";
-                case "IG": return "Infogrames";
-                case "IL": return "Interlex Corporation";
-                case "IM": return "Imagine Media";
-                case "IO": return "Ignition Entertainment";
-                case "IP": return "Interplay Entertainment";
-                case "IX": return "InXile Entertainment"; // TODO: Confirm
-                case "JA": return "Jaleco";
-                case "JW": return "JoWooD";
-                case "KB": return "Kemco"; // TODO: Confirm
-                case "KI": return "Kids Station Inc."; // TODO: Confirm
-                case "KN": return "Konami";
-                case "KO": return "KOEI";
-                case "KU": return "Kobi and / or GAE (formerly Global A Entertainment)"; // TODO: Confirm
-                case "LA": return "LucasArts";
-                case "LS": return "Black Bean Games (publishing arm of Leader S.p.A.)";
-                case "MD": return "Metro3D";
-                case "ME": return "Medix";
-                case "MI": return "Microïds";
-                case "MJ": return "Majesco Entertainment";
-                case "MM": return "Myelin Media";
-                case "MP": return "MediaQuest"; // TODO: Confirm
-                case "MS": return "Microsoft Game Studios";
-                case "MW": return "Midway Games";
-                case "MX": return "Empire Interactive"; // TODO: Confirm
-                case "NK": return "NewKidCo";
-                case "NL": return "NovaLogic";
-                case "NM": return "Namco";
-                case "OX": return "Oxygen Interactive";
-                case "PC": return "Playlogic Entertainment";
-                case "PL": return "Phantagram Co., Ltd.";
-                case "RA": return "Rage";
-                case "SA": return "Sammy";
-                case "SC": return "SCi Games";
-                case "SE": return "SEGA";
-                case "SN": return "SNK";
-                case "SS": return "Simon & Schuster";
-                case "SU": return "Success Corporation";
-                case "SW": return "Swing! Deutschland";
-                case "TA": return "Takara";
-                case "TC": return "Tecmo";
-                case "TD": return "The 3DO Company (or just 3DO)";
-                case "TK": return "Takuyo";
-                case "TM": return "TDK Mediactive";
-                case "TQ": return "THQ";
-                case "TS": return "Titus Interactive";
-                case "TT": return "Take-Two Interactive Software";
-                case "US": return "Ubisoft";
-                case "VC": return "Victor Interactive Software";
-                case "VN": return "Vivendi Universal (just took Interplays publishing rights)"; // TODO: Confirm
-                case "VU": return "Vivendi Universal Games";
-                case "VV": return "Vivendi Universal Games"; // TODO: Confirm
-                case "WE": return "Wanadoo Edition";
-                case "WR": return "Warner Bros. Interactive Entertainment"; // TODO: Confirm
-                case "XI": return "XPEC Entertainment and Idea Factory";
-                case "XK": return "Xbox kiosk disk?"; // TODO: Confirm
-                case "XL": return "Xbox special bundled or live demo disk?"; // TODO: Confirm
-                case "XM": return "Evolved Games"; // TODO: Confirm
-                case "XP": return "XPEC Entertainment";
-                case "XR": return "Panorama";
-                case "YB": return "YBM Sisa (South-Korea)";
-                case "ZD": return "Zushi Games (formerly Zoo Digital Publishing)";
-                default: return null;
-            }
-        }
-
-        /// <summary>
-        /// Determine the region based on the XGD serial character
-        /// </summary>
-        /// <param name="region">Character denoting the region</param>
-        /// <returns>Region, if possible</returns>
-#if NET48
-        private static string GetRegion(char region)
-#else
-        private static string? GetRegion(char region)
-#endif
-        {
-            switch (region)
-            {
-                case 'W': return "World";
-                case 'A': return "USA";
-                case 'J': return "Japan / Asia";
-                case 'E': return "Europe";
-                case 'K': return "USA / Japan";
-                case 'L': return "USA / Europe";
-                case 'H': return "Japan / Europe";
-                default: return null;
-            }
-        }
-
-        #endregion
-    }
-}

Files/XeMID.Serializer.cs

@@ -1,15 +0,0 @@
-using System;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    public partial class XeMID : IFileSerializer<Models.Xbox.XeMID>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(Models.Xbox.XeMID obj, string path) => throw new NotImplementedException();
-#else
-        public bool Serialize(Models.Xbox.XeMID? obj, string? path) => throw new NotImplementedException();
-#endif
-    }
-}

Files/XmlFile.Deserializer.cs

@@ -1,24 +0,0 @@
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    /// <summary>
-    /// Base class for other XML serializers
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public partial class XmlFile<T> : IFileSerializer<T>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public T Deserialize(string path)
-#else
-        public T? Deserialize(string? path)
-#endif
-        {
-            using (var data = PathProcessor.OpenStream(path))
-            {
-                return new Streams.XmlFile<T>().Deserialize(data);
-            }
-        }
-    }
-}

Files/XmlFile.Serializer.cs

@@ -1,54 +0,0 @@
-using System.IO;
-using SabreTools.Serialization.Interfaces;
-
-namespace SabreTools.Serialization.Files
-{
-    /// <summary>
-    /// Base class for other XML serializers
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public partial class XmlFile<T> : IFileSerializer<T>
-    {
-        /// <inheritdoc/>
-#if NET48
-        public bool Serialize(T obj, string path)
-#else
-        public bool Serialize(T? obj, string? path)
-#endif
-            => Serialize(obj, path, null, null, null, null);
-
-        /// <summary>
-        /// Serializes the defined type to an XML file
-        /// </summary>
-        /// <param name="obj">Data to serialize</param>
-        /// <param name="path">Path to the file to serialize to</param>
-        /// <param name="obj">Data to serialize</param>
-        /// <param name="name">Optional DOCTYPE name</param>
-        /// <param name="pubid">Optional DOCTYPE pubid</param>
-        /// <param name="sysid">Optional DOCTYPE sysid</param>
-        /// <param name="subset">Optional DOCTYPE name</param>
-        /// <returns>True on successful serialization, false otherwise</returns>
-#if NET48
-        public bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
-#else
-        public bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
-#endif
-        {
-            if (string.IsNullOrWhiteSpace(path))
-                return false;
-
-            using (var stream = new Streams.XmlFile<T>().Serialize(obj, name, pubid, sysid, subset))
-            {
-                if (stream == null)
-                    return false;
-
-                using (var fs = File.OpenWrite(path))
-                {
-                    stream.CopyTo(fs);
-                }
-
-                return true;
-            }
-        }
-    }
-}

Interfaces/IFileSerializer.cs

@@ -1,33 +0,0 @@
-namespace SabreTools.Serialization.Interfaces
-{
-    /// <summary>
-    /// Defines how to serialize to and from files
-    /// </summary>
-    public interface IFileSerializer<T>
-    {
-        /// <summary>
-        /// Deserialize a file into <typeparamref name="T"/>
-        /// </summary>
-        /// <typeparam name="T">Type of object to deserialize to</typeparam>
-        /// <param name="path">Path to deserialize from</param>
-        /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        T Deserialize(string path);
-#else
-        T? Deserialize(string? path);
-#endif
-
-        /// <summary>
-        /// Sserialize a <typeparamref name="T"/> into a file
-        /// </summary>
-        /// <typeparam name="T">Type of object to serialize from</typeparam>
-        /// <param name="obj">Data to serialize</param>
-        /// <param name="path">Path to the file to serialize to</param>
-        /// <returns>True on successful serialization, false otherwise</returns>
-#if NET48
-        bool Serialize(T obj, string path);
-#else
-        bool Serialize(T? obj, string? path);
-#endif
-    }
-}

Interfaces/IStreamSerializer.cs

@@ -1,34 +0,0 @@
-using System.IO;
-
-namespace SabreTools.Serialization.Interfaces
-{
-    /// <summary>
-    /// Defines how to serialize to and from Streams
-    /// </summary>
-    public interface IStreamSerializer<T>
-    {
-        /// <summary>
-        /// Deserialize a Stream into <typeparamref name="T"/>
-        /// </summary>
-        /// <typeparam name="T">Type of object to deserialize to</typeparam>
-        /// <param name="data">Stream to parse</param>
-        /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        T Deserialize(Stream data);
-#else
-        T? Deserialize(Stream? data);
-#endif
-
-        /// <summary>
-        /// Serialize a <typeparamref name="T"/> into a Stream
-        /// </summary>
-        /// <typeparam name="T">Type of object to serialize from</typeparam>
-        /// <param name="obj">Data to serialize</param>
-        /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        Stream Serialize(T obj);
-#else
-        Stream? Serialize(T? obj);
-#endif
-    }
-}

Internal.cs

@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SabreTools.Models.Metadata;
-
-namespace SabreTools.Serialization
-{
-    public static class Internal
-    {
-        /// <summary>
-        /// Extract nested items from a Dump
-        /// </summary>
-#if NET48
-        public static DatItem[] ExtractItems(Dump item)
-#else
-        public static DatItem[]? ExtractItems(Dump? item)
-#endif
-        {
-            if (item == null)
-                return null;
-
-            var datItems = new List<DatItem>();
-
-            var rom = item.Read<Rom>(Dump.RomKey);
-            if (rom != null)
-                datItems.Add(rom);
-
-            var megaRom = item.Read<Rom>(Dump.MegaRomKey);
-            if (megaRom != null)
-                datItems.Add(megaRom);
-
-            var sccPlusCart = item.Read<Rom>(Dump.SCCPlusCartKey);
-            if (sccPlusCart != null)
-                datItems.Add(sccPlusCart);
-
-            return datItems.ToArray();
-        }
-
-        /// <summary>
-        /// Extract nested items from a Part
-        /// </summary>
-#if NET48
-        public static DatItem[] ExtractItems(Part item)
-#else
-        public static DatItem[]? ExtractItems(Part? item)
-#endif
-        {
-            if (item == null)
-                return null;
-
-            var datItems = new List<DatItem>();
-
-            var features = item.Read<Feature[]>(Part.FeatureKey);
-            if (features != null && features.Any())
-                datItems.AddRange(features);
-
-            var dataAreas = item.Read<DataArea[]>(Part.DataAreaKey);
-            if (dataAreas != null && dataAreas.Any())
-            {
-                datItems.AddRange(dataAreas
-                    .Where(d => d != null)
-                    .SelectMany(ExtractItems));
-            }
-
-            var diskAreas = item.Read<DiskArea[]>(Part.DiskAreaKey);
-            if (diskAreas != null && diskAreas.Any())
-            {
-                datItems.AddRange(diskAreas
-                    .Where(d => d != null)
-                    .SelectMany(ExtractItems));
-            }
-
-            var dipSwitches = item.Read<DipSwitch[]>(Part.DipSwitchKey);
-            if (dipSwitches != null && dipSwitches.Any())
-            {
-                datItems.AddRange(dipSwitches
-                    .Where(d => d != null));
-            }
-
-            return datItems.ToArray();
-        }
-
-        /// <summary>
-        /// Extract nested items from a DataArea
-        /// </summary>
-        private static Rom[] ExtractItems(DataArea item)
-        {
-            var roms = item.Read<Rom[]>(DataArea.RomKey);
-            if (roms == null || !roms.Any())
-                return Array.Empty<Rom>();
-
-            return roms.ToArray();
-        }
-
-        /// <summary>
-        /// Extract nested items from a DiskArea
-        /// </summary>
-        private static Disk[] ExtractItems(DiskArea item)
-        {
-            var roms = item.Read<Disk[]>(DiskArea.DiskKey);
-            if (roms == null || !roms.Any())
-                return Array.Empty<Disk>();
-
-            return roms.ToArray();
-        }
-    }
-}

Logiqx.cs

@@ -1,32 +0,0 @@
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// XML deserializer for Logiqx-derived metadata files
-    /// </summary>
-    public static class Logiqx
-    {
-        /// <summary>
-        /// name field for DOCTYPE
-        /// </summary>
-        public const string DocTypeName = "datafile";
-
-        /// <summary>
-        /// pubid field for DOCTYPE
-        /// </summary>
-        public const string DocTypePubId = "-//Logiqx//DTD ROM Management Datafile//EN";
-
-        /// <summary>
-        /// sysid field for DOCTYPE
-        /// </summary>
-        public const string DocTypeSysId = "http://www.logiqx.com/Dats/datafile.dtd";
-
-        /// <summary>
-        /// subset field for DOCTYPE
-        /// </summary>
-#if NET48
-        public const string DocTypeSubset = null;
-#else
-        public const string? DocTypeSubset = null;
-#endif
-    }
-}

OpenMSX.cs

@@ -1,36 +0,0 @@
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// XML deserializer for OpenMSX software database files
-    /// </summary>
-    public static class OpenMSX
-    {
-        /// <summary>
-        /// name field for DOCTYPE
-        /// </summary>
-        public const string DocTypeName = "softwaredb";
-
-        /// <summary>
-        /// pubid field for DOCTYPE
-        /// </summary>
-#if NET48
-        public const string DocTypePubId = null;
-#else
-        public const string? DocTypePubId = null;
-#endif
-
-        /// <summary>
-        /// sysid field for DOCTYPE
-        /// </summary>
-        public const string DocTypeSysId = "softwaredb1.dtd";
-
-        /// <summary>
-        /// subset field for DOCTYPE
-        /// </summary>
-#if NET48
-        public const string DocTypeSubset = null;
-#else
-        public const string? DocTypeSubset = null;
-#endif
-    }
-}

README.MD

@@ -4,22 +4,30 @@ This library comprises of serializers that both read and write from files and st
 
 Find the link to the Nuget package [here](https://www.nuget.org/packages/SabreTools.Serialization).
 
-## `SabreTools.Serialization.Bytes`
+## Interfaces
 
-This namespace comprises of deserializers that take byte arrays to convert into models.
+Below is a table representing the various interfaces that are implemented within this library.
 
-## `SabreTools.Serialization.CrossModel`
+| Interface Name | Source Type | Destination Type |
+| --- | --- | --- |
+| `IByteDeserializer` | `byte[]?` | Model |
+| `IByteSerializer` | Model | `byte[]?` |
+| `IFileDeserializer` | `string?` path | Model |
+| `IFileSerializer` | Model | `string?` path |
+| `IModelSerializer` | Model | Model |
+| `IStreamDeserializer` | `Stream?` | Model |
+| `IStreamSerializer` | Model | `Stream?` |
+| `IStringDeserializer` | `string?` representation | Model |
+| `IStringSerializer` | Model | `string?` representation |
+| `IWrapper` | N/A | N/A |
 
-This namespace comprises of serializers and deserializers that convert models to other common ones. This is mainly used for metadata files converting to and from a common, `Dictionary`-based model.
+## Namespaces
 
-## `SabreTools.Serialization.Files`
+Below is a table of all namespaces within the library and what they represent
 
-This namespace comprises of serializers and deserializers that can convert to and from files on disk. Most of the serializers are symmetric, but this is not guaranteed. Unimplemented methods will throw `NotImplementedException`.
-
-## `SabreTools.Serialization.Streams`
-
-This namespace comprises of serializers and deserializers that can convert to and from any type of stream. Most of the serializers are symmetric, but this is not guaranteed. Unimplemented methods will throw `NotImplementedException`.
-
-## `SabreTools.Serialization.Wrappers`
-
-This namespace comrpises of wrapping classes that include keeping a reference to the source of each serializable model. Some of the wrappers may also include what are referred to as "extension properties", which are generated properties derived from either parts of the model or the underlying source.
+| Namespace | Description |
+| --- | --- |
+| `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model |
+| `SabreTools.Serialization.Deserializers` | Convert from external sources to models |
+| `SabreTools.Serialization.Serializers` | Convert from models to external sources |
+| `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties |

SabreTools.Serialization.sln

@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", "SabreTools.Serialization.csproj", "{5B688801-5F36-483E-B2E8-F219BA5923A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", "SabreTools.Serialization\SabreTools.Serialization.csproj", "{5B688801-5F36-483E-B2E8-F219BA5923A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{F3DEE31A-4726-464C-A90C-C19D78F51898}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,5 +20,9 @@ Global
 		{5B688801-5F36-483E-B2E8-F219BA5923A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B688801-5F36-483E-B2E8-F219BA5923A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B688801-5F36-483E-B2E8-F219BA5923A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3DEE31A-4726-464C-A90C-C19D78F51898}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class ArchiveDotOrg : IModelSerializer<Models.ArchiveDotOrg.Files, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.ArchiveDotOrg.Files Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public Models.ArchiveDotOrg.Files? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -38,7 +34,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null)
-                return Array.Empty<File>();
+                return [];
 
             return roms
                 .Where(r => r != null)

SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs

@@ -6,15 +6,11 @@ namespace SabreTools.Serialization.CrossModel
     public partial class ArchiveDotOrg : IModelSerializer<Models.ArchiveDotOrg.Files, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Models.ArchiveDotOrg.Files item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Models.ArchiveDotOrg.Files? item)
-#endif
         {
             if (item == null)
                 return null;
-            
+
             var metadataFile = new Models.Metadata.MetadataFile
             {
                 [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
@@ -47,27 +43,21 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Metadata.Machine"/>
         /// </summary>
-#if NET48
-        private static Models.Metadata.Machine ConvertMachineToInternalModel(Models.ArchiveDotOrg.File item)
-#else
         private static Models.Metadata.Machine ConvertMachineToInternalModel(Models.ArchiveDotOrg.File? item)
-#endif
         {
-            var machine = new Models.Metadata.Machine
-            {
-                [Models.Metadata.Machine.RomKey] = ConvertToInternalModel(item),
-            };
+            var machine = new Models.Metadata.Machine();
+
+            var rom = ConvertToInternalModel(item);
+            if (rom != null)
+                machine[Models.Metadata.Machine.RomKey] = new Models.Metadata.Rom[] { rom };
+
             return machine;
         }
 
         /// <summary>
         /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Metadata.Rom"/>
         /// </summary>
-#if NET48
-        private static Models.Metadata.Rom ConvertToInternalModel(Models.ArchiveDotOrg.File item)
-#else
         private static Models.Metadata.Rom? ConvertToInternalModel(Models.ArchiveDotOrg.File? item)
-#endif
         {
             if (item == null)
                 return null;

SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class AttractMode : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -51,7 +47,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null || !roms.Any())
-                return Array.Empty<Row>();
+                return [];
 
             return roms
                 .Where(r => r != null)

SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class AttractMode : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(MetadataFile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -48,11 +44,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Models.Metadata.Machine"/>
         /// </summary>
-#if NET48
-        private static Models.Metadata.Machine ConvertMachineToInternalModel(Row item)
-#else
         private static Models.Metadata.Machine? ConvertMachineToInternalModel(Row? item)
-#endif
         {
             if (item == null)
                 return null;

SabreTools.Serialization/CrossModel/ClrMamePro.Deserializer.cs

@@ -7,18 +7,10 @@ namespace SabreTools.Serialization.CrossModel
     public partial class ClrMamePro : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj) => Deserialize(obj, false);
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj) => Deserialize(obj, false);
-#endif
 
         /// <inheritdoc cref="Deserialize(Models.Metadata.MetadataFile)"/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj, bool game)
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj, bool game)
-#endif
         {
             if (obj == null)
                 return null;
@@ -72,15 +64,7 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item, bool game = false)
         {
-#if NET48
-            GameBase gameBase;
-            if (game)
-                gameBase = new Game();
-            else
-                gameBase = new Machine();
-#else
             GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine();
-#endif
 
             gameBase.Name = item.ReadString(Models.Metadata.Machine.NameKey);
             gameBase.Description = item.ReadString(Models.Metadata.Machine.DescriptionKey);

SabreTools.Serialization/CrossModel/ClrMamePro.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class ClrMamePro : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(MetadataFile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -62,11 +58,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Models.Metadata.Machine"/>
         /// </summary>
-#if NET48
-        private static Models.Metadata.Machine ConvertMachineToInternalModel(GameBase item)
-#else
         private static Models.Metadata.Machine? ConvertMachineToInternalModel(GameBase? item)
-#endif
         {
             if (item == null)
                 return null;

SabreTools.Serialization/CrossModel/DosCenter.Deserializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class DosCenter : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/DosCenter.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class DosCenter : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(MetadataFile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class EverdriveSMDB : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -38,7 +34,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null || !roms.Any())
-                return Array.Empty<Row>();
+                return [];
 
             return roms
                 .Where(r => r != null)

SabreTools.Serialization/CrossModel/EverdriveSMDB.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class EverdriveSMDB : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(MetadataFile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/Hashfile.Deserializer.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Hashing;
 using SabreTools.Models.Hashfile;
 using SabreTools.Serialization.Interfaces;
 
@@ -8,18 +9,10 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Hashfile : IModelSerializer<Models.Hashfile.Hashfile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Hashfile.Hashfile Deserialize(Models.Metadata.MetadataFile obj) => Deserialize(obj, Hash.CRC);
-#else
-        public Models.Hashfile.Hashfile? Deserialize(Models.Metadata.MetadataFile? obj) => Deserialize(obj, Hash.CRC);
-#endif
+        public Models.Hashfile.Hashfile? Deserialize(Models.Metadata.MetadataFile? obj) => Deserialize(obj, HashType.CRC32);
 
         /// <inheritdoc/>
-#if NET48
-        public Models.Hashfile.Hashfile Deserialize(Models.Metadata.MetadataFile obj, Hash hash)
-#else
-        public Models.Hashfile.Hashfile? Deserialize(Models.Metadata.MetadataFile? obj, Hash hash)
-#endif
+        public Models.Hashfile.Hashfile? Deserialize(Models.Metadata.MetadataFile? obj, HashType hash)
         {
             if (obj == null)
                 return null;
@@ -81,11 +74,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.MetadataFile"/> to an array of <cref="Models.Hashfile.Hashfile"/>
         /// </summary>
-#if NET48
-        public static Models.Hashfile.Hashfile[] ConvertArrayFromInternalModel(Models.Metadata.MetadataFile item, Hash hash)
-#else
-        public static Models.Hashfile.Hashfile[]? ConvertArrayFromInternalModel(Models.Metadata.MetadataFile? item, Hash hash)
-#endif
+        public static Models.Hashfile.Hashfile[]? ConvertArrayFromInternalModel(Models.Metadata.MetadataFile? item, HashType hash)
         {
             if (item == null)
                 return null;
@@ -105,7 +94,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Machine"/> to <cref="Models.Hashfile.Hashfile"/>
         /// </summary>
-        private static Models.Hashfile.Hashfile ConvertMachineFromInternalModel(Models.Metadata.Machine item, Hash hash)
+        private static Models.Hashfile.Hashfile ConvertMachineFromInternalModel(Models.Metadata.Machine item, HashType hash)
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null)
@@ -113,43 +102,43 @@ namespace SabreTools.Serialization.CrossModel
 
             return new Models.Hashfile.Hashfile
             {
-                SFV = hash == Hash.CRC
+                SFV = hash == HashType.CRC32 || hash == HashType.CRC32_ISO || hash == HashType.CRC32_Naive || hash == HashType.CRC32_Optimized || hash == HashType.CRC32_Parallel
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSFV)
                         .ToArray()
                     : null,
-                MD5 = hash == Hash.MD5
+                MD5 = hash == HashType.MD5
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToMD5)
                         .ToArray()
                     : null,
-                SHA1 = hash == Hash.SHA1
+                SHA1 = hash == HashType.SHA1
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSHA1)
                         .ToArray()
                     : null,
-                SHA256 = hash == Hash.SHA256
+                SHA256 = hash == HashType.SHA256
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSHA256)
                         .ToArray()
                     : null,
-                SHA384 = hash == Hash.SHA384
+                SHA384 = hash == HashType.SHA384
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSHA384)
                         .ToArray()
                     : null,
-                SHA512 = hash == Hash.SHA512
+                SHA512 = hash == HashType.SHA512
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSHA512)
                         .ToArray()
                     : null,
-                SpamSum = hash == Hash.SpamSum
+                SpamSum = hash == HashType.SpamSum
                     ? roms
                         .Where(r => r != null)
                         .Select(ConvertToSpamSum)

SabreTools.Serialization/CrossModel/Hashfile.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Hashfile : IModelSerializer<Models.Hashfile.Hashfile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Models.Hashfile.Hashfile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(Models.Hashfile.Hashfile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/Listrom.Deserializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Listrom : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public MetadataFile Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public MetadataFile? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/Listrom.Serializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Listrom : IModelSerializer<MetadataFile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(MetadataFile obj)
-#else
         public Models.Metadata.MetadataFile? Serialize(MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -51,7 +47,7 @@ namespace SabreTools.Serialization.CrossModel
         private static Models.Metadata.Machine ConvertMachineToInternalModel(Set item)
         {
             var machine = new Models.Metadata.Machine();
-            if (!string.IsNullOrWhiteSpace(item.Device))
+            if (!string.IsNullOrEmpty(item.Device))
             {
                 machine[Models.Metadata.Machine.NameKey] = item.Device;
                 machine[Models.Metadata.Machine.IsDeviceKey] = "yes";
@@ -69,8 +65,8 @@ namespace SabreTools.Serialization.CrossModel
                     datItems.Add(ConvertToInternalModel(file));
                 }
 
-                machine[Models.Metadata.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "disk")?.ToArray();
-                machine[Models.Metadata.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "rom")?.ToArray();
+                machine[Models.Metadata.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "disk").Select(d => d as Models.Metadata.Disk).ToArray();
+                machine[Models.Metadata.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "rom").Select(d => d as Models.Metadata.Rom).ToArray();
             }
 
             return machine;
@@ -85,6 +81,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 var disk = new Models.Metadata.Disk
                 {
+                    [Models.Metadata.DatItem.TypeKey] = "disk",
                     [Models.Metadata.Disk.NameKey] = item.Name,
                     [Models.Metadata.Disk.MD5Key] = item.MD5,
                     [Models.Metadata.Disk.SHA1Key] = item.SHA1,
@@ -101,6 +98,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 var rom = new Models.Metadata.Rom
                 {
+                    [Models.Metadata.DatItem.TypeKey] = "rom",
                     [Models.Metadata.Rom.NameKey] = item.Name,
                     [Models.Metadata.Rom.SizeKey] = item.Size,
                     [Models.Metadata.Rom.CRCKey] = item.CRC,

SabreTools.Serialization/CrossModel/Listxml.Deserializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Listxml : IModelSerializer<Mame, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Mame Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public Mame? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -34,11 +30,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Models.Metadata.MetadataFile"/> to <cref="Models.Listxml.Mame"/>
         /// </summary>
-#if NET48
-        private static Mame ConvertMameFromInternalModel(Models.Metadata.MetadataFile item)
-#else
         public static Mame? ConvertMameFromInternalModel(Models.Metadata.MetadataFile? item)
-#endif
         {
             if (item == null)
                 return null;
@@ -316,7 +308,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 Name = item.ReadString(Models.Metadata.Chip.NameKey),
                 Tag = item.ReadString(Models.Metadata.Chip.TagKey),
-                Type = item.ReadString(Models.Metadata.Chip.TypeKey),
+                Type = item.ReadString(Models.Metadata.Chip.ChipTypeKey),
                 SoundOnly = item.ReadString(Models.Metadata.Chip.SoundOnlyKey),
                 Clock = item.ReadString(Models.Metadata.Chip.ClockKey),
             };
@@ -415,7 +407,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var control = new Control
             {
-                Type = item.ReadString(Models.Metadata.Control.TypeKey),
+                Type = item.ReadString(Models.Metadata.Control.ControlTypeKey),
                 Player = item.ReadString(Models.Metadata.Control.PlayerKey),
                 Buttons = item.ReadString(Models.Metadata.Control.ButtonsKey),
                 ReqButtons = item.ReadString(Models.Metadata.Control.ReqButtonsKey),
@@ -438,7 +430,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var device = new Device
             {
-                Type = item.ReadString(Models.Metadata.Device.TypeKey),
+                Type = item.ReadString(Models.Metadata.Device.DeviceTypeKey),
                 Tag = item.ReadString(Models.Metadata.Device.TagKey),
                 FixedImage = item.ReadString(Models.Metadata.Device.FixedImageKey),
                 Mandatory = item.ReadString(Models.Metadata.Device.MandatoryKey),
@@ -571,7 +563,7 @@ namespace SabreTools.Serialization.CrossModel
             var display = new Display
             {
                 Tag = item.ReadString(Models.Metadata.Display.TagKey),
-                Type = item.ReadString(Models.Metadata.Display.TypeKey),
+                Type = item.ReadString(Models.Metadata.Display.DisplayTypeKey),
                 Rotate = item.ReadString(Models.Metadata.Display.RotateKey),
                 FlipX = item.ReadString(Models.Metadata.Display.FlipXKey),
                 Width = item.ReadString(Models.Metadata.Display.WidthKey),
@@ -629,7 +621,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var feature = new Feature
             {
-                Type = item.ReadString(Models.Metadata.Feature.TypeKey),
+                Type = item.ReadString(Models.Metadata.Feature.FeatureTypeKey),
                 Status = item.ReadString(Models.Metadata.Feature.StatusKey),
                 Overall = item.ReadString(Models.Metadata.Feature.OverallKey),
             };

SabreTools.Serialization/CrossModel/Listxml.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Listxml : IModelSerializer<Mame, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Mame item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Mame? item)
-#endif
         {
             if (item == null)
                 return null;
@@ -268,7 +264,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 [Models.Metadata.Chip.NameKey] = item.Name,
                 [Models.Metadata.Chip.TagKey] = item.Tag,
-                [Models.Metadata.Chip.TypeKey] = item.Type,
+                [Models.Metadata.Chip.ChipTypeKey] = item.Type,
                 [Models.Metadata.Chip.SoundOnlyKey] = item.SoundOnly,
                 [Models.Metadata.Chip.ClockKey] = item.Clock,
             };
@@ -363,7 +359,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var control = new Models.Metadata.Control
             {
-                [Models.Metadata.Control.TypeKey] = item.Type,
+                [Models.Metadata.Control.ControlTypeKey] = item.Type,
                 [Models.Metadata.Control.PlayerKey] = item.Player,
                 [Models.Metadata.Control.ButtonsKey] = item.Buttons,
                 [Models.Metadata.Control.ReqButtonsKey] = item.ReqButtons,
@@ -386,7 +382,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var device = new Models.Metadata.Device
             {
-                [Models.Metadata.Device.TypeKey] = item.Type,
+                [Models.Metadata.Device.DeviceTypeKey] = item.Type,
                 [Models.Metadata.Device.TagKey] = item.Tag,
                 [Models.Metadata.Device.FixedImageKey] = item.FixedImage,
                 [Models.Metadata.Device.MandatoryKey] = item.Mandatory,
@@ -513,7 +509,7 @@ namespace SabreTools.Serialization.CrossModel
             var display = new Models.Metadata.Display
             {
                 [Models.Metadata.Display.TagKey] = item.Tag,
-                [Models.Metadata.Display.TypeKey] = item.Type,
+                [Models.Metadata.Display.DisplayTypeKey] = item.Type,
                 [Models.Metadata.Display.RotateKey] = item.Rotate,
                 [Models.Metadata.Display.FlipXKey] = item.FlipX,
                 [Models.Metadata.Display.WidthKey] = item.Width,
@@ -571,7 +567,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var feature = new Models.Metadata.Feature
             {
-                [Models.Metadata.Feature.TypeKey] = item.Type,
+                [Models.Metadata.Feature.FeatureTypeKey] = item.Type,
                 [Models.Metadata.Feature.StatusKey] = item.Status,
                 [Models.Metadata.Feature.OverallKey] = item.Overall,
             };

SabreTools.Serialization/CrossModel/Logiqx.Deserializer.cs

@@ -7,18 +7,10 @@ namespace SabreTools.Serialization.CrossModel
     public partial class Logiqx : IModelSerializer<Datafile, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Datafile Deserialize(Models.Metadata.MetadataFile obj) => Deserialize(obj, false);
-#else
         public Datafile? Deserialize(Models.Metadata.MetadataFile? obj) => Deserialize(obj, false);
-#endif
 
         /// <inheritdoc/>
-#if NET48
-        public Datafile Deserialize(Models.Metadata.MetadataFile obj, bool game)
-#else
         public Datafile? Deserialize(Models.Metadata.MetadataFile? obj, bool game)
-#endif
         {
             if (obj == null)
                 return null;
@@ -111,15 +103,7 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item, bool game = false)
         {
-#if NET48
-            GameBase gameBase;
-            if (game)
-                gameBase = new Game();
-            else
-                gameBase = new Machine();
-#else
             GameBase gameBase = game ? new Game() : new Machine();
-#endif
 
             gameBase.Name = item.ReadString(Models.Metadata.Machine.NameKey);
             gameBase.SourceFile = item.ReadString(Models.Metadata.Machine.SourceFileKey);

SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs

@@ -8,11 +8,7 @@ namespace SabreTools.Serialization.CrossModel
 {
     public partial class Logiqx : IModelSerializer<Datafile, Models.Metadata.MetadataFile>
     {
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Datafile item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Datafile? item)
-#endif
         {
             if (item == null)
                 return null;
@@ -26,9 +22,9 @@ namespace SabreTools.Serialization.CrossModel
 
             if (item.Game != null && item.Game.Any())
             {
-               machines.AddRange(item.Game
-                    .Where(g => g != null)
-                    .Select(ConvertMachineToInternalModel));
+                machines.AddRange(item.Game
+                     .Where(g => g != null)
+                     .Select(ConvertMachineToInternalModel));
             }
 
             if (item.Dir != null && item.Dir.Any())
@@ -108,7 +104,7 @@ namespace SabreTools.Serialization.CrossModel
         private static Models.Metadata.Machine[] ConvertDirToInternalModel(Dir item)
         {
             if (item.Game == null || !item.Game.Any())
-                return Array.Empty<Models.Metadata.Machine>();
+                return [];
 
             return item.Game
                 .Where(g => g != null)

SabreTools.Serialization/CrossModel/M1.Deserializer.cs

@@ -6,11 +6,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class M1 : IModelSerializer<Models.Listxml.M1, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Listxml.M1 Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public Models.Listxml.M1? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/M1.Serializer.cs

@@ -6,11 +6,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class M1 : IModelSerializer<Models.Listxml.M1, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Models.Listxml.M1 item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Models.Listxml.M1? item)
-#endif
         {
             if (item == null)
                 return null;

SabreTools.Serialization/CrossModel/OfflineList.Deserializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class OfflineList : IModelSerializer<Dat, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Dat Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public Dat? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

SabreTools.Serialization/CrossModel/OfflineList.Serializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class OfflineList : IModelSerializer<Dat, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Dat item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Dat? item)
-#endif
         {
             if (item == null)
                 return null;

SabreTools.Serialization/CrossModel/OpenMSX.Deserializer.cs

@@ -7,11 +7,7 @@ namespace SabreTools.Serialization.CrossModel
     public partial class OpenMSX : IModelSerializer<SoftwareDb, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public SoftwareDb Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public SoftwareDb? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;
@@ -104,7 +100,7 @@ namespace SabreTools.Serialization.CrossModel
             var megaRom = new MegaRom
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };
@@ -132,7 +128,7 @@ namespace SabreTools.Serialization.CrossModel
             var rom = new Rom
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };
@@ -147,7 +143,7 @@ namespace SabreTools.Serialization.CrossModel
             var sccPlusCart = new SCCPlusCart
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };