Switch to XmlSerializer so order does not matter

Author: JamJar00

src/Profile.cs

@@ -1,15 +1,16 @@
 using System;
 using System.IO;
-using System.Runtime.Serialization;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace DarkRift.Cli
 {
     /// <summary>
     /// Holds a user's profile settings.
     /// </summary>
-    [DataContract(Name = "Profile")]
-    class Profile
+    // Namespace here is because we used to use DataContractSerializer
+    [XmlRoot(Namespace="http://schemas.datacontract.org/2004/07/DarkRift.Cli")]
+    public class Profile
     {
         /// <summary>
         /// The DarkRift settings directory path.
@@ -24,13 +25,11 @@ class Profile
         /// <summary>
         /// The user's Unity Asset Store invoice number.
         /// </summary>
-        [DataMember]
         public string InvoiceNumber { get; set; }
-        
+
         /// <summary>
         /// The latest version we know of for DarkRift.
         /// </summary>
-        [DataMember]
         public string LatestKnownDarkRiftVersion { get; set; }
 
         /// <summary>
@@ -44,16 +43,16 @@ public static Profile Load()
                 try {
                     using (XmlReader reader = XmlReader.Create(Path.Combine(USER_DR_DIR, "profile.xml")))
                     {
-                        DataContractSerializer ser = new DataContractSerializer(typeof(Profile));
-                        instance = (Profile)ser.ReadObject(reader, true);
+                        XmlSerializer ser = new XmlSerializer(typeof(Profile));
+                        instance = (Profile)ser.Deserialize(reader);
                     }
                 }
                 catch (IOException)
                 {
                     instance = new Profile();
                 }
             }
-            
+
             return instance;
         }
 
@@ -65,9 +64,9 @@ public void Save()
             Directory.CreateDirectory(USER_DR_DIR);
             using (XmlWriter writer = XmlWriter.Create(Path.Combine(USER_DR_DIR, "profile.xml"), new XmlWriterSettings { Indent = true }))
             {
-                DataContractSerializer ser = new DataContractSerializer(typeof(Profile));
-                ser.WriteObject(writer, this);
+                XmlSerializer ser = new XmlSerializer(typeof(Profile));
+                ser.Serialize(writer, this);
             }
         }
     }
-}
+}

src/Project.cs

@@ -1,15 +1,15 @@
-using System;
 using System.IO;
-using System.Runtime.Serialization;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace DarkRift.Cli
 {
     /// <summary>
     /// Holds a project's settings.
     /// </summary>
-    [DataContract(Name = "Project")]
-    class Project
+    // Namespace here is because we used to use DataContractSerializer
+    [XmlRoot(Namespace="http://schemas.datacontract.org/2004/07/DarkRift.Cli")]
+    public class Project
     {
         /// <summary>
         /// The singleton instance of the profile class.
@@ -19,7 +19,6 @@ class Project
         /// <summary>
         ///     The runtime settings.
         /// </summary>
-        [DataMember]
         public Runtime Runtime { get; set; }
 
         /// <summary>
@@ -33,16 +32,16 @@ public static Project Load()
                 try {
                     using (XmlReader reader = XmlReader.Create("Project.xml"))
                     {
-                        DataContractSerializer ser = new DataContractSerializer(typeof(Project));
-                        instance = (Project)ser.ReadObject(reader, true);
+                        XmlSerializer ser = new XmlSerializer(typeof(Project));
+                        instance = (Project)ser.Deserialize(reader);
                     }
                 }
                 catch (IOException)
                 {
                     instance = new Project();
                 }
             }
-            
+
             return instance;
         }
 
@@ -53,8 +52,8 @@ public void Save()
         {
             using (XmlWriter writer = XmlWriter.Create("Project.xml", new XmlWriterSettings { Indent = true }))
             {
-                DataContractSerializer ser = new DataContractSerializer(typeof(Project));
-                ser.WriteObject(writer, this);
+                XmlSerializer ser = new XmlSerializer(typeof(Project));
+                ser.Serialize(writer, this);
             }
         }
 
@@ -68,4 +67,4 @@ public static bool IsCurrentDirectoryAProject()
             return File.Exists("Project.xml");
         }
     }
-}
+}

src/Runtime.cs

@@ -1,32 +1,34 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace DarkRift.Cli
 {
     /// <summary>
     /// Holds a project's runtime settings.
     /// </summary>
-    [DataContract(Name = "Runtime")]
-    class Runtime
+    public class Runtime
     {
         /// <summary>
         /// The version of DarkRift to use.
         /// </summary>
-        [DataMember]
         public String Version { get; set; }
 
         /// <summary>
         /// If .NET core or .NET framework should be used.
         /// </summary>
-        [DataMember]
         public ServerPlatform Platform { get; set; }
 
         /// <summary>
         /// The tier of DarkRift to use.
         /// </summary>
-        [DataMember]
         public ServerTier Tier { get; set; }
 
+        /// <summary>
+        /// Creates a new Runtime configuration element.
+        /// </summary>
+        public Runtime()
+        {
+        }
+
         /// <summary>
         /// Creates a new Runtime configuration element.
         /// </summary>

src/ServerPlatform.cs

@@ -4,7 +4,7 @@ namespace DarkRift.Cli
     /// <summary>
     /// The .NET platform the server targets.
     /// </summary>
-    enum ServerPlatform
+    public enum ServerPlatform
     {
         Framework,
         Core

src/ServerTier.cs

@@ -3,9 +3,9 @@ namespace DarkRift.Cli
     /// <summary>
     /// The tier of DarkRift server.
     /// </summary>
-    enum ServerTier
+    public enum ServerTier
     {
         Free,
         Pro
     }
-}
+}

src/VersionMetadata.cs

@@ -37,4 +37,4 @@ public static VersionMetadata Parse(string jsonString)
             }
         }
     }
-}
+}