Fix other data endpoint issues

* Add core Wrapper code as a test

* Port all but printing and extraction

This also removes the couple of extensions that were ported

* Update README with subsection

* Add all namespaces to README

* Bump version

Bytes/AACS.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/BDPlus.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/BFPK.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/BSP.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/CFB.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/CIA.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/GCF.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/IRD.Deserializer.cs

@@ -0,0 +1,24 @@
+using System.IO;
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Bytes
+{
+    public partial class IRD : IByteSerializer<Models.IRD.File>
+    {
+        /// <inheritdoc/>
+        public Models.IRD.File? Deserialize(byte[]? data, int offset)
+        {
+            // 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.IRD().Deserialize(dataStream);
+        }
+    }
+}

Bytes/InstallShieldCabinet.Deserializer.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using SabreTools.Models.InstallShieldCabinet;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
@@ -7,11 +8,7 @@ namespace SabreTools.Serialization.Bytes
     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)

Bytes/LinearExecutable.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/MSDOS.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/MicrosoftCabinet.Deserializer.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using SabreTools.Models.MicrosoftCabinet;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Bytes
 {
@@ -7,11 +8,7 @@ namespace SabreTools.Serialization.Bytes
     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)

Bytes/MoPaQ.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/N3DS.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/NCF.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/NewExecutable.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/Nitro.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/PAK.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/PFF.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/PlayJAudio.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/PlayJPlaylist.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/PortableExecutable.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/Quantum.Deserializer.cs

@@ -1,16 +1,13 @@
 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)

Bytes/SGA.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/VBSP.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/VPK.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/WAD.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

Bytes/XCP.Deserializer.cs

@@ -1,15 +1,12 @@
 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)

CrossModel/ArchiveDotOrg.Deserializer.cs

@@ -1,17 +1,14 @@
 using System;
 using System.Linq;
 using SabreTools.Models.ArchiveDotOrg;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -37,7 +34,11 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null)
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<File>();
+#endif
 
             return roms
                 .Where(r => r != null)

CrossModel/ArchiveDotOrg.Serializer.cs

@@ -1,15 +1,12 @@
 using System.Linq;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -46,11 +43,7 @@ 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
             {
@@ -62,11 +55,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <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;

CrossModel/AttractMode.Deserializer.cs

@@ -1,17 +1,14 @@
 using System;
 using System.Linq;
 using SabreTools.Models.AttractMode;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -50,7 +47,11 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null || !roms.Any())
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Row>();
+#endif
 
             return roms
                 .Where(r => r != null)

CrossModel/AttractMode.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.AttractMode;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -47,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;

CrossModel/ClrMamePro.Deserializer.cs

@@ -1,23 +1,16 @@
 using System.Linq;
 using SabreTools.Models.ClrMamePro;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -71,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);

CrossModel/ClrMamePro.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.ClrMamePro;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -61,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;

CrossModel/DosCenter.Deserializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.DosCenter;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/DosCenter.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.DosCenter;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/EverdriveSMDB.Deserializer.cs

@@ -1,17 +1,14 @@
 using System;
 using System.Linq;
 using SabreTools.Models.EverdriveSMDB;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -37,7 +34,11 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null || !roms.Any())
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Row>();
+#endif
 
             return roms
                 .Where(r => r != null)

CrossModel/EverdriveSMDB.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.EverdriveSMDB;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/Hashfile.Deserializer.cs

