Merge pull request #271 from msgpack/fix/issue-270

yfakariya · web-flow · commit ef57f2e33998 · 2017-11-11T10:29:24.000+09:00
Fix/issue 270
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -736,3 +736,9 @@ Relase 1.0.0-beta2 2017-10-29
   * System.Tuple<T> detection now ignores their declaring assemblies.
   * Improve exception message in AOT error of Unity.
   * .NET Standard 1.1/1.3 projects now do not depend on System.Linq.Expressions package.
+
+Release 1.0.0-rc1 T.B.D.
+
+  BUG FIXES
+  * Fix NRE in .NET Standard 1.1/1.3 build (this issue got mixed in beta2).
+  * Fix built-in Guid/BigInteger always output raw type even if PackerCompatibilityOptions.PackBinaryAsRaw is not specified. #270
diff --git a/build/RunUnitTests.cmd b/build/RunUnitTests.cmd
@@ -1,8 +1,13 @@
 dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj
+if not %errorlevel% == 0 exit /b 1
 dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj
+if not %errorlevel% == 0 exit /b 1
 dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj
+if not %errorlevel% == 0 exit /b 1
 nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/net35/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
+if not %errorlevel% == 0 exit /b 1
 nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/net35/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
+if not %errorlevel% == 0 exit /b 1
 @rem WinRT related tests require developer license...
 @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT/AppPackages/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug.appx 
 @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions.WinRT/AppPackages/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug.appx
diff --git a/build/Version.txt b/build/Version.txt
@@ -1 +1 @@
-1.0.0-beta2
+1.0.0-rc
diff --git a/src/MsgPack/ReflectionAbstractions.cs b/src/MsgPack/ReflectionAbstractions.cs
@@ -212,7 +212,7 @@ public static MethodInfo GetRuntimeMethod( this Type source, string name, Type[]
 					);
 		}
 
-#else
+#else // NETSTANDARD1_1 || NETSTANDARD1_3
 		public static MethodInfo GetRuntimeMethod( this Type source, string name, Type[] parameters )
 		{
 			return
@@ -242,6 +242,13 @@ public static PropertyInfo GetRuntimeProperty( this Type source, string name )
 				);
 		}
 
