Remove System.Collections.Immutable (#61)

2025-01-12 12:26:31 -05:00 · 2019-01-03 20:44:15 -03:00 · 2019-01-03 20:44:15 -03:00 · b3dfcf217e
commit b3dfcf217e
parent aa906291d8
23 changed files with 79 additions and 101 deletions
--- a/OpenDiablo2.Common.UT/OpenDiablo2.Common.UT.csproj
+++ b/OpenDiablo2.Common.UT/OpenDiablo2.Common.UT.csproj
@ -3,7 +3,7 @@
  <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{77B00705-A2A5-4675-9A16-1FAB2692151B}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.Common/Enums/eArmorType.cs
+++ b/OpenDiablo2.Common/Enums/eArmorType.cs
@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@ -16,12 +15,13 @@ namespace OpenDiablo2.Common.Enums

    public static class eArmorTypeHelper
    {
-        private static readonly ImmutableDictionary<eArmorType, string> tokens = new Dictionary<eArmorType, string>()
+        private static readonly Dictionary<eArmorType, string> tokens = new Dictionary<eArmorType, string>()
        {
            { eArmorType.Lite   , "lit" },
            { eArmorType.Medium , "med" },
            { eArmorType.Heavy  , "hvy" }
-        }.ToImmutableDictionary();
+        };
+
        public static string ToToken(this eArmorType armorType) => tokens[armorType];
        public static eArmorType ToArmorType(this string source) => tokens.First(x => x.Value.ToUpper() == source.ToUpper()).Key;
    }
--- a/OpenDiablo2.Common/Enums/eHero.cs
+++ b/OpenDiablo2.Common/Enums/eHero.cs
@ -15,7 +15,6 @@
 */

 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;

 namespace OpenDiablo2.Common.Enums
@ -34,7 +33,7 @@ namespace OpenDiablo2.Common.Enums

    public static class eHeroExtensions
    {
-        public readonly static ImmutableDictionary<eHero, string> tokens = new Dictionary<eHero, string>
+        public readonly static Dictionary<eHero, string> tokens = new Dictionary<eHero, string>
        {
            { eHero.Amazon      , "AM" },
            { eHero.Sorceress   , "SO" },
@ -43,7 +42,7 @@ namespace OpenDiablo2.Common.Enums
            { eHero.Barbarian   , "BA" },
            { eHero.Druid       , "DZ" },
            { eHero.Assassin    , "AI" }
-        }.ToImmutableDictionary();
+        };

        public static string ToToken(this eHero source) => tokens[source];
        public static eHero ToHero(this string source) => tokens.First(x => x.Value.ToUpper() == source.ToUpper()).Key;
--- a/OpenDiablo2.Common/Interfaces/IEngineDataManager.cs
+++ b/OpenDiablo2.Common/Interfaces/IEngineDataManager.cs
@ -1,22 +1,22 @@
 using OpenDiablo2.Common.Enums;
 using OpenDiablo2.Common.Interfaces.Mobs;
 using OpenDiablo2.Common.Models;
-using System.Collections.Immutable;
+using System.Collections.Generic;

 namespace OpenDiablo2.Common.Interfaces
 {
    public interface IEngineDataManager
    {
-        ImmutableList<LevelDetail> Levels { get; }
-        ImmutableList<LevelPreset> LevelPresets { get; }
-        ImmutableList<LevelType> LevelTypes { get; }
-        ImmutableList<Item> Items { get; }
-        ImmutableDictionary<eHero, ILevelExperienceConfig> ExperienceConfigs { get; }
-        ImmutableDictionary<eHero, IHeroTypeConfig> HeroTypeConfigs { get; }
-        ImmutableList<IEnemyTypeConfig> EnemyTypeConfigs { get; }
-        ImmutableList<ObjectInfo> Objects { get; }
-        ImmutableList<ObjectTypeInfo> ObjectTypes { get; }
-        ImmutableDictionary<int, IMissileTypeConfig> MissileTypeConfigs { get; }
-        ImmutableDictionary<string, int> MissileTypeConfigsLookup { get; }
+        List<LevelDetail> Levels { get; }
+        List<LevelPreset> LevelPresets { get; }
+        List<LevelType> LevelTypes { get; }
+        List<Item> Items { get; }
+        Dictionary<eHero, ILevelExperienceConfig> ExperienceConfigs { get; }
+        Dictionary<eHero, IHeroTypeConfig> HeroTypeConfigs { get; }
+        List<IEnemyTypeConfig> EnemyTypeConfigs { get; }
+        List<ObjectInfo> Objects { get; }
+        List<ObjectTypeInfo> ObjectTypes { get; }
+        Dictionary<int, IMissileTypeConfig> MissileTypeConfigs { get; }
+        Dictionary<string, int> MissileTypeConfigsLookup { get; }
    }
 }
