Merge pull request #164 from akkadotnet/dev

v0.9.14 Release

Author: Aaronontheweb

README.md

@@ -4,7 +4,7 @@
 
 A high performance polymorphic serializer for the .NET framework.
 
-Current status: **BETA** (v0.9.12).
+Current status: **BETA** (v0.9.14).
 
 ## License
 Licensed under Apache 2.0, see [LICENSE](LICENSE) for the full text.

RELEASE_NOTES.md

@@ -1,3 +1,3 @@
-### 0.9.13 February 09 2020 ####
+### 0.9.14 February 13 2020 ####
 
-* [Added support for serializing and deserializing `IDictionary<TKey, TValue>`](https://github.com/akkadotnet/Hyperion/pull/156)
+* [Added support for serializing and deserializing `IDictionary<TKey, TValue>` with private and protected default constructor] (https://github.com/akkadotnet/Hyperion/pull/162)

src/Hyperion.Tests/GenericDictionarySerializerTests.cs

@@ -9,15 +9,41 @@ namespace Hyperion.Tests
     public class GenericDictionarySerializerTests : TestBase
     {
         [Fact]
-        public void CanSerializeDictionary()
+        public void CanSerializeDictionaryWithPublicDefaultConstructor()
         {
             var customDict = new CustomDictionary<string, int>(new Dictionary<string, int>()
             {
-                ["key"] = 1
+                ["key1"] = 1,
+                ["key2"] = 2,
+                ["key3"] = 2,
             });
             SerializeAndAssertEquivalent(customDict);
         }
-        
+
+        [Fact]
+        public void CanSerializeDictionaryWithPrivateDefaultConstructor()
+        {
+            var customDict = new PrivateCustomDictionary<string, int>(new Dictionary<string, int>()
+            {
+                ["key1"] = 1,
+                ["key2"] = 2,
+                ["key3"] = 2,
+            });
+            SerializeAndAssertEquivalent(customDict);
+        }
+
+        [Fact]
+        public void CanSerializeDictionaryWithProtectedDefaultConstructor()
+        {
+            var customDict = new ProtectedCustomDictionary<string, int>(new Dictionary<string, int>()
+            {
+                ["key1"] = 1,
+                ["key2"] = 2,
+                ["key3"] = 2,
+            });
+            SerializeAndAssertEquivalent(customDict);
+        }
+
         private void SerializeAndAssertEquivalent<T>(T expected)
         {
             Serialize(expected);
@@ -27,6 +53,24 @@ private void SerializeAndAssertEquivalent<T>(T expected)
             AssertMemoryStreamConsumed();
         }
 
+        class PrivateCustomDictionary<TKey, TValue> : CustomDictionary<TKey, TValue>
+        {
+            private PrivateCustomDictionary() : base(new Dictionary<TKey, TValue>())
+            { }
+
+            public PrivateCustomDictionary(Dictionary<TKey, TValue> dict) : base(new Dictionary<TKey, TValue>())
+            { }
+        }
+
+        class ProtectedCustomDictionary<TKey, TValue> : CustomDictionary<TKey, TValue>
+        {
+            protected ProtectedCustomDictionary() : base(new Dictionary<TKey, TValue>())
+            { }
+
+            public ProtectedCustomDictionary(Dictionary<TKey, TValue> dict) : base(new Dictionary<TKey, TValue>())
+            { }
+        }
+
         /// <summary>
         /// Just a custom class wrapper for another <see cref="IDictionary{TKey,TValue}"/>
         /// </summary>

src/Hyperion.Tests/Hyperion.Tests.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />

src/Hyperion/Hyperion.csproj

@@ -11,11 +11,13 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 

src/Hyperion/SerializerFactories/DictionarySerializerFactory.cs

@@ -44,7 +44,14 @@ public override ValueSerializer BuildSerializer(Serializer serializer, Type type
 
             ObjectReader reader = (stream, session) =>
             {
-                var instance = Activator.CreateInstance(type); // IDictionary<TKey, TValue>
+                object instance;
+                try
+                {
+                    instance = Activator.CreateInstance(type, true); // IDictionary<TKey, TValue>
+                } catch(Exception) {
+                    instance = Activator.CreateInstance(type); // IDictionary<TKey, TValue>
+                }
+
                 if (preserveObjectReferences)
                 {
                     session.TrackDeserializedObject(instance);