File tree Expand file tree Collapse file tree 4 files changed +11
-8
lines changed Expand file tree Collapse file tree 4 files changed +11
-8
lines changed Original file line number Diff line number Diff line change 4444
4545namespace MsgPack
4646{
47- #if ! SILVERLIGHT && ! NETSTANDARD1_1 && ! NETSTANDARD1_3
47+ #if ! SILVERLIGHT && ! NETSTANDARD1_1 && ! NETSTANDARD1_3 && ! NETSTANDARD2_0
4848 [ Serializable ]
49- #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3
49+ #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0
5050 partial struct MessagePackObject : IPackable
5151#if FEATURE_TAP
5252 , IAsyncPackable
Original file line number Diff line number Diff line change 1- #region -- License Terms --
1+ #region -- License Terms --
22//
33// MessagePack for CLI
44//
@@ -43,9 +43,9 @@ namespace MsgPack
4343 /// <summary>
4444 /// Encapselates <see cref="String"/> and its serialized UTF-8 bytes.
4545 /// </summary>
46- #if ! SILVERLIGHT && ! NETSTANDARD1_1 && ! NETSTANDARD1_3
46+ #if ! SILVERLIGHT && ! NETSTANDARD1_1 && ! NETSTANDARD1_3 && ! NETSTANDARD2_0
4747 [ Serializable ]
48- #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3
48+ #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0
4949#if ! NET35 && ! UNITY
5050 [ SecuritySafeCritical ]
5151#endif // !NET35 && !UNITY
Original file line number Diff line number Diff line change 1- #region -- License Terms --
1+ #region -- License Terms --
22//
33// MessagePack for CLI
44//
@@ -1337,7 +1337,7 @@ public void TestValuesCopyTo()
13371337 Assert . That ( array [ 4 ] , Is . EqualTo ( MessagePackObject . Nil ) ) ;
13381338 }
13391339
1340- #if ! NETFX_CORE && ! SILVERLIGHT && ! UNITY && ! NETSTANDARD1_1 && ! NETSTANDARD1_3
1340+ #if ! NETFX_CORE && ! SILVERLIGHT && ! UNITY && ! NETSTANDARD1_1 && ! NETSTANDARD1_3 && ! NETSTANDARD2_0
13411341 [ Test ]
13421342 public void TestRuntimeSerialization_NotEmpty_RoundTripped ( )
13431343 {
@@ -1351,7 +1351,7 @@ public void TestRuntimeSerialization_NotEmpty_RoundTripped()
13511351 Assert . AreEqual ( target , deserialized ) ;
13521352 }
13531353 }
1354- #endif // !NETFX_CORE && !SILVERLIGHT && !UNITY && !NETSTANDARD1_1 && !NETSTANDARD1_3
1354+ #endif // !NETFX_CORE && !SILVERLIGHT && !UNITY && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0
13551355
13561356 private sealed class MyClass { }
13571357 }
Original file line number Diff line number Diff line change 769769 <LastGenOutput >UnpackerTest.cs</LastGenOutput >
770770 </None >
771771 </ItemGroup >
772+ <ItemGroup >
773+ <Compile Remove =" MessagePackObjectTest.RuntimeSerialization.cs" Condition =" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.0'" />
774+ </ItemGroup >
772775 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
773776 Other similar extension points exist, see Microsoft.Common.targets.
774777 <Target Name="BeforeBuild">
You can’t perform that action at this time.
0 commit comments