--- a/OpenDiablo2.Common/Models/ButtonLayout.cs
+++ b/OpenDiablo2.Common/Models/ButtonLayout.cs
@ -16,7 +16,6 @@

 using OpenDiablo2.Common.Enums;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Drawing;

 namespace OpenDiablo2.Common.Models
@ -36,7 +35,7 @@ namespace OpenDiablo2.Common.Models

        public bool IsDarkenedWhenDisabled => DisabledFrame == -1;

-        public static ImmutableDictionary<eButtonType, ButtonLayout> Values { get; } = new Dictionary<eButtonType, ButtonLayout>
+        public static Dictionary<eButtonType, ButtonLayout> Values { get; } = new Dictionary<eButtonType, ButtonLayout>
        {
            {eButtonType.Wide,  new ButtonLayout { XSegments = 2, ResourceName = ResourcePaths.WideButtonBlank, PaletteName = Palettes.Units } },
            {eButtonType.Medium, new ButtonLayout{ ResourceName = ResourcePaths.MediumButtonBlank, PaletteName = Palettes.Units } },
@ -52,7 +51,7 @@ namespace OpenDiablo2.Common.Models
            {eButtonType.MinipanelMessage, new ButtonLayout { ResourceName = ResourcePaths.MinipanelButton, PaletteName = Palettes.Units, BaseFrame = 10 } },
            {eButtonType.MinipanelQuest, new ButtonLayout { ResourceName = ResourcePaths.MinipanelButton, PaletteName = Palettes.Units, BaseFrame = 12 } },
            {eButtonType.MinipanelMenu, new ButtonLayout { ResourceName = ResourcePaths.MinipanelButton, PaletteName = Palettes.Units, BaseFrame = 14 } },
-            
+
            {eButtonType.SecondaryInvHand, new ButtonLayout { ResourceName = ResourcePaths.InventoryWeaponsTab, PaletteName = Palettes.Units,
                ClickableRect = new Rectangle(0, 0, 0, 20), AllowFrameChange = false } },
            {eButtonType.Run, new ButtonLayout { ResourceName = ResourcePaths.RunButton, PaletteName = Palettes.Units, Toggleable = true } },
@ -60,7 +59,7 @@ namespace OpenDiablo2.Common.Models
            {eButtonType.GoldCoin, new ButtonLayout { ResourceName = ResourcePaths.GoldCoinButton, PaletteName = Palettes.Units } },
            {eButtonType.Close, new ButtonLayout { ResourceName = ResourcePaths.SquareButton, PaletteName = Palettes.Units, BaseFrame = 10 } },
            {eButtonType.Skill, new ButtonLayout { ResourceName = ResourcePaths.AddSkillButton, PaletteName = Palettes.Units, DisabledFrame = 2 } },
-        }.ToImmutableDictionary();
+        };
    }

 }
--- a/OpenDiablo2.Common/Models/ItemContainerLayout.cs
+++ b/OpenDiablo2.Common/Models/ItemContainerLayout.cs
@ -15,7 +15,6 @@
 */

 using System.Collections.Generic;
-using System.Collections.Immutable;
 using OpenDiablo2.Common.Enums;

 namespace OpenDiablo2.Common.Models
@ -26,7 +25,7 @@ namespace OpenDiablo2.Common.Models
        public string PaletteName { get; internal set; } = Palettes.Units;
        public int BaseFrame { get; internal set; } = 0;

-        public static ImmutableDictionary<eItemContainerType, ItemContainerLayout> Values { get; } = new Dictionary<eItemContainerType, ItemContainerLayout>
+        public static Dictionary<eItemContainerType, ItemContainerLayout> Values { get; } = new Dictionary<eItemContainerType, ItemContainerLayout>
        {
            {eItemContainerType.Helm,  new ItemContainerLayout { ResourceName = ResourcePaths.HelmGlovePlaceholder,  BaseFrame = 1 } },
            {eItemContainerType.Amulet, new ItemContainerLayout{ ResourceName = ResourcePaths.RingAmuletPlaceholder  } },
@ -36,7 +35,7 @@ namespace OpenDiablo2.Common.Models
            {eItemContainerType.Ring, new ItemContainerLayout { ResourceName = ResourcePaths.RingAmuletPlaceholder, BaseFrame = 1 } },
            {eItemContainerType.Glove, new ItemContainerLayout { ResourceName = ResourcePaths.HelmGlovePlaceholder } },
            {eItemContainerType.Boots, new ItemContainerLayout { ResourceName = ResourcePaths.BootsPlaceholder } },
-        }.ToImmutableDictionary();
+        };
    }

 }
