From ae4c6ed7f73267e5992343db11bcacb44ac6d528 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 9 Sep 2023 01:57:20 -0400
Subject: [PATCH] Fix compilation issues

---
 CrossModel/Listxml.Deserializer.cs | 4 ++--
 CrossModel/Listxml.Serializer.cs   | 2 +-
 CrossModel/Logiqx.Deserializer.cs  | 4 ++--
 CrossModel/Logiqx.Serializer.cs    | 2 +-
 Files/XmlFile.Serializer.cs        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CrossModel/Listxml.Deserializer.cs b/CrossModel/Listxml.Deserializer.cs
index 1f5328a5..6dcbf077 100644
--- a/CrossModel/Listxml.Deserializer.cs
+++ b/CrossModel/Listxml.Deserializer.cs
@@ -785,9 +785,9 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.SoftwareList"/> to <cref="Models.Listxml.SoftwareList"/>
         /// </summary>
-        private static SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item)
+        private static Models.Listxml.SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item)
         {
-            var softwareList = new SoftwareList
+            var softwareList = new Models.Listxml.SoftwareList
             {
                 Tag = item.ReadString(Models.Metadata.SoftwareList.TagKey),
                 Name = item.ReadString(Models.Metadata.SoftwareList.NameKey),
diff --git a/CrossModel/Listxml.Serializer.cs b/CrossModel/Listxml.Serializer.cs
index e0085119..b4ca7dd3 100644
--- a/CrossModel/Listxml.Serializer.cs
+++ b/CrossModel/Listxml.Serializer.cs
@@ -724,7 +724,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="Models.Metadata.SoftwareList"/>
         /// </summary>
-        private static Models.Metadata.SoftwareList ConvertToInternalModel(SoftwareList item)
+        private static Models.Metadata.SoftwareList ConvertToInternalModel(Models.Listxml.SoftwareList item)
         {
             var softwareList = new Models.Metadata.SoftwareList
             {
diff --git a/CrossModel/Logiqx.Deserializer.cs b/CrossModel/Logiqx.Deserializer.cs
index c0233e1b..327d19ad 100644
--- a/CrossModel/Logiqx.Deserializer.cs
+++ b/CrossModel/Logiqx.Deserializer.cs
@@ -383,9 +383,9 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/>
         /// </summary>
-        private static SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item)
+        private static Models.Logiqx.SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item)
         {
-            var softwareList = new SoftwareList
+            var softwareList = new Models.Logiqx.SoftwareList
             {
                 Tag = item.ReadString(Models.Metadata.SoftwareList.TagKey),
                 Name = item.ReadString(Models.Metadata.SoftwareList.NameKey),
diff --git a/CrossModel/Logiqx.Serializer.cs b/CrossModel/Logiqx.Serializer.cs
index b3de627a..7ccf3ca9 100644
--- a/CrossModel/Logiqx.Serializer.cs
+++ b/CrossModel/Logiqx.Serializer.cs
@@ -332,7 +332,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="Models.Metadata.SoftwareList"/>
         /// </summary>
-        private static Models.Metadata.SoftwareList ConvertToInternalModel(SoftwareList item)
+        private static Models.Metadata.SoftwareList ConvertToInternalModel(Models.Logiqx.SoftwareList item)
         {
             var softwareList = new Models.Metadata.SoftwareList
             {
diff --git a/Files/XmlFile.Serializer.cs b/Files/XmlFile.Serializer.cs
index 1fb702b0..e3ff5024 100644
--- a/Files/XmlFile.Serializer.cs
+++ b/Files/XmlFile.Serializer.cs
@@ -28,9 +28,9 @@ namespace SabreTools.Serialization.Files
         /// <param name="subset">Optional DOCTYPE name</param>
         /// <returns>True on successful serialization, false otherwise</returns>
 #if NET48
-        public static bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
+        public bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
 #else
-        public static bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
+        public 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))