Skip to content

Commit 52380f6

Browse files
yfakariyayfakariya
committed
Fix packaging problems.
* System.Numeric.Vectors causes FileLoadException for WP 8.1 project, so remove from netstandard1.1. * System.Reflection.Emit prevents nuget package restore in WinRT or UWP, so remove it with releated serializer builders and Metadata constants. * System.Diagnostics.TraceSources also prevents nuget package restore in WinRT or UWP, so removed.
1 parent 4f484a3 commit 52380f6

41 files changed

Lines changed: 134 additions & 174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MsgPack.nuspec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ This package provides MessagePack serialization/deserialization APIs. This pacak
3838
<dependency id="System.IO" version="4.1.0-rc2-24027" />
3939
<dependency id="System.Linq" version="4.1.0-rc2-24027" />
4040
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
41-
<dependency id="System.Numerics.Vectors" version="4.1.1-rc2-24027" />
4241
<dependency id="System.ObjectModel" version="4.0.12-rc2-24027" />
4342
<dependency id="System.Reflection" version="4.1.0-rc2-24027" />
44-
<dependency id="System.Reflection.Emit" version="4.0.1-rc2-24027" />
4543
<dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
4644
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" />
4745
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
@@ -64,15 +62,13 @@ This package provides MessagePack serialization/deserialization APIs. This pacak
6462
<dependency id="System.Diagnostics.Contracts" version="4.0.1-rc2-24027" />
6563
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027 " />
6664
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24027 " />
67-
<dependency id="System.Diagnostics.TraceSource" version="4.0.0-rc2-24027" />
6865
<dependency id="System.Globalization" version="4.0.11-rc2-24027" />
6966
<dependency id="System.IO" version="4.1.0-rc2-24027" />
7067
<dependency id="System.Linq" version="4.1.0-rc2-24027" />
7168
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
7269
<dependency id="System.Numerics.Vectors" version="4.1.1-rc2-24027" />
7370
<dependency id="System.ObjectModel" version="4.0.12-rc2-24027" />
7471
<dependency id="System.Reflection" version="4.1.0-rc2-24027" />
75-
<dependency id="System.Reflection.Emit" version="4.0.1-rc2-24027" />
7672
<dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
7773
<dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" />
7874
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />

‎Sync.Test.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
<Exclude Path="Serialization\ArrayGenerationBasedAutoMessagePackSerializerTest.cs" />
181181
<Exclude Path="Serialization\ArrayGenerationBasedEnumSerializationTest.cs" />
182182
<Exclude Path="Serialization\CodeDomBasedNilImplicationTest.cs" />
183+
<Exclude Path="Serialization\CompositeTest.cs" />
183184
<Exclude Path="Serialization\ContextBasedNilImplicationTest.cs" />
184185
<Exclude Path="Serialization\FieldBasedNilImplicationTest.cs" />
185186
<Exclude Path="Serialization\GenerationBasedNilImplicationTest.cs" />

‎src/MsgPack/Serialization/MessagePackSerializer.Factories.cs‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
#define AOT
2424
#endif
2525

26+
#if !AOT && !SILVERLIGHT && !NETSTD_11 && !NETSTD_13
27+
#define FEATURE_EMIT
28+
#endif // !AOT && !SILVERLIGHT && !NETSTD_11 && !NETSTD_13
29+
2630
using System;
2731
using System.IO;
2832
using System.Globalization;
@@ -43,13 +47,11 @@
4347
#if NETFX_CORE || WINDOWS_PHONE
4448
using System.Linq.Expressions;
4549
#endif
46-
#if !AOT && !SILVERLIGHT
50+
#if FEATURE_EMIT
4751
using MsgPack.Serialization.AbstractSerializers;
48-
#if !NETSTD_11 && !NETSTD_13
4952
using MsgPack.Serialization.CodeDomSerializers;
50-
#endif // !NETSTD_11 && !NETSTD_13
5153
using MsgPack.Serialization.EmittingSerializers;
52-
#endif // !AOT && !SILVERLIGHT
54+
#endif // FEATURE_EMIT
5355

