Fix WinRT build errors.

Author: yfakariya

src/MsgPack/Serialization/SerializationContext.cs

@@ -35,15 +35,15 @@
 using System.Diagnostics.Contracts;
 #endif // XAMIOS || XAMDROID
 #endif // !UNITY
-#if UNITY
+#if UNITY || NETFX_CORE
 using System.Linq;
-#endif // UNITY
+#endif // UNITY || NETFX_CORE
 #if NETFX_CORE
 using System.Linq.Expressions;
 #endif // NETFX_CORE
-#if UNITY || XAMIOS || XAMDROID
+#if UNITY || XAMIOS || XAMDROID || NETFX_CORE
 using System.Reflection;
-#endif // UNITY || XAMIOS || XAMDROID
+#endif // UNITY || XAMIOS || XAMDROID || NETFX_CORE
 using System.Threading;
 
 using MsgPack.Serialization.DefaultSerializers;
@@ -554,7 +554,7 @@ internal bool ContainsSerializer( Type rootType )
 		{
 			return
 				this._serializers.Contains( rootType )
-				|| ( rootType.IsGenericType && this._serializers.Contains( rootType.GetGenericTypeDefinition() ) );
+				|| ( rootType.GetIsGenericType() && this._serializers.Contains( rootType.GetGenericTypeDefinition() ) );
 		}
 
 		/// <summary>

test/MsgPack.UnitTest.BclExtensions.WinRT/MsgPack.UnitTest.BclExtensions.WinRT.csproj

@@ -157,8 +157,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Collections.Immutable">
-      <HintPath>..\..\packages\Microsoft.Bcl.Immutable.1.0.30\lib\portable-net45+win8+wp8\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">

test/MsgPack.UnitTest.BclExtensions.WinRT/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl.Immutable" version="1.0.30" targetFramework="win" />
+  <package id="System.Collections.Immutable" version="1.1.37" targetFramework="win" />
 </packages>

test/MsgPack.UnitTest/Serialization/SerializationContextTest.cs

@@ -436,9 +436,9 @@ public void TestResolveSerializer_SetNull_Generated()
 			var result = context.GetSerializer<Image>();
 			Assert.That( raised, Is.EqualTo( 1 ) );
 			Assert.That( result, Is.Not.Null );
-#if !NETFX_35 && !UNITY
-			Assert.That( result.GetType().Assembly.IsDynamic );
-#endif // !NETFX_35 && !UNITY
+#if !NETFX_35 && !UNITY && !NETFX_CORE && !SILVERLIGHT
+			Assert.That( result.GetType().GetAssembly().IsDynamic );
+#endif // !NETFX_35 && !UNITY && !NETFX_CORE && !SILVERLIGHT
 		}
 
 

test/MsgPack.UnitTest/Serialization/VersioningTest.cs

@@ -72,7 +72,7 @@ private static void TestExtraFieldCore( SerializationMethod method, EmitterFlavo
 					packer.Pack("Extra1");
 					packer.Pack(String40);
 					packer.Pack("Extra2");
-					packer.Pack(System.Text.UTF8Encoding.Default.GetBytes(String40));
+					packer.Pack(System.Text.Encoding.UTF8.GetBytes(String40));
 					packer.Pack("Field2");
 					packer.Pack( -1 );
 					packer.Pack("Extra3");