Release 1.0.0 (#15)

alexvaluyskiy · web-flow · commit f251f9301ca0 · 2017-08-30T14:18:05.000+03:00
* Update to .NET Standard 2.0

* updated to the latest MsgPack

* update Readme

* fixci
diff --git a/Akka.Serialization.MessagePack.Tests/Akka.Serialization.MessagePack.Tests.csproj b/Akka.Serialization.MessagePack.Tests/Akka.Serialization.MessagePack.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,16 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta2-*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.3.0-beta4-*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-*" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta2-*" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta4-*" />
   </ItemGroup>
-  
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/Akka.Serialization.MessagePack.Tests/MsgPackVersionToleranceTests.cs b/Akka.Serialization.MessagePack.Tests/MsgPackVersionToleranceTests.cs
@@ -20,22 +20,30 @@ public MsgPackVersionToleranceTests() : base(ConfigFactory.GetConfig(typeof(MsgP
         {
         }
 
-        [Fact(Skip = "Not implemented yet")]
-        public void Can_serialize_typeless_message_from_NET_on_NETCORE_and_vise_versa()
+        [Fact]
+        public void Can_deserialize_Uri_message_which_was_serialized_on_full_NET()
         {
-#if NETCOREAPP1_1
+            // TypelessClass with System.URI serialized on .NET
             var serializedString = "gaZOZXN0ZWTJAAAAbWTZVVN5c3RlbS5VcmksIFN5c3RlbSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODm1aHR0cDovL21pY3Jvc29mdC5jb20v";
-#else
-            var serializedString = "gaZOZXN0ZWTJAAAANWS+U3lzdGVtLlVyaSwgU3lzdGVtLlByaXZhdGUuVXJptWh0dHA6Ly9taWNyb3NvZnQuY29tLw==";
-#endif
-            var simpleString = Encoding.UTF8.GetString(Convert.FromBase64String(serializedString));
 
             var deserialized = MessagePackSerializer.Deserialize<TypelessClass>(
                 Convert.FromBase64String(serializedString),
                 TypelessContractlessStandardResolver.Instance);
             Assert.Equal(new Uri("http://microsoft.com"), deserialized.Nested);
         }
 
+        [Fact]
+        public void Can_deserialize_TimeSpan_message_which_was_serialized_on_full_NET()
+        {
+            // TypelessClass with System.TimeSpan serialized on .NET
+            var serializedString = "gaZOZXN0ZWTJAAAAH2S5U3lzdGVtLlRpbWVTcGFuLCBtc2NvcmxpYs6y0F4A";
+
+            var deserialized = MessagePackSerializer.Deserialize<TypelessClass>(
+                Convert.FromBase64String(serializedString),
+                TypelessContractlessStandardResolver.Instance);
+            Assert.Equal(TimeSpan.FromMinutes(5), deserialized.Nested);
+        }
+
         [Fact]
         public void Can_ignore_unexpected_data()
         {
diff --git a/Akka.Serialization.MessagePack/Akka.Serialization.MessagePack.csproj b/Akka.Serialization.MessagePack/Akka.Serialization.MessagePack.csproj
@@ -5,8 +5,8 @@
     <Copyright>Copyright © 2017</Copyright>
     <Authors>Akka.NET Contrib</Authors>
     <Description>MessagePack serializer for Akka.NET</Description>
-    <VersionPrefix>0.9.0</VersionPrefix>
-    <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageTags>akka;actors;actor model;Akka;concurrency;messagepack;serializer;serialization</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
@@ -17,11 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Akka" Version="1.3.0" />
-    <PackageReference Include="MessagePack" Version="1.4.4" />
-    <PackageReference Include="MessagePack.ImmutableCollection" Version="1.4.4" />
+    <PackageReference Include="MessagePack" Version="1.6.0.3" />
+    <PackageReference Include="MessagePack.ImmutableCollection" Version="1.6.0.3" />
   </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/Akka.Serialization.MessagePack/MsgPackSerializer.cs b/Akka.Serialization.MessagePack/MsgPackSerializer.cs
@@ -23,9 +23,7 @@ public sealed class MsgPackSerializer : Serializer
         static MsgPackSerializer()
         {
             CompositeResolver.RegisterAndSetAsDefault(
-#if SERIALIZABLE
-                Akka.Serialization.MessagePack.Resolvers.SerializableResolver.Instance,
-#endif
+                SerializableResolver.Instance,
                 AkkaResolver.Instance,
                 ImmutableCollectionResolver.Instance,
                 TypelessContractlessStandardResolver.Instance);
@@ -70,7 +68,7 @@ public override object FromBinary(byte[] bytes, Type type)
             }
         }
 
-        public override int Identifier => 41;
+        public override int Identifier => 150;
 
         public override bool IncludeManifest => false;
     }
diff --git a/Akka.Serialization.MessagePack/Resolvers/ExceptionFallbackResolver.cs b/Akka.Serialization.MessagePack/Resolvers/ExceptionFallbackResolver.cs
diff --git a/Akka.Serialization.MessagePack/Resolvers/SerializableResolver.cs b/Akka.Serialization.MessagePack/Resolvers/SerializableResolver.cs
@@ -4,7 +4,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-#if SERIALIZABLE
 using System;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -104,5 +103,4 @@ public T Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResol
             return (T)obj;
         }
     }
-}
-#endif
+}
diff --git a/Akka.Serialization.Testkit/Akka.Serialization.Testkit.csproj b/Akka.Serialization.Testkit/Akka.Serialization.Testkit.csproj
@@ -1,18 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Akka.TestKit" Version="1.3.0" />
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.3.0-beta" />
-    <PackageReference Include="FluentAssertions" Version="4.19.2" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.3.0" />
+    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
-  </PropertyGroup>
-
 </Project>
