From b32508642993565b61c411c2b9ad09162aa0fada Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 8 Sep 2023 18:53:01 -0400
Subject: [PATCH] Fix compilation issues

---
 CrossModel/ArchiveDotOrg.Serializer.cs |  2 +-
 Files/XmlFile.Serializer.cs            |  7 ++-----
 Streams/AACS.Deserializer.cs           |  6 +-----
 Streams/AACS.Serializer.cs             | 16 ++++++++++++++++
 Streams/XmlFile.Serializer.cs          |  8 ++++----
 5 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 Streams/AACS.Serializer.cs

diff --git a/CrossModel/ArchiveDotOrg.Serializer.cs b/CrossModel/ArchiveDotOrg.Serializer.cs
index 044d7660..0af2fb7a 100644
--- a/CrossModel/ArchiveDotOrg.Serializer.cs
+++ b/CrossModel/ArchiveDotOrg.Serializer.cs
@@ -8,7 +8,7 @@ namespace SabreTools.Serialization.CrossModel
 #if NET48
         public Models.Metadata.MetadataFile Serialize(Models.ArchiveDotOrg.Files item)
 #else
-        public static Models.Metadata.MetadataFile? Serialize(Models.ArchiveDotOrg.Files? item)
+        public Models.Metadata.MetadataFile? Serialize(Models.ArchiveDotOrg.Files? item)
 #endif
         {
             if (item == null)
diff --git a/Files/XmlFile.Serializer.cs b/Files/XmlFile.Serializer.cs
index 717570ec..1fb702b0 100644
--- a/Files/XmlFile.Serializer.cs
+++ b/Files/XmlFile.Serializer.cs
@@ -1,7 +1,4 @@
 using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
 
 namespace SabreTools.Serialization.Files
 {
@@ -31,9 +28,9 @@ namespace SabreTools.Serialization.Files
         /// <param name="subset">Optional DOCTYPE name</param>
         /// <returns>True on successful serialization, false otherwise</returns>
 #if NET48
-        protected static bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
+        public static bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
 #else
-        protected static bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
+        public static bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
 #endif
         {
             using (var stream = new Streams.XmlFile<T>().Serialize(obj, name, pubid, sysid, subset))
diff --git a/Streams/AACS.Deserializer.cs b/Streams/AACS.Deserializer.cs
index e92efc62..8b77c15c 100644
--- a/Streams/AACS.Deserializer.cs
+++ b/Streams/AACS.Deserializer.cs
@@ -9,11 +9,7 @@ namespace SabreTools.Serialization.Streams
 {
     public partial class AACS : IStreamSerializer<MediaKeyBlock>
     {
-        /// <summary>
-        /// Parse a Stream into an AACS media key block
-        /// </summary>
-        /// <param name="data">Stream to parse</param>
-        /// <returns>Filled cmedia key block on success, null on error</returns>
+        /// <inheritdoc/>
 #if NET48
         public MediaKeyBlock Deserialize(Stream data)
 #else
diff --git a/Streams/AACS.Serializer.cs b/Streams/AACS.Serializer.cs
new file mode 100644
index 00000000..77004a39
--- /dev/null
+++ b/Streams/AACS.Serializer.cs
@@ -0,0 +1,16 @@
+using System;
+using System.IO;
+using SabreTools.Models.AACS;
+
+namespace SabreTools.Serialization.Streams
+{
+    public partial class AACS : IStreamSerializer<MediaKeyBlock>
+    {
+        /// <inheritdoc/>
+#if NET48
+        public Stream Serialize(MediaKeyBlock obj) => throw new NotImplementedException();
+#else
+        public Stream? Serialize(MediaKeyBlock? obj) => throw new NotImplementedException();
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Streams/XmlFile.Serializer.cs b/Streams/XmlFile.Serializer.cs
index 71319448..115da99e 100644
--- a/Streams/XmlFile.Serializer.cs
+++ b/Streams/XmlFile.Serializer.cs
@@ -17,9 +17,9 @@ namespace SabreTools.Serialization.Streams
         /// <param name="obj">Data to serialize</param>
         /// <returns>Stream containing serialized data on success, null otherwise</returns>
 #if NET48
-        public static Stream Serialize(T obj)
+        public Stream Serialize(T obj)
 #else
-        public static Stream? Serialize(T? obj)
+        public Stream? Serialize(T? obj)
 #endif
             => Serialize(obj, null, null, null, null);
 
@@ -33,9 +33,9 @@ namespace SabreTools.Serialization.Streams
         /// <param name="subset">Optional DOCTYPE name</param>
         /// <returns>Stream containing serialized data on success, null otherwise</returns>
 #if NET48
-        protected static Stream Serialize(T obj, string name = null, string pubid = null, string sysid = null, string subset = null)
+        public Stream Serialize(T obj, string name = null, string pubid = null, string sysid = null, string subset = null)
 #else
-        protected static Stream? Serialize(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
+        public Stream? Serialize(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
 #endif
         {
             // If the object is null