--- a/OpenDiablo2.Common/Models/Mobs/LevelExperienceConfig.cs
+++ b/OpenDiablo2.Common/Models/Mobs/LevelExperienceConfig.cs
@ -3,7 +3,6 @@ using OpenDiablo2.Common.Exceptions;
 using OpenDiablo2.Common.Interfaces.Mobs;
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@ -36,7 +35,7 @@ namespace OpenDiablo2.Common.Models.Mobs

    public static class LevelExperienceConfigHelper
    {
-        public static ImmutableDictionary<eHero, ILevelExperienceConfig> ToLevelExperienceConfigs(this string[][] data)
+        public static Dictionary<eHero, ILevelExperienceConfig> ToLevelExperienceConfigs(this string[][] data)
        {
            Dictionary<eHero, ILevelExperienceConfig> result = new Dictionary<eHero, ILevelExperienceConfig>();
            for (int i = 1; i < data[0].Length; i++)
@ -66,7 +65,7 @@ namespace OpenDiablo2.Common.Models.Mobs
                result.Add(herotype, new LevelExperienceConfig(expperlevel));
            }

-            return result.ToImmutableDictionary();
+            return result;
        }
    }
 }
--- a/OpenDiablo2.Common/OpenDiablo2.Common.csproj
+++ b/OpenDiablo2.Common/OpenDiablo2.Common.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{B743160E-A0BB-45DC-9998-967A85E50562}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
@ -33,12 +33,6 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.12.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
-      <HintPath>..\packages\NetSword.Common.ICSharpCode.SharpZipLib.0.84.0\lib\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
@ -53,6 +47,12 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
+    <Reference Include="DotNetZip">
+      <HintPath>..\packages\DotNetZip.1.13.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Attributes\MessageFrameAttribute.cs" />
--- a/OpenDiablo2.Common/packages.config
+++ b/OpenDiablo2.Common/packages.config
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.12.0" targetFramework="net461" />
+  <package id="DotNetZip" version="1.13.0" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
  <package id="NetSword.Common.ICSharpCode.SharpZipLib" version="0.84.0" targetFramework="net461" developmentDependency="true" />
-  <package id="SharpZipLib" version="1.0.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
+  <package id="SharpZipLib" version="1.1.0" targetFramework="net461" />
 </packages>
--- a/OpenDiablo2.Core/EngineDataManager.cs
+++ b/OpenDiablo2.Core/EngineDataManager.cs
@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@ -19,18 +18,18 @@ namespace OpenDiablo2.Core

        private readonly IMPQProvider mpqProvider;

-        public ImmutableList<LevelDetail> Levels { get; internal set; }
-        public ImmutableList<LevelPreset> LevelPresets { get; internal set; }
-        public ImmutableList<LevelType> LevelTypes { get; internal set; }
-        public ImmutableList<ObjectInfo> Objects { get; internal set; }
-        public ImmutableList<ObjectTypeInfo> ObjectTypes { get; internal set; }
+        public List<LevelDetail> Levels { get; internal set; }
+        public List<LevelPreset> LevelPresets { get; internal set; }
+        public List<LevelType> LevelTypes { get; internal set; }
+        public List<ObjectInfo> Objects { get; internal set; }
+        public List<ObjectTypeInfo> ObjectTypes { get; internal set; }

