merge

kianzarrin · Dec 12, 2022 · 342689d · 342689d
2 parents 0934e20 + 930080a
commit 342689d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/LoadOrder/CO/DLC.cs b/LoadOrder/CO/DLC.cs
@@ -63,8 +63,8 @@ public enum DLC {
         [DLCInfo("Plazas & Promenades", DLCType.Main)]
         PlazasAndPromenadesDLC = 2008400,
 
-        //[DLCInfo("Financial Districts", DLCType.Main)]
-        //FinancialDistrictsDLC = 2148901,
+        [DLCInfo("Financial Districts", DLCType.Main)]
+        FinancialDistrictsDLC = 2148901,
 
         [DLCInfo("Pearls From the East", DLCType.Misc)]
         OrientalBuildings = 563850,
@@ -126,7 +126,7 @@ public enum DLC {
         [DLCInfo("CCP: Heart of Korea", DLCType.ContentCreator)]
         ModderPack14 = 2144480,
 
-        //[DLCInfo("CCP: Map Pack 2", DLCType.ContentCreator)]
-        //ModderPack15 = 2148903,
+        [DLCInfo("CCP: Map Pack 2", DLCType.ContentCreator)]
+        ModderPack15 = 2148903,
     }
 }
diff --git a/LoadOrder/Shared/SharedUtil.cs b/LoadOrder/Shared/SharedUtil.cs
@@ -16,13 +16,8 @@ internal class SharedUtil {
 #endif
         internal static XmlWriterSettings Indented => new XmlWriterSettings() { Indent = true };
 
-        internal static XmlSerializerNamespaces NoNamespaces {
-            get {
-                var ret = new XmlSerializerNamespaces();
-                ret.Add("", "");
-                return ret;
-            }
-        }
+        internal static XmlSerializerNamespaces NoNamespaces =>
+            new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
 
         internal static void Serialize<T>(T obj, string filePath) {
             var serializer = new XmlSerializer(typeof(T));

diff --git a/Version.props b/Version.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AssemblyVersion>1.15.4.*</AssemblyVersion>
+    <AssemblyVersion>1.15.5.*</AssemblyVersion>
   </PropertyGroup>
 </Project>