5456
namespace MsgPack.Serialization
5557
{
@@ -246,14 +248,10 @@ internal static MessagePackSerializer<T> CreateInternal<T>( SerializationContext
246248
ValidateType( typeof( T ) );
247249
}
248250

249-
#if !AOT
250-
#if !SILVERLIGHT
251+
#if FEATURE_EMIT
251252
ISerializerBuilder builder;
252-
#endif // !SILVERLIGHT
253253
switch ( context.SerializerOptions.EmitterFlavor )
254254
{
255-
#if !SILVERLIGHT
256-
#if !NETSTD_11 && !NETSTD_13
257255
case EmitterFlavor.CodeDomBased:
258256
{
259257
if ( !SerializerDebugging.OnTheFlyCodeDomEnabled )
@@ -270,27 +268,23 @@ internal static MessagePackSerializer<T> CreateInternal<T>( SerializationContext
270268
builder = new CodeDomSerializerBuilder( typeof( T ), collectionTraits );
271269
break;
272270
}
273-
#endif // !!NETSTD_11 && !NETSTD_13
274271
case EmitterFlavor.FieldBased:
275272
{
276273
builder = new AssemblyBuilderSerializerBuilder( typeof( T ), collectionTraits );
277274
break;
278275
}
279-
#endif // !SILVERLIGHT
280276
default: // EmitterFlavor.ReflectionBased
281277
{
282-
#endif // !AOT
278+
#endif // FEATURE_EMIT
283279
return
284280
GenericSerializer.TryCreateAbstractCollectionSerializer( context, typeof( T ), concreteType, schema ) as MessagePackSerializer<T>
285281
?? CreateReflectionInternal<T>( context, concreteType ?? typeof( T ), schema );
286-
#if !AOT
282+
#if FEATURE_EMIT
287283
}
288284
}
289-
#endif // !AOT
290285

291-
#if !AOT && !SILVERLIGHT
292286
return ( MessagePackSerializer<T> ) builder.BuildSerializerInstance( context, concreteType, schema == null ? null : schema.FilterSelf() );
293-
#endif // !AOT
287+
#endif // FEATURE_EMIT
294288
}
295289

296290
#if !XAMIOS && !XAMDROID && !UNITY

‎src/MsgPack/Serialization/SerializerRepository.defaults.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ internal static Dictionary<RuntimeTypeHandle, object> InitializeDefaultTable( Se
9595
dictionary.Add( typeof( System.UInt64 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_UInt64MessagePackSerializer( ownerContext ) );
9696
#if !NETSTD_11
9797
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
98-
#if !NETSTD_13
98+
#if !NETSTD_11 && !NETSTD_13
9999
dictionary.Add( typeof( System.Security.Cryptography.HashAlgorithmName ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer( ownerContext ) );
100-
#endif // !NETSTD_13
100+
#endif // !NETSTD_11 && !NETSTD_13
101101
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
102102
#endif // !NETSTD_11
103103
#if !NETSTD_11
@@ -115,53 +115,53 @@ internal static Dictionary<RuntimeTypeHandle, object> InitializeDefaultTable( Se
115115
#endif // !NETFX_35 && !UNITY
116116
#endif // !WINDOWS_PHONE
117117
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
118-
#if !NETSTD_13
118+
#if !NETSTD_11 && !NETSTD_13
119119
#if !UNITY || MSGPACK_UNITY_FULL
120120
dictionary.Add( typeof( System.Numerics.Matrix3x2 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Matrix3x2MessagePackSerializer( ownerContext ) );
121121
#endif // !UNITY || MSGPACK_UNITY_FULL
122-
#endif // !NETSTD_13
122+
#endif // !NETSTD_11 && !NETSTD_13
123123
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
124124
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
125-
#if !NETSTD_13
125+
#if !NETSTD_11 && !NETSTD_13
126126
#if !UNITY || MSGPACK_UNITY_FULL
127127
dictionary.Add( typeof( System.Numerics.Matrix4x4 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Matrix4x4MessagePackSerializer( ownerContext ) );
128128
#endif // !UNITY || MSGPACK_UNITY_FULL
129-
#endif // !NETSTD_13
129+
#endif // !NETSTD_11 && !NETSTD_13
130130
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
131131
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
132-
#if !NETSTD_13
132+
#if !NETSTD_11 && !NETSTD_13
133133
#if !UNITY || MSGPACK_UNITY_FULL
134134
dictionary.Add( typeof( System.Numerics.Plane ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_PlaneMessagePackSerializer( ownerContext ) );
135135
#endif // !UNITY || MSGPACK_UNITY_FULL
136-
#endif // !NETSTD_13
136+
#endif // !NETSTD_11 && !NETSTD_13
137137
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
138138
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
139-
#if !NETSTD_13
139+
#if !NETSTD_11 && !NETSTD_13
140140
#if !UNITY || MSGPACK_UNITY_FULL
141141
dictionary.Add( typeof( System.Numerics.Quaternion ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_QuaternionMessagePackSerializer( ownerContext ) );
142142
#endif // !UNITY || MSGPACK_UNITY_FULL
143-
#endif // !NETSTD_13
143+
#endif // !NETSTD_11 && !NETSTD_13
144144
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
145145
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
146-
#if !NETSTD_13
146+
#if !NETSTD_11 && !NETSTD_13
147147
#if !UNITY || MSGPACK_UNITY_FULL
148148
dictionary.Add( typeof( System.Numerics.Vector2 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector2MessagePackSerializer( ownerContext ) );
149149
#endif // !UNITY || MSGPACK_UNITY_FULL
150-
#endif // !NETSTD_13
150+
#endif // !NETSTD_11 && !NETSTD_13
151151
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
152152
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
153-
#if !NETSTD_13
153+
#if !NETSTD_11 && !NETSTD_13
154154
#if !UNITY || MSGPACK_UNITY_FULL
155155
dictionary.Add( typeof( System.Numerics.Vector3 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector3MessagePackSerializer( ownerContext ) );
156156
#endif // !UNITY || MSGPACK_UNITY_FULL
157-
#endif // !NETSTD_13
157+
#endif // !NETSTD_11 && !NETSTD_13
158158
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
159159
#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
160-
#if !NETSTD_13
160+
#if !NETSTD_11 && !NETSTD_13
161161
#if !UNITY || MSGPACK_UNITY_FULL
162162
dictionary.Add( typeof( System.Numerics.Vector4 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector4MessagePackSerializer( ownerContext ) );
163163
#endif // !UNITY || MSGPACK_UNITY_FULL
164-
#endif // !NETSTD_13
164+
#endif // !NETSTD_11 && !NETSTD_13
165165
#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT
166166
dictionary.Add( typeof( System.ArraySegment<> ).TypeHandle, typeof( System_ArraySegment_1MessagePackSerializer<> ) );
167167
dictionary.Add( typeof( System.Globalization.CultureInfo ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Globalization_CultureInfoMessagePackSerializer( ownerContext ) );

‎src/MsgPack/Serialization/SerializerRepository.defaults.tt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ foreach( Type type in structTypes )
335335
if( notInNetStandard1_3.Contains( type ) )
336336
{
337337
#>
338-
#if !NETSTD_13
338+
#if !NETSTD_11 && !NETSTD_13
339339
<#
340340
}
341341

@@ -387,7 +387,7 @@ foreach( Type type in structTypes )
387387
if( notInNetStandard1_3.Contains( type ) )
388388
{
389389
#>
390-
#endif // !NETSTD_13
390+
#endif // !NETSTD_11 && !NETSTD_13
391391
<#
392392
}
393393

‎src/MsgPack/Serialization/Tracer.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
using System;
2222
using System.Diagnostics;
23-
#if NETSTD_11
23+
#if NETSTD_11 || NETSTD_13
2424
using System.Globalization;
25-
#endif // NETSTD_11
25+
#endif // NETSTD_11 || NETSTD_13
2626

2727
namespace MsgPack.Serialization
2828
{
@@ -54,7 +54,7 @@ public static class EventType
5454
}
5555
}
5656

57-
#if NETSTD_11
57+
#if NETSTD_11 || NETSTD_13
5858
internal enum TraceEventType
5959
{
6060
Critical = 1,
@@ -85,5 +85,5 @@ public void TraceData( TraceEventType eventType, int id, object data )
8585
Debug.WriteLine( String.Format( CultureInfo.InvariantCulture, "{0} {1}: {2} : {3}", this._name, eventType, id, data ) );
8686
}
8787
}
88-
#endif // NETSTD_11
88+
#endif // NETSTD_11 || NETSTD_13
8989
}

‎src/netstandard/1.1/MsgPack/project.json‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,34 @@
2323
"../../NetStandardCompatibility.cs"
2424
],
2525
"exclude": [
26-
"../../../MsgPack/Serialization/ExpressionSerializers/**/*.*",
2726
"../../../MsgPack/Properties/AssemblyInfo.cs",
28-
"../../../MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs",
29-
"../../../MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerator.cs",
27+
"../../../MsgPack/Serialization/AbstractSerializers/**/*.*",
3028
"../../../MsgPack/Serialization/CodeDomSerializers/**/*.*",
29+
"../../../MsgPack/Serialization/DefaultSerializers/SimdTypeSerializers.cs",
3130
"../../../MsgPack/Serialization/DefaultSerializers/System_Collections_Queue*",
3231
"../../../MsgPack/Serialization/DefaultSerializers/System_Collections_Stack*",
3332
"../../../MsgPack/Serialization/DefaultSerializers/System_Collections_Specialized_*",
3433
"../../../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs",
35-
"../../../MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs",
34+
"../../../MsgPack/Serialization/EmittingSerializers/**/*.*",
35+
"../../../MsgPack/Serialization/Metadata/_CultureInfo.cs",
36+
"../../../MsgPack/Serialization/Metadata/_DateTimeMessagePackSerializerHelpers.cs",
37+
"../../../MsgPack/Serialization/Metadata/_Decimal.cs",
38+
"../../../MsgPack/Serialization/Metadata/_DictionaryEntry.cs",
39+
"../../../MsgPack/Serialization/Metadata/_DynamicUnpackingContext.cs",
40+
"../../../MsgPack/Serialization/Metadata/_EnumMessagePackSerializerHelpers.cs",
41+
"../../../MsgPack/Serialization/Metadata/_FieldInfo.cs",
42+
"../../../MsgPack/Serialization/Metadata/_IDictionaryEnumerator.cs",
43+
"../../../MsgPack/Serialization/Metadata/_IDisposable.cs",
44+
"../../../MsgPack/Serialization/Metadata/_IEnumreator.cs",
45+
"../../../MsgPack/Serialization/Metadata/_MessagePackObject.cs",
46+
"../../../MsgPack/Serialization/Metadata/_MethodBase.cs",
47+
"../../../MsgPack/Serialization/Metadata/_Object.cs",
48+
"../../../MsgPack/Serialization/Metadata/_Packer.cs",
49+
"../../../MsgPack/Serialization/Metadata/_String.cs",
50+
"../../../MsgPack/Serialization/Metadata/_Unpacker.cs",
51+
"../../../MsgPack/Serialization/Metadata/_UnpackHelpers.cs",
52+
"../../../MsgPack/Serialization/Metadata/_UnpackHelpers.direct.cs",
53+
"../../../MsgPack/Serialization/Reflection/TracingILGenerator*.cs",
3654
"../../../MsgPack/Serialization/ISerializerGeneratorConfiguration.cs",
3755
"../../../MsgPack/Serialization/SerializerAssemblyGenerationConfiguration.cs",
3856
"../../../MsgPack/Serialization/SerializerCodeGenerationConfiguration.cs",
@@ -58,10 +76,8 @@
5876
"System.IO": "4.1.0-rc2-24027" ,
5977
"System.Linq": "4.1.0-rc2-24027" ,
6078
"System.Linq.Expressions": "4.0.11-rc2-24027" ,
61-
"System.Numerics.Vectors": "4.1.1-rc2-24027" ,
6279
"System.ObjectModel": "4.0.12-rc2-24027" ,
6380
"System.Reflection": "4.1.0-rc2-24027" ,
64-
"System.Reflection.Emit": "4.0.1-rc2-24027" ,
6581
"System.Reflection.Extensions": "4.0.1-rc2-24027" ,
6682
"System.Reflection.Primitives": "4.0.1-rc2-24027" ,
6783
"System.Resources.ResourceManager": "4.0.1-rc2-24027" ,

‎src/netstandard/1.3/MsgPack/project.json‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,30 @@
2323
"../../NetStandardCompatibility.cs"
2424
],
2525
"exclude": [
26-
"../../../MsgPack/Serialization/ExpressionSerializers/**/*.*",
2726
"../../../MsgPack/Properties/AssemblyInfo.cs",
28-
"../../../MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs",
29-
"../../../MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerator.cs",
27+
"../../../MsgPack/Serialization/AbstractSerializers/**/*.*",
3028
"../../../MsgPack/Serialization/CodeDomSerializers/**/*.*",
3129
"../../../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs",
32-
"../../../MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs",
30+
"../../../MsgPack/Serialization/EmittingSerializers/**/*.*",
31+
"../../../MsgPack/Serialization/Metadata/_CultureInfo.cs",
32+
"../../../MsgPack/Serialization/Metadata/_DateTimeMessagePackSerializerHelpers.cs",
33+
"../../../MsgPack/Serialization/Metadata/_Decimal.cs",
34+
"../../../MsgPack/Serialization/Metadata/_DictionaryEntry.cs",
35+
"../../../MsgPack/Serialization/Metadata/_DynamicUnpackingContext.cs",
36+
"../../../MsgPack/Serialization/Metadata/_EnumMessagePackSerializerHelpers.cs",
37+
"../../../MsgPack/Serialization/Metadata/_FieldInfo.cs",
38+
"../../../MsgPack/Serialization/Metadata/_IDictionaryEnumerator.cs",
39+
"../../../MsgPack/Serialization/Metadata/_IDisposable.cs",
40+
"../../../MsgPack/Serialization/Metadata/_IEnumreator.cs",
41+
"../../../MsgPack/Serialization/Metadata/_MessagePackObject.cs",
42+
"../../../MsgPack/Serialization/Metadata/_MethodBase.cs",
43+
"../../../MsgPack/Serialization/Metadata/_Object.cs",
44+
"../../../MsgPack/Serialization/Metadata/_Packer.cs",
45+
"../../../MsgPack/Serialization/Metadata/_String.cs",
46+
"../../../MsgPack/Serialization/Metadata/_Unpacker.cs",
47+
"../../../MsgPack/Serialization/Metadata/_UnpackHelpers.cs",
48+
"../../../MsgPack/Serialization/Metadata/_UnpackHelpers.direct.cs",
49+
"../../../MsgPack/Serialization/Reflection/TracingILGenerator*.cs",
3350
"../../../MsgPack/Serialization/ISerializerGeneratorConfiguration.cs",
3451
"../../../MsgPack/Serialization/SerializerAssemblyGenerationConfiguration.cs",
3552
"../../../MsgPack/Serialization/SerializerGenerator.cs",
@@ -53,15 +70,13 @@
5370
"System.Diagnostics.Contracts": "4.0.1-rc2-24027" ,
5471
"System.Diagnostics.Debug": "4.0.11-rc2-24027 " ,
5572
"System.Diagnostics.Tools": "4.0.1-rc2-24027 " ,
56-
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027" ,
5773
"System.Globalization": "4.0.11-rc2-24027" ,
5874
"System.IO": "4.1.0-rc2-24027" ,
5975
"System.Linq": "4.1.0-rc2-24027" ,
6076
"System.Linq.Expressions": "4.0.11-rc2-24027" ,
6177
"System.Numerics.Vectors": "4.1.1-rc2-24027" ,
6278
"System.ObjectModel": "4.0.12-rc2-24027" ,
6379
"System.Reflection": "4.1.0-rc2-24027" ,
64-
"System.Reflection.Emit": "4.0.1-rc2-24027" ,
6580
"System.Reflection.Extensions": "4.0.1-rc2-24027" ,
6681
"System.Reflection.Primitives": "4.0.1-rc2-24027" ,
6782
"System.Resources.ResourceManager": "4.0.1-rc2-24027" ,

‎test/MsgPack.UnitTest.BclExtensions/Serialization/ArrayCodeDomBasedCustomCollectionSerializersTest.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
using System.Diagnostics;
2929
using System.IO;
3030
using System.Linq;
31-
#if !SILVERLIGHT
32-
#if !NETSTD_11 && !NETSTD_13
31+
#if !SILVERLIGHT && !NETSTD_11 && !NETSTD_13
3332
using MsgPack.Serialization.CodeDomSerializers;
34-
#endif // !NETSTD_11 && !NETSTD_13
3533
using MsgPack.Serialization.EmittingSerializers;
36-
#endif // SILVERLIGHT
34+
#endif // SILVERLIGHT && !NETSTD_11 && !NETSTD_13
3735
#if !MSTEST
3836
using NUnit.Framework;
3937
#else

‎test/MsgPack.UnitTest.BclExtensions/Serialization/ArrayFieldBasedCustomCollectionSerializersTest.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
using System.Diagnostics;
2929
using System.IO;
3030
using System.Linq;
31-
#if !SILVERLIGHT
32-
#if !NETSTD_11 && !NETSTD_13
31+
#if !SILVERLIGHT && !NETSTD_11 && !NETSTD_13
3332
using MsgPack.Serialization.CodeDomSerializers;
34-
#endif // !NETSTD_11 && !NETSTD_13
3533
using MsgPack.Serialization.EmittingSerializers;
36-
#endif // SILVERLIGHT
34+
#endif // SILVERLIGHT && !NETSTD_11 && !NETSTD_13
3735
#if !MSTEST
3836
using NUnit.Framework;
3937
#else

0 commit comments

Comments
 (0)