-        public ImmutableList<Item> Items { get; internal set; }
-        public ImmutableDictionary<eHero, ILevelExperienceConfig> ExperienceConfigs { get; internal set; }
-        public ImmutableDictionary<eHero, IHeroTypeConfig> HeroTypeConfigs { get; internal set; }
-        public ImmutableList<IEnemyTypeConfig> EnemyTypeConfigs { get; internal set; } 
-        public ImmutableDictionary<int, IMissileTypeConfig> MissileTypeConfigs { get; internal set; }
-        public ImmutableDictionary<string, int> MissileTypeConfigsLookup { get; internal set; }
+        public List<Item> Items { get; internal set; }
+        public Dictionary<eHero, ILevelExperienceConfig> ExperienceConfigs { get; internal set; }
+        public Dictionary<eHero, IHeroTypeConfig> HeroTypeConfigs { get; internal set; }
+        public List<IEnemyTypeConfig> EnemyTypeConfigs { get; internal set; } 
+        public Dictionary<int, IMissileTypeConfig> MissileTypeConfigs { get; internal set; }
+        public Dictionary<string, int> MissileTypeConfigsLookup { get; internal set; }

        public EngineDataManager(IMPQProvider mpqProvider)
        {
@ -55,9 +54,8 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x.Count() >= 36 && x[0] != "Expansion")
                .Select(x => x.ToLevelType())
-                .ToImmutableList();
+                .ToList();

-            
            log.Info("Loading level presets");
            LevelPresets = mpqProvider
                .GetTextFile(ResourcePaths.LevelPreset)
@ -66,8 +64,8 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x.Count() >= 24 && x[0] != "Expansion")
                .Select(x => x.ToLevelPreset())
-                .ToImmutableList();
-            
+                .ToList();
+
            log.Info("Loading level details");
            Levels = mpqProvider
                .GetTextFile(ResourcePaths.LevelDetails)
@ -76,7 +74,7 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x.Count() > 80 && x[0] != "Expansion")
                .Select(x => x.ToLevelDetail(LevelPresets, LevelTypes))
-                .ToImmutableList();
+                .ToList();

            log.Info("Loading objects");
            Objects = mpqProvider
@ -86,7 +84,7 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x.Count() > 150 && x[0] != "Expansion")
                .Select(x => x.ToObjectInfo())
-                .ToImmutableList();
+                .ToList();

            log.Info("Loading object types");
            ObjectTypes = mpqProvider
@ -96,17 +94,15 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x.Count() == 3 && x[0] != "Expansion")
                .Select(x => x.ToObjectTypeInfo())
-                .ToImmutableList();
-
-
+                .ToList();
        }

-        private ImmutableList<Item> LoadItemData()
+        private List<Item> LoadItemData()
            => new List<Item>()
                .Concat(LoadWeaponData())
                .Concat(LoadArmorData())
                .Concat(LoadMiscData())
-                .ToImmutableList();
+                .ToList();

        private IEnumerable<Weapon> LoadWeaponData()
        {
@ -153,7 +149,7 @@ namespace OpenDiablo2.Core
            HeroTypeConfigs = LoadHeroTypeConfig();
        }

-        private ImmutableDictionary<eHero, ILevelExperienceConfig> LoadExperienceConfig()
+        private Dictionary<eHero, ILevelExperienceConfig> LoadExperienceConfig()
            => mpqProvider
                .GetTextFile(ResourcePaths.Experience)
                .Where(x => !String.IsNullOrWhiteSpace(x))
@ -161,7 +157,7 @@ namespace OpenDiablo2.Core
                .ToArray()
                .ToLevelExperienceConfigs();

-        private ImmutableDictionary<eHero, IHeroTypeConfig> LoadHeroTypeConfig()
+        private Dictionary<eHero, IHeroTypeConfig> LoadHeroTypeConfig()
            => mpqProvider
                .GetTextFile(ResourcePaths.CharStats)
                .Skip(1)
@ -169,7 +165,7 @@ namespace OpenDiablo2.Core
                .Select(x => x.Split('\t'))
                .Where(x => x[0] != "Expansion")
                .ToArray()
-                .ToImmutableDictionary(x => (eHero)Enum.Parse(typeof(eHero), x[0]), x => x.ToHeroTypeConfig());
+                .ToDictionary(x => (eHero)Enum.Parse(typeof(eHero), x[0]), x => x.ToHeroTypeConfig());

        private void LoadEnemyData()
        {
@ -177,25 +173,23 @@ namespace OpenDiablo2.Core
            //EnemyTypeConfigs = LoadEnemyTypeConfig();
        }

-        private ImmutableList<IEnemyTypeConfig> LoadEnemyTypeConfig()
-            => mpqProvider
+        private List<IEnemyTypeConfig> LoadEnemyTypeConfig()
+            => (List<IEnemyTypeConfig>)mpqProvider
                .GetTextFile(ResourcePaths.MonStats)
                .Skip(1)
                .Where(x => !String.IsNullOrWhiteSpace(x))
                .Select(x => x.Split('\t'))
                .Where(x => x[0] != "Expansion" && x[0] != "unused")
                .ToArray()
