ready for 1.6.1v1.6.1

19 files changed, 107 insertions, 58 deletions

diff --git a/README.md b/README.md
index ad7e7aa9..a32688ba 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ Built-in support types
 ---
 These types can serialize by default.
 
-Primitives(`int`, `string`, etc...), `Enum`, `Nullable<>`,  `TimeSpan`,  `DateTime`, `DateTimeOffset`, `Nil`, `Guid`, `Uri`, `Version`, `StringBuilder`, `BitArray`, `ArraySegment<>`, `BigInteger`, `Complext`, `Task`, `Array[]`, `Array[,]`, `Array[,,]`, `Array[,,,]`, `KeyValuePair<,>`, `Tuple<,...>`, `ValueTuple<,...>`, `List<>`, `LinkedList<>`, `Queue<>`, `Stack<>`, `HashSet<>`, `ReadOnlyCollection<>`, `IList<>`, `ICollection<>`, `IEnumerable<>`, `Dictionary<,>`, `IDictionary<,>`, `SortedDictionary<,>`, `SortedList<,>`, `ILookup<,>`, `IGrouping<,>`, `ObservableCollection<>`, `ReadOnlyOnservableCollection<>`, `IReadOnlyList<>`, `IReadOnlyCollection<>`, `ISet<>`, `ConcurrentBag<>`, `ConcurrentQueue<>`, `ConcurrentStack<>`, `ReadOnlyDictionary<,>`, `IReadOnlyDictionary<,>`, `ConcurrentDictionary<,>`, `Lazy<>`, `Task<>` and custom inherited `ICollection<>` or `IDictionary<,>` with paramterless constructor.
+Primitives(`int`, `string`, etc...), `Enum`, `Nullable<>`,  `TimeSpan`,  `DateTime`, `DateTimeOffset`, `Nil`, `Guid`, `Uri`, `Version`, `StringBuilder`, `BitArray`, `ArraySegment<>`, `BigInteger`, `Complext`, `Task`, `Array[]`, `Array[,]`, `Array[,,]`, `Array[,,,]`, `KeyValuePair<,>`, `Tuple<,...>`, `ValueTuple<,...>`, `List<>`, `LinkedList<>`, `Queue<>`, `Stack<>`, `HashSet<>`, `ReadOnlyCollection<>`, `IList<>`, `ICollection<>`, `IEnumerable<>`, `Dictionary<,>`, `IDictionary<,>`, `SortedDictionary<,>`, `SortedList<,>`, `ILookup<,>`, `IGrouping<,>`, `ObservableCollection<>`, `ReadOnlyOnservableCollection<>`, `IReadOnlyList<>`, `IReadOnlyCollection<>`, `ISet<>`, `ConcurrentBag<>`, `ConcurrentQueue<>`, `ConcurrentStack<>`, `ReadOnlyDictionary<,>`, `IReadOnlyDictionary<,>`, `ConcurrentDictionary<,>`, `Lazy<>`, `Task<>`, custom inherited `ICollection<>` or `IDictionary<,>` with paramterless constructor, `IList`, `IDictionary` and custom inherited `ICollection` or `IDictionary` with paramterless constructor(includes `ArrayList` and `Hashtable`).
 
 You can add custom type support and has some official/third-party extension package. for ImmutableCollections(`ImmutableList<>`, etc), for ReactiveProperty and for Unity(`Vector3`, `Quaternion`, etc...), for F#(Record, FsList, Discriminated Unions, etc...). Please see [extensions section](https://github.com/neuecc/MessagePack-CSharp#extensions).
 
@@ -115,7 +115,6 @@ Object Serialization
 ---
 MessagePack for C# can serialze your own public `Class` or `Struct`. Serialization target must marks `[MessagePackObject]` and `[Key]`. Key type can choose int or string. If key type is int, serialized format is used array. If key type is string, serialized format is used map. If you define `[MessagePackObject(keyAsPropertyName: true)]`, does not require `KeyAttribute`.
 
-
 ```csharp
 [MessagePackObject]
 public class Sample1
@@ -510,21 +509,21 @@ If the number of nodes is large, search with a embedded binary search.
 
 Extra note, this is serialize benchmark result.
 
- |              Method |        Mean | Error | Scaled |  Gen 0 | Allocated |
- |-------------------- |------------:|------:|-------:|-------:|----------:|
- |              IntKey |    95.31 ns |    NA |   1.00 | 0.0094 |      40 B |
- |           StringKey |   225.33 ns |    NA |   2.36 | 0.0339 |     144 B |
- |     Typeless_IntKey |   168.00 ns |    NA |   1.76 | 0.0265 |     112 B |
- |  Typeless_StringKey |   325.38 ns |    NA |   3.41 | 0.0510 |     216 B |
- |       MsgPackCliMap | 1,158.00 ns |    NA |  12.15 | 0.1297 |     552 B |
- |     MsgPackCliArray |   332.33 ns |    NA |   3.49 | 0.1006 |     424 B |
- |         ProtobufNet |   260.88 ns |    NA |   2.74 | 0.0665 |     280 B |
- |            Hyperion |   300.12 ns |    NA |   3.15 | 0.1674 |     704 B |
- |       ZeroFormatter |   165.17 ns |    NA |   1.73 | 0.1009 |     424 B |
- |       JsonNetString | 1,524.97 ns |    NA |  16.00 | 0.4616 |    1944 B |
- | JsonNetStreamWriter | 1,847.29 ns |    NA |  19.38 | 1.5526 |    6522 B |
- |           JilString |   580.54 ns |    NA |   6.09 | 0.3481 |    1464 B |
- |     JilStreamWriter |   848.34 ns |    NA |   8.90 | 1.4448 |    6066 B |
+ |              Method |       Mean | Error | Scaled |  Gen 0 | Allocated |
+ |-------------------- |-----------:|------:|-------:|-------:|----------:|
+ |              IntKey |   109.3 ns |    NA |   1.00 | 0.0093 |      40 B |
+ |           StringKey |   170.8 ns |    NA |   1.56 | 0.0341 |     144 B |
+ |     Typeless_IntKey |   223.0 ns |    NA |   2.04 | 0.0265 |     112 B |
+ |  Typeless_StringKey |   279.1 ns |    NA |   2.55 | 0.0510 |     216 B |
+ |       MsgPackCliMap | 1,304.8 ns |    NA |  11.94 | 0.1297 |     552 B |
+ |     MsgPackCliArray |   409.7 ns |    NA |   3.75 | 0.1006 |     424 B |
+ |         ProtobufNet |   213.4 ns |    NA |   1.95 | 0.0665 |     280 B |
+ |            Hyperion |   359.6 ns |    NA |   3.29 | 0.1674 |     704 B |
+ |       ZeroFormatter |   186.7 ns |    NA |   1.71 | 0.1009 |     424 B |
+ |       JsonNetString | 1,814.3 ns |    NA |  16.60 | 0.4616 |    1944 B |
+ | JsonNetStreamWriter | 2,211.0 ns |    NA |  20.24 | 1.5526 |    6522 B |
+ |           JilString |   702.0 ns |    NA |   6.42 | 0.3481 |    1464 B |
+ |     JilStreamWriter |   988.0 ns |    NA |   9.04 | 1.4448 |    6066 B |
 
  Of course, IntKey is fastest but StringKey also good.
 
@@ -776,9 +775,11 @@ Primitive API(MessagePackBinary)
 | Write/ReadExtensionFormat | Write/Read ext format header(Length + TypeCode) and content byte[]. |
 | Write/ReadExtensionFormatHeader | Write/Read ext format, header(Length + TypeCode) only. |
 | WriteExtensionFormatHeaderForceExt32Block | Write ext format header, always use ext32 format(length is fixed, 6). |
+| WriteRaw | Write msgpack block directly. |
 | IsNil | Is TypeCode Nil? |
 | GetMessagePackType | Return MessagePackType of target MessagePack bianary position. |
 | GetExtensionFormatHeaderLength | Calculate extension formatter header length. |
+| GetEncodedStringBytes | Get msgpack packed raw binary. |
 | EnsureCapacity | Resize if byte can not fill.  |
 | FastResize | Buffer.BlockCopy version of Array.Resize. |
 | FastCloneWithResize | Same as FastResize but return copied byte[]. |
@@ -1005,6 +1006,27 @@ public class CustomObject
 
 Formatter is retrieved by `AttributeFormatterResolver`, it is included in `StandardResolver`.
 
+IgnoreFormatter
+---
+`IgnoreFormatter<T>` is lightweight extension point of class and struct, if exists can't serializable type in external type, you can register `IgnoreFormatter<T>` that serialize to nil.
+
+```csharp
+// CompositeResolver can set custom formatter.
+MessagePack.Resolvers.CompositeResolver.RegisterAndSetAsDefault(
+    new IMessagePackFormatter[] 
+    {
+        // for example, register reflection infos(can not serialize in default)
+        new IgnoreFormatter<MethodBase>(),
+        new IgnoreFormatter<MethodInfo>(),
+        new IgnoreFormatter<PropertyInfo>(),
+        new IgnoreFormatter<FieldInfo>()
+    },
+    new IFormatterResolver[] 
+    {
+        ContractlessStandardResolver.Instance
+    });
+```
+
 Reserved Extension Types
 ---
 MessagePack for C# already used some messagepack ext type codes, be careful to use same ext code.
diff --git a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec
index dceda473..d7eeabc2 100644
--- a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec
+++ b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack.AspNetCoreMvcFormatter</id>
-        <version>1.6.0.3</version>
+        <version>1.6.1</version>
         <title>ASP.NET Core MVC Input/Output MessagePack formatter</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -13,7 +13,7 @@
         <tags>MsgPack, MessagePack, Serialization, Formatter, Serializer, aspnetcore, aspnetcoremvc</tags>
         <dependencies>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="1.2.0" />
             </group>
         </dependencies>
diff --git a/nuget/MessagePack.ImmutableCollection.nuspec b/nuget/MessagePack.ImmutableCollection.nuspec
index 1e030fa6..a1389f6d 100644
--- a/nuget/MessagePack.ImmutableCollection.nuspec
+++ b/nuget/MessagePack.ImmutableCollection.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack.ImmutableCollection</id>
-        <version>1.6.0.3</version>
+        <version>1.6.1</version>
         <title>MessagePack for C# Extension Support for ImmutableCollection</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -17,15 +17,15 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
         </dependencies>
diff --git a/nuget/MessagePack.ReactiveProperty.nuspec b/nuget/MessagePack.ReactiveProperty.nuspec
index 4bfda009..85e805e2 100644
--- a/nuget/MessagePack.ReactiveProperty.nuspec
+++ b/nuget/MessagePack.ReactiveProperty.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack.ReactiveProperty</id>
-        <version>1.6.0.3</version>
+        <version>1.6.1</version>
         <title>MessagePack for C# Extension Support for ReactiveProperty</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -17,15 +17,15 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
         </dependencies>
diff --git a/nuget/MessagePack.UnityShims.nuspec b/nuget/MessagePack.UnityShims.nuspec
index 38458d7c..1a8f1c4f 100644
--- a/nuget/MessagePack.UnityShims.nuspec
+++ b/nuget/MessagePack.UnityShims.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack.UnityShims</id>
-        <version>1.6.0.3</version>
+        <version>1.6.1</version>
         <title>MessagePack for C# Extension Support for Unity(add pseudo Vector type and fast Vectory[] extension formatter)</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -17,13 +17,13 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.6.0.3" />
+                <dependency id="MessagePack" version="1.6.1" />
             </group>
         </dependencies>
     </metadata>
diff --git a/nuget/MessagePack.nuspec b/nuget/MessagePack.nuspec
index b2df0c85..efe2eb25 100644
--- a/nuget/MessagePack.nuspec
+++ b/nuget/MessagePack.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack</id>
-        <version>1.6.0.3</version>
+        <version>1.6.1</version>
         <title>MessagePack for C#</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
diff --git a/nuget/MessagePackAnalyzer.nuspec b/nuget/MessagePackAnalyzer.nuspec
index 9d1c6daf..56f95131 100644
--- a/nuget/MessagePackAnalyzer.nuspec
+++ b/nuget/MessagePackAnalyzer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePackAnalyzer</id>
-    <version>1.6.0.3</version>
+    <version>1.6.1</version>
     <title>MessagePackAnalyzer</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
diff --git a/nuget/push.bat b/nuget/push.bat
index 83499a07..552476ad 100644
--- a/nuget/push.bat
+++ b/nuget/push.bat
@@ -1,6 +1,6 @@
-nuget push MessagePack.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ImmutableCollection.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ReactiveProperty.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.UnityShims.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.AspNetCoreMvcFormatter.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
-REM nuget push MessagePackAnalyzer.1.6.0.3.nupkg -Source https://www.nuget.org/api/v2/package
\ No newline at end of file
+nuget push MessagePack.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ImmutableCollection.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ReactiveProperty.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.UnityShims.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.AspNetCoreMvcFormatter.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
+REM nuget push MessagePackAnalyzer.1.6.1.nupkg -Source https://www.nuget.org/api/v2/package
\ No newline at end of file
diff --git a/sandbox/PerfBenchmarkDotNet/Program.cs b/sandbox/PerfBenchmarkDotNet/Program.cs
index e2ffa4c8..1a502add 100644
--- a/sandbox/PerfBenchmarkDotNet/Program.cs
+++ b/sandbox/PerfBenchmarkDotNet/Program.cs
@@ -29,10 +29,10 @@ namespace PerfBenchmarkDotNet
             Add(MarkdownExporter.GitHub);
             Add(MemoryDiagnoser.Default);
 
-            //Add(Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X64).WithWarmupCount(1).WithTargetCount(1));
+            Add(Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X64).WithWarmupCount(1).WithTargetCount(1));
 
-            Add(Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X64).WithWarmupCount(1).WithTargetCount(1),
-              Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X86).WithWarmupCount(1).WithTargetCount(1));
+            //Add(Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X64).WithWarmupCount(1).WithTargetCount(1),
+              //Job.ShortRun.With(BenchmarkDotNet.Environments.Platform.X86).WithWarmupCount(1).WithTargetCount(1));
         }
     }
 
diff --git a/sandbox/Sandbox/Program.cs b/sandbox/Sandbox/Program.cs
index 5ffb46a3..aeaecf32 100644
--- a/sandbox/Sandbox/Program.cs
+++ b/sandbox/Sandbox/Program.cs
@@ -299,9 +299,20 @@ namespace Sandbox
             {
                 // var ex = new Dummy___();
 
+                // CompositeResolver can set custom formatter.
                 MessagePack.Resolvers.CompositeResolver.RegisterAndSetAsDefault(
-                    new[] { new IgnoreFormatter<MethodBase>() },
-                    new[] { ContractlessStandardResolver.Instance });
+                    new IMessagePackFormatter[] 
+                    {
+                        // for example, register reflection infos(can not serialize in default)
+                        new IgnoreFormatter<MethodBase>(),
+                        new IgnoreFormatter<MethodInfo>(),
+                        new IgnoreFormatter<PropertyInfo>(),
+                        new IgnoreFormatter<FieldInfo>()
+                    },
+                    new IFormatterResolver[] 
+                    {
+                        ContractlessStandardResolver.Instance
+                    });
 
                 var bin = MessagePack.MessagePackSerializer.Serialize(ex);
 
diff --git a/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs b/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs
index ca443e1b..cc4fcb57 100644
--- a/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs
+++ b/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("7c1f59ed-3929-4cbb-8aca-b13139fbca3a")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
diff --git a/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs b/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs
index 9814853c..949a61d0 100644
--- a/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs
+++ b/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("fe5a979e-24c6-47dd-919f-81df6fb2e160")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
diff --git a/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs b/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs
index 17ebe21d..1d14f7fc 100644
--- a/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs
+++ b/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("16b0640a-c86d-4f21-bf2f-45efc728ae96")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs
index 47901821..90b0def7 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs
@@ -154,6 +154,11 @@ namespace System.Reflection
             return type.GetMethods();
         }
 
+        public bool IsAssignableFrom(TypeInfo c)
+        {
+            return type.IsAssignableFrom(c.AsType());
+        }
+
         public PropertyInfo GetDeclaredProperty(string name)
         {
             return type.GetProperty(name);
@@ -240,7 +245,7 @@ namespace System.Reflection
         {
             return type.GetCustomAttributes(inherit).OfType<T>().FirstOrDefault();
         }
-        
+
 #else
 
         public static bool IsConstructedGenericType(this TypeInfo type)
diff --git a/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj b/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj
index 68f25ab0..84b7dd04 100644
--- a/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj
+++ b/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj
@@ -104,6 +104,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ForceSizePrimitiveFormatter.tt</DependentUpon>
     </Compile>
+    <Compile Include="Assets\Scripts\MessagePack\Formatters\IgnoreFormatter.cs" />
     <Compile Include="Assets\Scripts\MessagePack\Formatters\IMessagePackFormatter.cs" />
     <Compile Include="Assets\Scripts\MessagePack\Formatters\MultiDimentionalArrayFormatter.cs" />
     <Compile Include="Assets\Scripts\MessagePack\Formatters\NullableFormatter.cs" />
@@ -138,6 +139,12 @@
     <Compile Include="Assets\Scripts\MessagePack\Internal\ReflectionExtensions.cs" />
     <Compile Include="Assets\Scripts\MessagePack\Internal\ThreadsafeTypeKeyHashTable.cs" />
     <Compile Include="Assets\Scripts\MessagePack\Internal\TinyJsonReader.cs" />
+    <Compile Include="Assets\Scripts\MessagePack\Internal\UnsafeMemory.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>UnsafeMemory.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Assets\Scripts\MessagePack\Internal\UnsafeMemory.Low.cs" />
     <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.cs" />
     <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Helper.cs" />
     <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Safe.cs" />
@@ -209,6 +216,10 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>ValueTupleFormatter.cs</LastGenOutput>
     </None>
+    <None Include="Assets\Scripts\MessagePack\Internal\UnsafeMemory.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>UnsafeMemory.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
diff --git a/src/MessagePack.UnityClient/ProjectSettings/ProjectVersion.txt b/src/MessagePack.UnityClient/ProjectSettings/ProjectVersion.txt
index ca1aa057..cbb019c9 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/ProjectVersion.txt
+++ b/src/MessagePack.UnityClient/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f3
+m_EditorVersion: 2017.1.0f1
diff --git a/src/MessagePack.UnityShims/_AssemblyInfo.cs b/src/MessagePack.UnityShims/_AssemblyInfo.cs
index 2820dc75..41d8e57a 100644
--- a/src/MessagePack.UnityShims/_AssemblyInfo.cs
+++ b/src/MessagePack.UnityShims/_AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("4b074f49-f7cb-4885-9a58-cc75a7d64b62")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
diff --git a/src/MessagePack/_AssemblyInfo.cs b/src/MessagePack/_AssemblyInfo.cs
index 8120ca7d..2eb1bc70 100644
--- a/src/MessagePack/_AssemblyInfo.cs
+++ b/src/MessagePack/_AssemblyInfo.cs
@@ -12,8 +12,8 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("b23e464e-0ac2-47c9-9520-ea98cbb99575")]
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]
 
 // sn.exe -Tp
 //[assembly: InternalsVisibleTo("MessagePack.Tests, PublicKey=" +
diff --git a/src/MessagePackAnalyzer/Properties/AssemblyInfo.cs b/src/MessagePackAnalyzer/Properties/AssemblyInfo.cs
index eea40098..776d7f38 100644
--- a/src/MessagePackAnalyzer/Properties/AssemblyInfo.cs
+++ b/src/MessagePackAnalyzer/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.6.0.3")]
-[assembly: AssemblyFileVersion("1.6.0.3")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]