@@ -1,24 +1,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Models.Hashfile;
+using SabreTools.Serialization.Interfaces;
 
 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
 
         /// <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
         {
             if (obj == null)
                 return null;
@@ -80,11 +73,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
         {
             if (item == null)
                 return null;

CrossModel/Hashfile.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.Hashfile;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/Listrom.Deserializer.cs

@@ -1,17 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Models.Listrom;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/Listrom.Serializer.cs

@@ -1,17 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Models.Listrom;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/Listxml.Deserializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.Listxml;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -33,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;

CrossModel/Listxml.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.Listxml;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/Logiqx.Deserializer.cs

@@ -1,24 +1,16 @@
-using System;
 using System.Linq;
 using SabreTools.Models.Logiqx;
+using SabreTools.Serialization.Interfaces;
 
 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);

CrossModel/Logiqx.Serializer.cs

@@ -2,16 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Models.Logiqx;
+using SabreTools.Serialization.Interfaces;
 
 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;
@@ -107,7 +104,11 @@ namespace SabreTools.Serialization.CrossModel
         private static Models.Metadata.Machine[] ConvertDirToInternalModel(Dir item)
         {
             if (item.Game == null || !item.Game.Any())
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Models.Metadata.Machine>();
+#endif
 
             return item.Game
                 .Where(g => g != null)

CrossModel/M1.Deserializer.cs

@@ -1,15 +1,12 @@
 using System.Linq;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/M1.Serializer.cs

@@ -1,15 +1,12 @@
 using System.Linq;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/OfflineList.Deserializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.OfflineList;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/OfflineList.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.OfflineList;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/OpenMSX.Deserializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.OpenMSX;
+using SabreTools.Serialization.Interfaces;
 
 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;

CrossModel/OpenMSX.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.OpenMSX;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class OpenMSX : IModelSerializer<SoftwareDb, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(SoftwareDb item)
-#else
         public Models.Metadata.MetadataFile? Serialize(SoftwareDb? item)
-#endif
         {
             if (item == null)
                 return null;

CrossModel/RomCenter.Deserializer.cs

@@ -1,17 +1,14 @@
 using System;
 using System.Linq;
 using SabreTools.Models.RomCenter;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class RomCenter : 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;
@@ -94,7 +91,11 @@ namespace SabreTools.Serialization.CrossModel
         {
             var roms = item.Read<Models.Metadata.Rom[]>(Models.Metadata.Machine.RomKey);
             if (roms == null)
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Rom>();
+#endif
 
             return roms
                 .Where(r => r != null)

CrossModel/RomCenter.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.RomCenter;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class RomCenter : 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;

CrossModel/SeparatedValue.Deserializer.cs

@@ -1,17 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Models.SeparatedValue;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class SeparatedValue : 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;

CrossModel/SeparatedValue.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.SeparatedValue;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class SeparatedValue : 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;
@@ -77,53 +74,6 @@ namespace SabreTools.Serialization.CrossModel
             return machine;
         }
 
-#if NET48
-        /// <summary>
-        /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Metadata.DatItem"/>
-        /// </summary>
-        private static Models.Metadata.DatItem ConvertToInternalModel(Row item)
-        {
-            switch (item.Type)
-            {
-                case "disk":
-                    return new Models.Metadata.Disk
-                    {
-                        [Models.Metadata.Disk.NameKey] = item.DiskName,
-                        [Models.Metadata.Disk.MD5Key] = item.MD5,
-                        [Models.Metadata.Disk.SHA1Key] = item.SHA1,
-                        [Models.Metadata.Disk.StatusKey] = item.Status,
-                    };
-
-                case "media":
-                    return new Models.Metadata.Media
-                    {
-                        [Models.Metadata.Media.NameKey] = item.DiskName,
-                        [Models.Metadata.Media.MD5Key] = item.MD5,
-                        [Models.Metadata.Media.SHA1Key] = item.SHA1,
-                        [Models.Metadata.Media.SHA256Key] = item.SHA256,
-                        [Models.Metadata.Media.SpamSumKey] = item.SpamSum,
-                    };
-
-                case "rom":
-                    return new Models.Metadata.Rom
-                    {
-                        [Models.Metadata.Rom.NameKey] = item.RomName,
-                        [Models.Metadata.Rom.SizeKey] = item.Size,
-                        [Models.Metadata.Rom.CRCKey] = item.CRC,
-                        [Models.Metadata.Rom.MD5Key] = item.MD5,
-                        [Models.Metadata.Rom.SHA1Key] = item.SHA1,
-                        [Models.Metadata.Rom.SHA256Key] = item.SHA256,
-                        [Models.Metadata.Rom.SHA384Key] = item.SHA384,
-                        [Models.Metadata.Rom.SHA512Key] = item.SHA512,
-                        [Models.Metadata.Rom.SpamSumKey] = item.SpamSum,
-                        [Models.Metadata.Rom.StatusKey] = item.Status,
-                    };
-
-                default:
-                    return null;
-            }
-        }
-#else
         /// <summary>
         /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Metadata.DatItem"/>
         /// </summary>
@@ -162,6 +112,5 @@ namespace SabreTools.Serialization.CrossModel
                 _ => null,
             };
         }
-#endif
     }
 }

CrossModel/SoftwareList.Deserializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.SoftwareList;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class SoftwareList : IModelSerializer<Models.SoftwareList.SoftwareList, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.SoftwareList.SoftwareList Deserialize(Models.Metadata.MetadataFile obj)
-#else
         public Models.SoftwareList.SoftwareList? Deserialize(Models.Metadata.MetadataFile? obj)