-                .Select(x => x.ToEnemyTypeConfig())
-                .ToImmutableList();
+                .Select(x => x.ToEnemyTypeConfig());

        private void LoadSkillData()
        {
            MissileTypeConfigs = LoadMissileTypeConfig();
-            MissileTypeConfigsLookup = MissileTypeConfigs.Values
-                .ToImmutableDictionary(x => x.Name, x => x.Id);
+            MissileTypeConfigsLookup = MissileTypeConfigs.Values.ToDictionary(x => x.Name, x => x.Id);
        }

-        private ImmutableDictionary<int, IMissileTypeConfig> LoadMissileTypeConfig()
+        private Dictionary<int, IMissileTypeConfig> LoadMissileTypeConfig()
        {
            var data = mpqProvider
                .GetTextFile(ResourcePaths.Missiles)
@ -205,7 +199,7 @@ namespace OpenDiablo2.Core
                .ToArray()
                .Skip(1)
                .Select(x => x.ToMissileTypeConfig())
-                .ToImmutableDictionary(x => x.Id, x => x);
+                .ToDictionary(x => x.Id, x => x);

            return data;
        }
--- a/OpenDiablo2.Core/OpenDiablo2.Core.csproj
+++ b/OpenDiablo2.Core/OpenDiablo2.Core.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{8FC6BF7D-835A-47C1-A6B2-125495FA0900}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.Core/packages.config
+++ b/OpenDiablo2.Core/packages.config
@ -3,6 +3,5 @@
  <package id="Autofac" version="4.8.1" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
  <package id="Xabe.FFmpeg" version="3.1.4" targetFramework="net461" />
 </packages>
--- a/OpenDiablo2.GameServer/OpenDiablo2.GameServer.csproj
+++ b/OpenDiablo2.GameServer/OpenDiablo2.GameServer.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{C29A84E8-E708-4BE2-9946-202899B68E19}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.GameServer/packages.config
+++ b/OpenDiablo2.GameServer/packages.config
@ -2,5 +2,4 @@
 <packages>
  <package id="Autofac" version="4.8.1" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
 </packages>
--- a/OpenDiablo2.MapGenerators/OpenDiablo2.MapGenerators.csproj
+++ b/OpenDiablo2.MapGenerators/OpenDiablo2.MapGenerators.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{A3370223-A28B-45B8-AD79-C17EAD99AF36}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.MapGenerators/packages.config
+++ b/OpenDiablo2.MapGenerators/packages.config
@ -2,5 +2,4 @@
 <packages>
  <package id="Autofac" version="4.8.1" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
 </packages>
--- a/OpenDiablo2.SDL2/OpenDiablo2.SDL2.csproj
+++ b/OpenDiablo2.SDL2/OpenDiablo2.SDL2.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{1F8731D5-393B-4561-9CEA-887A2F466576}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.Scenes/OpenDiablo2.Scenes.csproj
+++ b/OpenDiablo2.Scenes/OpenDiablo2.Scenes.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{05224FE7-293F-4184-B1D6-89F5171B60E0}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.ServiceBus/OpenDiablo2.ServiceBus.csproj
+++ b/OpenDiablo2.ServiceBus/OpenDiablo2.ServiceBus.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{D3F0F44F-2AB4-4342-A684-53193032A621}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/OpenDiablo2.TestConsole/OpenDiablo2.TestConsole.csproj
+++ b/OpenDiablo2.TestConsole/OpenDiablo2.TestConsole.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{40BD2DDE-DC6F-4F6D-9050-9B423C631192}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>OpenDiablo2.TestConsole</RootNamespace>
@ -34,7 +34,6 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@ -49,7 +48,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
-    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\OpenDiablo2.Common\OpenDiablo2.Common.csproj">
--- a/OpenDiablo2.TestConsole/packages.config
+++ b/OpenDiablo2.TestConsole/packages.config
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
-</packages>
--- a/OpenDiablo2/OpenDiablo2.csproj
+++ b/OpenDiablo2/OpenDiablo2.csproj
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{2B0CF1AC-06DD-4322-AE8B-FF8A8C70A3CD}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <RootNamespace>OpenDiablo2</RootNamespace>
@ -63,7 +63,6 @@
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"/>
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
--- a/OpenDiablo2/packages.config
+++ b/OpenDiablo2/packages.config
@ -4,7 +4,6 @@
  <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
  <package id="System.Console" version="4.3.1" targetFramework="net461" />
  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />