1.3.3v1.3.3

13 files changed, 43 insertions, 37 deletions

diff --git a/README.md b/README.md
index 1d43db01..1cc6836b 100644
--- a/README.md
+++ b/README.md
@@ -601,7 +601,9 @@ High-Level API(MessagePackSerializer)
 | `ToJson` | Dump message-pack binary to JSON string. It is useful for debugging.  |
 | `FromJson` | From Json string to MessagePack binary.  |
 
-MessagePack for C# operates at the byte[] level, so byte[] API is faster than Stream API.
+MessagePack for C# operates at the byte[] level, so byte[] API is faster than Stream API. If byte [] can be used for I/O, I recommend using the byte [] API.
+
+`Deserialize<T>(Stream)` has `bool readStrict` overload. It means read byte[] from stream strictly size. The default is false, it reads all stream data, it is faster than `readStrict` but if the data is contiguous, you can use readStrict = true.
 
 High-Level API uses memory pool internaly to avoid unnecessary memory allocation. If result size is under 64K, allocates GC memory only for the return bytes.
 
@@ -662,6 +664,7 @@ Primitive API(MessagePackBinary)
 | --- | --- |
 | ReadNext | Skip MessagePackFormat binary block, returns read size. |
 | ReadNextBlock | Skip MessagePackFormat binary block with sub structures(array/map), returns read size. This is useful for create deserializer. |
+| ReadMessageBlockFromStreamUnsafe | Read binary block from Stream, if readOnlySingleMessage = false then read sub structures(array/map). | 
 | Write/ReadMapHeader | Write/Read map format header(element length). |
 | WriteMapHeaderForceMap32Block | Write map format header, always use map32 format(length is fixed, 5). |
 | Write/ReadArrayHeader | Write/Read array format header(element length). |
@@ -678,7 +681,7 @@ Primitive API(MessagePackBinary)
 | FastResize | Buffer.BlockCopy version of Array.Resize. |
 | FastCloneWithResize | Same as FastResize but return copied byte[]. |
 
-Read API returns deserialized primitive and read size. Write API returns write size and guranteed auto ensure ref byte[].
+Read API returns deserialized primitive and read size. Write API returns write size and guranteed auto ensure ref byte[]. Write/Read API has `byte[]` overload and `Stream` overload, basically the byte[] API is faster.
 
 DateTime is serialized to [new MessagePack extension spec proposal](https://github.com/msgpack/msgpack/pull/209), it serialize/deserialize UTC and loses `Kind` info. If you use`NativeDateTimeResolver` serialized native DateTime binary format and it can keep `Kind` info but cannot communicate other platforms.
 
diff --git a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec
index 99b9344d..6fec18b7 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.3.2</version>
+        <version>1.3.3</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.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <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 117efed5..7983bf11 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.3.2</version>
+        <version>1.3.3</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.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="System.Collections.Immutable" version="1.3.1" />
             </group>
         </dependencies>
diff --git a/nuget/MessagePack.ReactiveProperty.nuspec b/nuget/MessagePack.ReactiveProperty.nuspec
index f3eabbca..4171fee6 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.3.2</version>
+        <version>1.3.3</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.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
                 <dependency id="ReactiveProperty" version="3.5.1" />
             </group>
         </dependencies>
diff --git a/nuget/MessagePack.UnityShims.nuspec b/nuget/MessagePack.UnityShims.nuspec
index 9fa133fb..f63fcda9 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.3.2</version>
+        <version>1.3.3</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.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
             </group>
             <group targetFramework=".NETStandard1.4">
-                <dependency id="MessagePack" version="1.3.2" />
+                <dependency id="MessagePack" version="1.3.3" />
             </group>
         </dependencies>
     </metadata>
diff --git a/nuget/MessagePack.nuspec b/nuget/MessagePack.nuspec
index 554c0821..24195679 100644
--- a/nuget/MessagePack.nuspec
+++ b/nuget/MessagePack.nuspec
@@ -2,14 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MessagePack</id>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <title>MessagePack for C#</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
         <projectUrl>https://github.com/neuecc/MessagePack-CSharp/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Extremely Fast MessagePack(MsgPack) Serializer for C#(.NET, .NET Core, Unity, Xamarin).</description>
-        <releaseNotes>fix dependency for .NET 4.7.</releaseNotes>
+        <releaseNotes>Add Stream API.</releaseNotes>
         <tags>MsgPack, MessagePack, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
         <frameworkAssemblies>
             <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
diff --git a/nuget/push.bat b/nuget/push.bat
index 1e9700c1..1ff15510 100644
--- a/nuget/push.bat
+++ b/nuget/push.bat
@@ -1,6 +1,6 @@
-nuget push MessagePack.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ImmutableCollection.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ReactiveProperty.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.UnityShims.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.AspNetCoreMvcFormatter.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.1.3.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ImmutableCollection.1.3.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ReactiveProperty.1.3.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.UnityShims.1.3.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.AspNetCoreMvcFormatter.1.3.3.nupkg -Source https://www.nuget.org/api/v2/package
 REM nuget push MessagePackAnalyzer.1.6.0.nupkg -Source https://www.nuget.org/api/v2/package
\ No newline at end of file
diff --git a/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs b/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs
index 856792b3..bf5f5597 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.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
\ No newline at end of file
diff --git a/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs b/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs
index cba12ea4..dc752f72 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.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
\ No newline at end of file
diff --git a/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs b/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs
index d5e38240..79dfa64f 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.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
\ No newline at end of file
diff --git a/src/MessagePack.UnityShims/_AssemblyInfo.cs b/src/MessagePack.UnityShims/_AssemblyInfo.cs
index 176dc292..35b5669a 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.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
\ No newline at end of file
diff --git a/src/MessagePack/Internal/TinyJsonReader.cs b/src/MessagePack/Internal/TinyJsonReader.cs
index 4b5b7848..809d3143 100644
--- a/src/MessagePack/Internal/TinyJsonReader.cs
+++ b/src/MessagePack/Internal/TinyJsonReader.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.Text;
 
@@ -215,31 +216,33 @@ namespace MessagePack
                 intChar = reader.Peek();
             }
 
+
+
             var number = numberWord.ToString();
             if (isDouble)
             {
                 double parsedDouble;
-                Double.TryParse(number, out parsedDouble);
+                Double.TryParse(number, NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite | NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands | NumberStyles.AllowExponent, System.Globalization.CultureInfo.InvariantCulture, out parsedDouble);
                 Value = parsedDouble;
             }
             else
             {
                 long parsedInt;
-                if (Int64.TryParse(number, out parsedInt))
+                if (Int64.TryParse(number, NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out parsedInt))
                 {
                     Value = parsedInt;
                     return;
                 }
 
                 ulong parsedULong;
-                if (ulong.TryParse(number, out parsedULong))
+                if (ulong.TryParse(number, NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out parsedULong))
                 {
                     Value = parsedULong;
                     return;
                 }
 
                 Decimal parsedDecimal;
-                if (decimal.TryParse(number, out parsedDecimal))
+                if (decimal.TryParse(number, NumberStyles.Number, System.Globalization.CultureInfo.InvariantCulture, out parsedDecimal))
                 {
                     Value = parsedDecimal;
                     return;
diff --git a/src/MessagePack/_AssemblyInfo.cs b/src/MessagePack/_AssemblyInfo.cs
index a70a0340..ce36f25b 100644
--- a/src/MessagePack/_AssemblyInfo.cs
+++ b/src/MessagePack/_AssemblyInfo.cs
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("b23e464e-0ac2-47c9-9520-ea98cbb99575")]
-[assembly: AssemblyVersion("1.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.3")]
\ No newline at end of file