Skip to content

Commit 195f43c

Browse files
committed
Fix build error for netcoreapp1.0
1 parent 5544f89 commit 195f43c

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

test/MsgPack.UnitTest/UnpackerFactoryTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,13 @@ public void TestCreate_WithBuffering()
113113
Assert.That( streamUnpacker.DebugOwnsStream, Is.False );
114114
#if !SILVERLIGHT
115115
Assert.That( streamUnpacker.DebugSource, Is.Not.SameAs( stream ) );
116+
#if NETSTANDARD1_1 || NETSTANDARD1_3
117+
// Avoid type name conflicts between netcoreapp and msgpack
118+
Assert.That( streamUnpacker.DebugSource.GetType().FullName, Is.EqualTo( "System.IO.BufferedStream" ) );
119+
Assert.That( streamUnpacker.DebugSource.GetType().GetAssembly().FullName, Is.EqualTo( typeof( MessagePackObject ).GetAssembly().FullName ) );
120+
#else // NETSTANDARD1_1 || NETSTANDARD1_3
116121
Assert.That( streamUnpacker.DebugSource, Is.InstanceOf<BufferedStream>() );
122+
#endif // // NETSTANDARD1_1 || NETSTANDARD1_3
117123
#else
118124
Assert.That( streamUnpacker.DebugSource, Is.SameAs( stream ) );
119125
#endif // !SILVERLIGHT

0 commit comments

Comments
 (0)