-#endif
         {
             if (obj == null)
                 return null;

CrossModel/SoftwareList.Serializer.cs

@@ -1,16 +1,13 @@
 using System.Linq;
 using SabreTools.Models.SoftwareList;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.CrossModel
 {
     public partial class SoftwareList : IModelSerializer<Models.SoftwareList.SoftwareList, Models.Metadata.MetadataFile>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.Metadata.MetadataFile Serialize(Models.SoftwareList.SoftwareList item)
-#else
         public Models.Metadata.MetadataFile? Serialize(Models.SoftwareList.SoftwareList? item)
-#endif
         {
             if (item == null)
                 return null;

Extensions.NewExecutable.cs

@@ -0,0 +1,60 @@
+using SabreTools.Models.NewExecutable;
+
+namespace SabreTools.Serialization
+{
+    public static partial class Extensions
+    {
+        /// <summary>
+        /// Determine if a resource type information entry is an integer or offset
+        /// </summary>
+        /// <param name="entry">Resource type information entry to check</param>
+        /// <returns>True if the entry is an integer type, false if an offset, null on error</returns>
+        public static bool? IsIntegerType(this ResourceTypeInformationEntry entry)
+        {
+            // We can't do anything with an invalid entry
+            if (entry == null)
+                return null;
+
+            // If the highest order bit is set, it's an integer type
+            return (entry.TypeID & 0x8000) != 0;
+        }
+
+        /// <summary>
+        /// Determine if a resource type resource entry is an integer or offset
+        /// </summary>
+        /// <param name="entry">Resource type resource entry to check</param>
+        /// <returns>True if the entry is an integer type, false if an offset, null on error</returns>
+        public static bool? IsIntegerType(this ResourceTypeResourceEntry entry)
+        {
+            // We can't do anything with an invalid entry
+            if (entry == null)
+                return null;
+
+            // If the highest order bit is set, it's an integer type
+            return (entry.ResourceID & 0x8000) != 0;
+        }
+
+        /// <summary>
+        /// Get the segment entry type for an entry table bundle
+        /// </summary>
+        /// <param name="entry">Entry table bundle to check</param>
+        /// <returns>SegmentEntryType corresponding to the type</returns>
+        public static SegmentEntryType GetEntryType(this EntryTableBundle entry)
+        {
+            // We can't do anything with an invalid entry
+            if (entry == null)
+                return SegmentEntryType.Unused;
+
+            // Determine the entry type based on segment indicator
+            if (entry.SegmentIndicator == 0x00)
+                return SegmentEntryType.Unused;
+            else if (entry.SegmentIndicator >= 0x01 && entry.SegmentIndicator <= 0xFE)
+                return SegmentEntryType.FixedSegment;
+            else if (entry.SegmentIndicator == 0xFF)
+                return SegmentEntryType.MoveableSegment;
+
+            // We should never get here
+            return SegmentEntryType.Unused;
+        }
+    }
+}

Files/AttractMode.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/AttractMode.Serializer.cs

@@ -1,16 +1,13 @@
 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;

Files/ClrMamePro.Deserializer.cs

@@ -1,22 +1,15 @@
 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))
             {

Files/ClrMamePro.Serializer.cs

@@ -1,23 +1,16 @@
 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;

Files/CueSheet.Deserializer.cs

@@ -4,17 +4,14 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using SabreTools.Models.CueSheets;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Files
 {
     public partial class CueSheet : IFileSerializer<Models.CueSheets.CueSheet>
     {
         /// <inheritdoc/>
-#if NET48
-        public Models.CueSheets.CueSheet Deserialize(string path)
-#else
         public Models.CueSheets.CueSheet? Deserialize(string? path)
-#endif
         {
             // Check that the file exists
             if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
@@ -121,11 +118,7 @@ namespace SabreTools.Serialization.Files
         /// <param name="fileType">File type to set</param>
         /// <param name="cueLines">Lines array to pull from</param>
         /// <param name="i">Reference to index in array</param>
-#if NET48
-        private static CueFile CreateCueFile(string fileName, string fileType, string[] cueLines, ref int i)
-#else
         private static CueFile? CreateCueFile(string fileName, string fileType, string[]? cueLines, ref int i)
-#endif
         {
             // Check the required parameters
             if (cueLines == null)
@@ -190,11 +183,7 @@ namespace SabreTools.Serialization.Files
         /// <param name="dataType">Data type to set</param>
         /// <param name="cueLines">Lines array to pull from</param>
         /// <param name="i">Reference to index in array</param>
-#if NET48
-        private static CueTrack CreateCueTrack(string number, string dataType, string[] cueLines, ref int i)
-#else
         private static CueTrack? CreateCueTrack(string number, string dataType, string[]? cueLines, ref int i)
-#endif
         {
             // Check the required parameters
             if (cueLines == null)
@@ -325,18 +314,14 @@ namespace SabreTools.Serialization.Files
         /// Create a PREGAP from a mm:ss:ff length
         /// </summary>
         /// <param name="length">String to get length information from</param>
-#if NET48
-        private static PreGap CreatePreGap(string length)
-#else
         private static PreGap CreatePreGap(string? length)
-#endif
         {
             // Ignore empty lines
             if (string.IsNullOrWhiteSpace(length))
                 throw new ArgumentException("Length was null or whitespace");
 
             // Ignore lines that don't contain the correct information
-            if (length.Length != 8 || length.Count(c => c == ':') != 2)
+            if (length!.Length != 8 || length.Count(c => c == ':') != 2)
                 throw new FormatException($"Length was not in a recognized format: {length}");
 
             // Split the line
@@ -380,11 +365,7 @@ namespace SabreTools.Serialization.Files
         /// </summary>
         /// <param name="index">Index to set</param>
         /// <param name="startTime">Start time to set</param>
-#if NET48
-        private static CueIndex CreateCueIndex(string index, string startTime)
-#else
         private static CueIndex CreateCueIndex(string? index, string? startTime)
-#endif
         {
             // Set the current fields
             if (!int.TryParse(index, out int parsedIndex))
@@ -397,7 +378,7 @@ namespace SabreTools.Serialization.Files
                 throw new ArgumentException("Start time was null or whitespace");
 
             // Ignore lines that don't contain the correct information
-            if (startTime.Length != 8 || startTime.Count(c => c == ':') != 2)
+            if (startTime!.Length != 8 || startTime.Count(c => c == ':') != 2)
                 throw new FormatException($"Start time was not in a recognized format: {startTime}");
 
             // Split the line
@@ -441,18 +422,14 @@ namespace SabreTools.Serialization.Files
         /// Create a POSTGAP from a mm:ss:ff length
         /// </summary>
         /// <param name="length">String to get length information from</param>
-#if NET48
-        private static PostGap CreatePostGap(string length)
-#else
         private static PostGap CreatePostGap(string? length)
-#endif
         {
             // Ignore empty lines
             if (string.IsNullOrWhiteSpace(length))
                 throw new ArgumentException("Length was null or whitespace");
 
             // Ignore lines that don't contain the correct information
-            if (length.Length != 8 || length.Count(c => c == ':') != 2)
+            if (length!.Length != 8 || length.Count(c => c == ':') != 2)
                 throw new FormatException($"Length was not in a recognized format: {length}");
 
             // Split the line
@@ -498,11 +475,7 @@ namespace SabreTools.Serialization.Files
         /// </summary>
         /// <param name="fileType">String to get value from</param>
         /// <returns>CueFileType, if possible</returns>
-#if NET48
-        private static CueFileType GetFileType(string fileType)
-#else
         private static CueFileType GetFileType(string? fileType)
-#endif
         {
             switch (fileType?.ToLowerInvariant())
             {
@@ -531,11 +504,7 @@ namespace SabreTools.Serialization.Files
         /// </summary>
         /// <param name="dataType">String to get value from</param>
         /// <returns>CueTrackDataType, if possible (default AUDIO)</returns>
-#if NET48
-        private static CueTrackDataType GetDataType(string dataType)
-#else
         private static CueTrackDataType GetDataType(string? dataType)
-#endif
         {
             switch (dataType?.ToLowerInvariant())
             {
@@ -573,21 +542,13 @@ namespace SabreTools.Serialization.Files
         /// </summary>
         /// <param name="flagStrings">Possible flags as strings</param>
         /// <returns>CueTrackFlag value representing the strings, if possible</returns>
-#if NET48
-        private static CueTrackFlag GetFlags(string[] flagStrings)
-#else
         private static CueTrackFlag GetFlags(string?[]? flagStrings)
-#endif
         {
             CueTrackFlag flag = 0;
             if (flagStrings == null)
                 return flag;
 
-#if NET48
-            foreach (string flagString in flagStrings)
-#else
             foreach (string? flagString in flagStrings)
-#endif
             {
                 switch (flagString?.ToLowerInvariant())
                 {

Files/CueSheet.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/DosCenter.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/DosCenter.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/EverdriveSMDB.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/EverdriveSMDB.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/Hashfile.Deserializer.cs

@@ -1,20 +1,14 @@
+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))
             {

Files/Hashfile.Serializer.cs

@@ -1,20 +1,14 @@
+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;

Files/IRD.Deserializer.cs

@@ -0,0 +1,16 @@
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Files
+{
+    public partial class IRD : IFileSerializer<Models.IRD.File>
+    {
+        /// <inheritdoc/>
+        public Models.IRD.File? Deserialize(string? path)
+        {
+            using (var stream = PathProcessor.OpenStream(path))
+            {
+                return new Streams.IRD().Deserialize(stream);
+            }
+        }
+    }
+}

Files/IRD.Serializer.cs

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

Files/Listrom.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/Listrom.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/PIC.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/PIC.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/RomCenter.Deserializer.cs

@@ -1,15 +1,12 @@
 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))
             {

Files/RomCenter.Serializer.cs

@@ -1,15 +1,12 @@
 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;

Files/SeparatedValue.Deserializer.cs

@@ -1,22 +1,15 @@
 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))
             {

Files/SeparatedValue.Serializer.cs

@@ -1,22 +1,15 @@
 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;

Files/XMID.Deserializer.cs

@@ -1,214 +0,0 @@
-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,14 +0,0 @@
-using System;
-
-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,273 +0,0 @@
-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,14 +0,0 @@
-using System;
-
-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,3 +1,5 @@
+using SabreTools.Serialization.Interfaces;
+
 namespace SabreTools.Serialization.Files
 {
     /// <summary>
@@ -7,11 +9,7 @@ namespace SabreTools.Serialization.Files
     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))
             {

Files/XmlFile.Serializer.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using SabreTools.Serialization.Interfaces;
 
 namespace SabreTools.Serialization.Files
 {
@@ -9,11 +10,7 @@ namespace SabreTools.Serialization.Files
     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>
@@ -27,11 +24,7 @@ namespace SabreTools.Serialization.Files
         /// <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;

Interfaces/IByteSerializer.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
     /// Defines how to serialize to and from byte arrays
@@ -12,11 +12,7 @@ namespace SabreTools.Serialization
         /// <param name="data">Byte array to parse</param>
         /// <param name="offset">Offset into the byte array</param>
         /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        T Deserialize(byte[] data, int offset);
-#else
         T? Deserialize(byte[]? data, int offset);
-#endif
 
         // TODO: Add serialization method
     }

Interfaces/IFileSerializer.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
     /// Defines how to serialize to and from files
@@ -11,23 +11,15 @@ namespace SabreTools.Serialization
         /// <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
+        /// Serialize 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/IModelSerializer.cs

@@ -1,4 +1,4 @@
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
     /// Defines how to serialize to and from models
@@ -12,11 +12,7 @@ namespace SabreTools.Serialization
         /// <typeparam name="U">Type of object to deserialize from</typeparam>
         /// <param name="obj">Object to deserialize from</param>
         /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        T Deserialize(U obj);
-#else
         T? Deserialize(U? obj);
-#endif
 
         /// <summary>
         /// Serialize a <typeparamref name="T"/> into <typeparamref name="U"/>
@@ -25,10 +21,6 @@ namespace SabreTools.Serialization
         /// <typeparam name="U">Type of object to serialize to</typeparam>
         /// <param name="obj">Object to serialize from</param>
         /// <returns>Filled object on success, null on error</returns>
-#if NET48
-        U Serialize(T obj);
-#else
         U? Serialize(T? obj);
-#endif
     }
 }

Interfaces/IStreamSerializer.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SabreTools.Serialization
+namespace SabreTools.Serialization.Interfaces
 {
     /// <summary>
     /// Defines how to serialize to and from Streams
@@ -13,11 +13,7 @@ namespace SabreTools.Serialization
         /// <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
@@ -25,10 +21,6 @@ namespace SabreTools.Serialization
         /// <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
     }
 }

Interfaces/IStringSerializer.cs

@@ -0,0 +1,24 @@
+namespace SabreTools.Serialization.Interfaces
+{
+    /// <summary>
+    /// Defines how to serialize to and from strings
+    /// </summary>
+    public interface IStringSerializer<T>
+    {
+        /// <summary>
+        /// Deserialize a string into <typeparamref name="T"/>
+        /// </summary>
+        /// <typeparam name="T">Type of object to deserialize to</typeparam>
+        /// <param name="str">String to deserialize from</param>
+        /// <returns>Filled object on success, null on error</returns>
+        T? Deserialize(string? str);
+
+        /// <summary>
+        /// Serialize a <typeparamref name="T"/> into a string
+        /// </summary>
+        /// <typeparam name="T">Type of object to serialize from</typeparam>
+        /// <param name="obj">Data to serialize</param>
+        /// <returns>Filled string on successful serialization, null otherwise</returns>
+        string? Serialize(T? obj);
+    }
+}

Interfaces/IWrapper.cs

@@ -0,0 +1,17 @@
+namespace SabreTools.Serialization.Interfaces
+{
+    public interface IWrapper
+    {
+        /// <summary>
+        /// Get a human-readable description of the wrapper
+        /// </summary>
+        string Description();
+        
+#if !NETFRAMEWORK
+        /// <summary>
+        /// Export the item information as JSON
+        /// </summary>
+        string ExportJSON();
+#endif
+    }
+}

Internal.cs

@@ -10,11 +10,7 @@ namespace SabreTools.Serialization
         /// <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;
@@ -39,11 +35,7 @@ namespace SabreTools.Serialization
         /// <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;
@@ -87,7 +79,11 @@ namespace SabreTools.Serialization
         {
             var roms = item.Read<Rom[]>(DataArea.RomKey);
             if (roms == null || !roms.Any())
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Rom>();
+#endif
 
             return roms.ToArray();
         }
@@ -99,7 +95,11 @@ namespace SabreTools.Serialization
         {
             var roms = item.Read<Disk[]>(DiskArea.DiskKey);
             if (roms == null || !roms.Any())
+#if NET40 || NET452
+                return [];
+#else
                 return Array.Empty<Disk>();
+#endif
 
             return roms.ToArray();
         }

Logiqx.cs

@@ -23,10 +23,6 @@ namespace SabreTools.Serialization
         /// <summary>
         /// subset field for DOCTYPE
         /// </summary>
-#if NET48
-        public const string DocTypeSubset = null;
-#else
         public const string? DocTypeSubset = null;
-#endif
     }
 }

OpenMSX.cs

@@ -13,11 +13,7 @@ namespace SabreTools.Serialization
         /// <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
@@ -27,10 +23,6 @@ namespace SabreTools.Serialization
         /// <summary>
         /// subset field for DOCTYPE
         /// </summary>
-#if NET48
-        public const string DocTypeSubset = null;
-#else
         public const string? DocTypeSubset = null;
-#endif
     }
 }

PathProcessor.cs

@@ -11,11 +11,7 @@ namespace SabreTools.Serialization
         /// </summary>
         /// <param name="path">Path to open as a stream</param>
         /// <returns>Stream representing the file, null on error</returns>
-#if NET48
-        public static Stream OpenStream(string path)
-#else
         public static Stream? OpenStream(string? path)
-#endif
         {
             try
             {

README.MD

@@ -3,3 +3,27 @@
 This library comprises of serializers that both read and write from files and streams to the dedicated models as well as convert to and from the common internal models. This library is partially used by the current parsing and writing code but none of the internal model serialization is used.
 
 Find the link to the Nuget package [here](https://www.nuget.org/packages/SabreTools.Serialization).
+
+## `SabreTools.Serialization.Bytes`
+
+This namespace comprises of deserializers that take byte arrays to convert into models.
+
+## `SabreTools.Serialization.CrossModel`
+
+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.
+
+## `SabreTools.Serialization.Files`
+
+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.Strings`
+
+This namespace comprises of serializers and deserializers that can convert to and from strings. 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.

SabreTools.Serialization.csproj

@@ -2,10 +2,13 @@
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <Version>1.1.2</Version>
+    <TargetFrameworks>net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>1.2.1</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
@@ -19,17 +22,13 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath=""/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.IO" Version="1.1.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.1.2" />
+    <PackageReference Include="SabreTools.IO" Version="1.2.0" />
+    <PackageReference Include="SabreTools.Models" Version="1.2.0" />
   </ItemGroup>
 
 </Project>