+#if NET35 || SILVERLIGHT
+		public static IEnumerable<PropertyInfo> GetRuntimeProperties( this Type source )
+		{
+			return source.GetProperties( BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic );
+		}
+#endif // NET35 || SILVERLIGHT
+
 #if DEBUG
 		public static FieldInfo GetRuntimeField( this Type source, string name )
 		{
diff --git a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs
@@ -320,7 +320,7 @@ public System_GuidMessagePackSerializer( SerializationContext ownerContext )
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
 		protected internal override void PackToCore( Packer packer, System.Guid value )
 		{
-			packer.PackRaw( value.ToByteArray() );
+			packer.PackBinary( value.ToByteArray() );
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
@@ -345,7 +345,7 @@ protected internal override System.Guid UnpackFromCore( Unpacker unpacker )
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
 		protected internal override async Task PackToAsyncCore( Packer packer, System.Guid value, CancellationToken cancellationToken )
 		{
-			await packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );
+			await packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
@@ -922,7 +922,7 @@ public System_Numerics_BigIntegerMessagePackSerializer( SerializationContext own
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
 		protected internal override void PackToCore( Packer packer, System.Numerics.BigInteger value )
 		{
-			packer.PackRaw( value.ToByteArray() );
+			packer.PackBinary( value.ToByteArray() );
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
@@ -947,7 +947,7 @@ protected internal override System.Numerics.BigInteger UnpackFromCore( Unpacker
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
 		protected internal override async Task PackToAsyncCore( Packer packer, System.Numerics.BigInteger value, CancellationToken cancellationToken )
 		{
-			await packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );
+			await packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );
 		}
 
 		[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]
diff --git a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt
@@ -166,17 +166,17 @@ var workArounds =
 	{
 		{ typeof( char ), new WorkAround(){ PackCode = "packer.Pack( ( System.UInt16 )value );", UnpackCode = "return ( System.Char ) unpacker.LastReadData.AsUInt16(); " } },
 		{ typeof( decimal ), new WorkAround(){ PackCode = "packer.PackString( value.ToString( \"G\", CultureInfo.InvariantCulture ) );", UnpackCode = "return System.Decimal.Parse( unpacker.LastReadData.AsString(), CultureInfo.InvariantCulture ); " } },
-		{ typeof( Guid ), new WorkAround(){ PackCode = "packer.PackRaw( value.ToByteArray() );", UnpackCode = "return new System.Guid( unpacker.LastReadData.AsBinary() ); " } },
-		{ typeof( BigInteger ), new WorkAround(){ PackCode = "packer.PackRaw( value.ToByteArray() );", UnpackCode = "return new System.Numerics.BigInteger( unpacker.LastReadData.AsBinary() ); " } },
+		{ typeof( Guid ), new WorkAround(){ PackCode = "packer.PackBinary( value.ToByteArray() );", UnpackCode = "return new System.Guid( unpacker.LastReadData.AsBinary() ); " } },
+		{ typeof( BigInteger ), new WorkAround(){ PackCode = "packer.PackBinary( value.ToByteArray() );", UnpackCode = "return new System.Numerics.BigInteger( unpacker.LastReadData.AsBinary() ); " } },
 	};
 
 var asyncWorkArounds =
 	new Dictionary<Type, string>()
 	{
 		{ typeof( char ), "packer.PackAsync( ( System.UInt16 )value, cancellationToken ).ConfigureAwait( false );" },
 		{ typeof( decimal ), "packer.PackStringAsync( value.ToString( \"G\", CultureInfo.InvariantCulture ), cancellationToken ).ConfigureAwait( false );" },
-		{ typeof( Guid ), "packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );" },
-		{ typeof( BigInteger ), "packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );" },
+		{ typeof( Guid ), "packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );" },
+		{ typeof( BigInteger ), "packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );" },
 	};
 
 var notInSLs =
diff --git a/src/MsgPack/Serialization/Metadata/_MessagePackSerializer.cs b/src/MsgPack/Serialization/Metadata/_MessagePackSerializer.cs
@@ -19,6 +19,7 @@
 #endregion -- License Terms --
 
 using System;
+using System.Linq;
 using System.Reflection;
 
 namespace MsgPack.Serialization.Metadata
@@ -27,8 +28,12 @@ namespace MsgPack.Serialization.Metadata
 	internal static class _MessagePackSerializer
 	{
 		// ReSharper disable InconsistentNaming
-		public static readonly MethodInfo Create1_Method = typeof( MessagePackSerializer ).GetRuntimeMethod( nameof( MessagePackSerializer.Create ), new[] { typeof( SerializationContext ) } );
+		public static readonly MethodInfo Create1_Method = typeof( MessagePackSerializer ).GetMethod( nameof( MessagePackSerializer.Create ), new[] { typeof( SerializationContext ) } );
 		// ReSharper restore InconsistentNaming
-		public static readonly PropertyInfo OwnerContext = typeof( MessagePackSerializer ).GetRuntimeProperty( nameof( MessagePackSerializer.OwnerContext ) );
+		public static readonly PropertyInfo OwnerContext =
+			typeof( MessagePackSerializer )
+			// Use LINQ to get non public property in netstandard 1.x
+			.GetRuntimeProperties()
+			.Single( p => p.Name == nameof( MessagePackSerializer.OwnerContext ) );
 	}
 }
diff --git a/test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj b/test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Mono.Cecil" Version="0.10.0-beta6" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.7" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" />
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -9285,7 +9285,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -9304,7 +9304,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
diff --git a/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest.CodeDom/Serialization/MapCodeDomBasedAutoMessagePackSerializerTest.cs
@@ -9597,7 +9597,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
@@ -9617,7 +9617,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
diff --git a/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj b/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Mono.Cecil" Version="0.10.0-beta6" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.7" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.5" />
     <PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs
@@ -9285,7 +9285,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -9304,7 +9304,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs
@@ -5567,7 +5567,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -5586,7 +5586,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
diff --git a/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs
@@ -9186,7 +9186,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -9205,7 +9205,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
diff --git a/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude b/test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude
@@ -4315,7 +4315,7 @@ namespace MsgPack.Serialization
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -4327,7 +4327,7 @@ namespace MsgPack.Serialization
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
@@ -4354,7 +4354,7 @@ namespace MsgPack.Serialization
 			Assert.That(
 				serializedItem,
 				Is.EqualTo(
-					new byte[] { 0x92, 0xB0 }.Concat( item.Id.ToByteArray() )
+					new byte[] { 0x92, MessagePackCode.Bin8, 0x10 }.Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
 			);
@@ -4366,7 +4366,7 @@ namespace MsgPack.Serialization
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
diff --git a/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs
@@ -9597,7 +9597,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
@@ -9617,7 +9617,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
diff --git a/test/MsgPack.UnitTest/Serialization/MapGenerationBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapGenerationBasedAutoMessagePackSerializerTest.cs
@@ -5567,7 +5567,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
@@ -5587,7 +5587,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
diff --git a/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs b/test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs
@@ -9498,7 +9498,7 @@ public void TestReadOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
@@ -9518,7 +9518,7 @@ public void TestGetOnlyAndConstructor()
 			Assert.That(
 				serializedItem,
 				Is.EqualTo( new byte[] { 0x82, 0xA2 }.Concat( Encoding.UTF8.GetBytes( "Id" ) )
-					.Concat( new byte[] { 0xB0 } ).Concat( item.Id.ToByteArray() )
+					.Concat( new byte[] { MessagePackCode.Bin8, 0x10 } ).Concat( item.Id.ToByteArray() )
 					.Concat( new byte[] { 0xA4 } ).Concat( Encoding.UTF8.GetBytes( "Ints" ) )
 					.Concat( new byte[] { 0x92, 5, 11 } ).ToArray()
 				)
diff --git a/test/MsgPack.UnitTest/Serialization/RegressionTests.cs b/test/MsgPack.UnitTest/Serialization/RegressionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public static MethodInfo GetRuntimeMethod( this Type source, string name, Type[]`
`212`	`212`	`);`
`213`	`213`	`}`
`214`	`214`
`215`		`-#else`
	`215`	`+#else // NETSTANDARD1_1 \|\| NETSTANDARD1_3`
`216`	`216`	`public static MethodInfo GetRuntimeMethod( this Type source, string name, Type[] parameters )`
`217`	`217`	`{`
`218`	`218`	`return`
`@@ -242,6 +242,13 @@ public static PropertyInfo GetRuntimeProperty( this Type source, string name )`
`242`	`242`	`);`
`243`	`243`	`}`
`244`	`244`
	`245`	`+#if NET35 \|\| SILVERLIGHT`
	`246`	`+ public static IEnumerable<PropertyInfo> GetRuntimeProperties( this Type source )`
	`247`	`+ {`
	`248`	`+ return source.GetProperties( BindingFlags.Instance \| BindingFlags.Static \| BindingFlags.Public \| BindingFlags.NonPublic );`
	`249`	`+ }`
	`250`	`+#endif // NET35 \|\| SILVERLIGHT`
	`251`	`+`
`245`	`252`	`#if DEBUG`
`246`	`253`	`public static FieldInfo GetRuntimeField( this Type source, string name )`
`247`	`254`	`{`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public System_GuidMessagePackSerializer( SerializationContext ownerContext )`
`320`	`320`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`321`	`321`	`protected internal override void PackToCore( Packer packer, System.Guid value )`
`322`	`322`	`{`
`323`		`- packer.PackRaw( value.ToByteArray() );`
	`323`	`+ packer.PackBinary( value.ToByteArray() );`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`@@ -345,7 +345,7 @@ protected internal override System.Guid UnpackFromCore( Unpacker unpacker )`
`345`	`345`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`346`	`346`	`protected internal override async Task PackToAsyncCore( Packer packer, System.Guid value, CancellationToken cancellationToken )`
`347`	`347`	`{`
`348`		`- await packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );`
	`348`	`+ await packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`@@ -922,7 +922,7 @@ public System_Numerics_BigIntegerMessagePackSerializer( SerializationContext own`
`922`	`922`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`923`	`923`	`protected internal override void PackToCore( Packer packer, System.Numerics.BigInteger value )`
`924`	`924`	`{`
`925`		`- packer.PackRaw( value.ToByteArray() );`
	`925`	`+ packer.PackBinary( value.ToByteArray() );`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`@@ -947,7 +947,7 @@ protected internal override System.Numerics.BigInteger UnpackFromCore( Unpacker`
`947`	`947`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`
`948`	`948`	`protected internal override async Task PackToAsyncCore( Packer packer, System.Numerics.BigInteger value, CancellationToken cancellationToken )`
`949`	`949`	`{`
`950`		`- await packer.PackRawAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );`
	`950`	`+ await packer.PackBinaryAsync( value.ToByteArray(), cancellationToken ).ConfigureAwait( false );`
`951`	`951`	`}`
`952`	`952`
`953`	`953`	`[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated by caller in base class" )]`