diff --git a/Akka.Serialization.Testkit/ExceptionsTests.cs b/Akka.Serialization.Testkit/ExceptionsTests.cs
@@ -4,8 +4,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-#if SERIALIZABLE
-
 using FluentAssertions;
 using System;
 using System.Runtime.Serialization;
@@ -155,5 +153,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
             }
         }
     }
-}
-#endif
+}
diff --git a/Akka.Serialization.Testkit/PolymorphismTests.cs b/Akka.Serialization.Testkit/PolymorphismTests.cs
@@ -28,6 +28,17 @@ public virtual void Can_Serialize_MessageWithObjectPropertyPrimitive()
             AssertEqual(actual);
         }
 
+        [Fact]
+        public virtual void Can_Serialize_MessageWithObjectPropertyPrimitive_do_not_downcast_to_byte()
+        {
+            var actual = new PolymorphismMessages.ImmutableMessageWithObjectTypes
+            {
+                Name = "John",
+                Data = 125
+            };
+            AssertEqual(actual);
+        }
+
         [Fact]
         public virtual void Can_Serialize_MessageWithObjectPropertyComplex()
         {
diff --git a/README.md b/README.md
@@ -4,12 +4,16 @@ Akka.Serialization.MessagePack
 
 Akka.NET serialization with [MessagePack](https://github.com/neuecc/MessagePack-CSharp)
 
+## Supported platforms
+- .NET Core 2.0 (via .NET Standard 2.0)
+- .NET Framework 4.6 and higher (via .NET Standard 2.0)
+
 ## It supports
 - Primitive types (`int`, `string`, `long`, etc)
 - Build-in types (`DateTime`, `DateTimeOffset`, `TimeSpan`, `Guid`, `Uri`, `Enum`, etc)
 - Collections (`List<T>`, `HashSet<T>`, `Dictionary<TKey, TValue>`, etc)
 - Immutable Collections
-- Exceptions (only on full .NET Framework)
+- Exceptions
 - Akka.NET specific types (`ActorPath` and `ActorRef`)
 - Object types (polymorphic serialization)
 - Generic types
@@ -21,7 +25,21 @@ Akka.NET serialization with [MessagePack](https://github.com/neuecc/MessagePack-
 - F# types (`Set`, `Map`, `List`, `FSharpAsync<T>`, discriminated unions)
 - Handling circular references
 - Preserve object references
-- Exceptions (on NetCore)
+
+## How to setup MessagePack as default serializer
+Bind MessagePack serializer using following HOCON configuration in your actor system settings:
+```json
+akka {
+  actor {
+    serializers {
+      messagepack = "Akka.Serialization.MessagePack.MsgPackSerializer, Akka.Serialization.MessagePack"
+    }
+    serialization-bindings {
+      "System.Object" = messagepack
+    }
+  }
+}
+```
 
 ## Maintainer
 - [alexvaluyskiy](https://github.com/alexvaluyskiy)
diff --git a/build.ps1 b/build.ps1
@@ -32,8 +32,8 @@ Param(
 $FakeVersion = "4.61.2"
 $NBenchVersion = "1.0.1"
 $DotNetChannel = "preview";
-$DotNetVersion = "1.0.4";
-$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1";
+$DotNetVersion = "2.0.0";
+$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v2.0.0/scripts/obtain/dotnet-install.ps1";
 $NugetVersion = "4.1.0";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
 $ProtobufVersion = "3.2.0"

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public sealed class MsgPackSerializer : Serializer`
`23`	`23`	`static MsgPackSerializer()`
`24`	`24`	`{`
`25`	`25`	`CompositeResolver.RegisterAndSetAsDefault(`
`26`		`-#if SERIALIZABLE`
`27`		`- Akka.Serialization.MessagePack.Resolvers.SerializableResolver.Instance,`
`28`		`-#endif`
	`26`	`+ SerializableResolver.Instance,`
`29`	`27`	`AkkaResolver.Instance,`
`30`	`28`	`ImmutableCollectionResolver.Instance,`
`31`	`29`	`TypelessContractlessStandardResolver.Instance);`
`@@ -70,7 +68,7 @@ public override object FromBinary(byte[] bytes, Type type)`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`
`73`		`- public override int Identifier => 41;`
	`71`	`+ public override int Identifier => 150;`
`74`	`72`
`75`	`73`	`public override bool IncludeManifest => false;`
`76`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`// </copyright>`
`5`	`5`	`//-----------------------------------------------------------------------`
`6`	`6`
`7`		`-#if SERIALIZABLE`
`8`	`7`	`using System;`
`9`	`8`	`using System.Reflection;`
`10`	`9`	`using System.Runtime.Serialization;`
`@@ -104,5 +103,4 @@ public T Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResol`
`104`	`103`	`return (T)obj;`
`105`	`104`	`}`
`106`	`105`	`}`
`107`		`-}`
`108`		`-#endif`
	`106`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`// </copyright>`
`5`	`5`	`//-----------------------------------------------------------------------`
`6`	`6`
`7`		`-#if SERIALIZABLE`
`8`		`-`
`9`	`7`	`using FluentAssertions;`
`10`	`8`	`using System;`
`11`	`9`	`using System.Runtime.Serialization;`
`@@ -155,5 +153,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont`
`155`	`153`	`}`
`156`	`154`	`}`
`157`	`155`	`}`
`158`		`-}`
`159`		`-#endif`
	`156`	`+}`