Skip to content

Commit 7ca5396

Browse files
yfakariyayfakariya
committed
Fix build error.
1 parent bd102e2 commit 7ca5396

11 files changed

Lines changed: 471 additions & 99 deletions

‎src/MsgPack/Serialization/PolymorphismSchema.Internals.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,15 @@ SerializingMember memberMayBeNull
243243
#endif // !NETFX_CORE && !NETSTANDARD1_1 && !NETSTANDARD1_3
244244
Default
245245
);
246-
SerializerDebugging.TracePolimorphicSchemaEvent( "Returns root type schema for '{0}': {1}", type, schema );
246+
SerializerDebugging.TracePolimorphicSchemaEvent(
247+
"Returns root type schema for '{0}': {1}",
248+
#if !NETFX_CORE && !NETSTANDARD1_1 && !NETSTANDARD1_3
249+
type,
250+
#else
251+
type.GetTypeInfo(),
252+
#endif // !NETFX_CORE && !NETSTANDARD1_1 && !NETSTANDARD1_3
253+
schema
254+
);
247255
return schema;
248256
}
249257

‎src/MsgPack/Serialization/Tracer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public TraceSource( string name )
7676
}
7777

7878
[Conditional( "TRACE" )]
79-
public void TraceEmitEvent( TraceEventType eventType, int id, string format, params object[] args )
79+
public void TraceEvent( TraceEventType eventType, int id, string format, params object[] args )
8080
{
8181
Debug.WriteLine( String.Format( CultureInfo.InvariantCulture, "{0} {1}: {2} : {3}", this._name, eventType, id, String.Format( CultureInfo.InvariantCulture, format, args ) ) );
8282
}

‎test/MsgPack.UnitTest.CodeDom/Serialization/ArrayCodeDomBasedAutoMessagePackSerializerTest.cs‎

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18635,7 +18635,7 @@ public void TestKnownType_AttributeIsNothing_Field_Known()
1863518635
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1863618636
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1863718637
var typeHeader = serializedMember.AsList()[ 0 ];
18638-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18638+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1863918639
}
1864018640
}
1864118641

@@ -18661,7 +18661,7 @@ public void TestKnownType_AttributeIsNothing_Property_Known()
1866118661
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1866218662
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1866318663
var typeHeader = serializedMember.AsList()[ 0 ];
18664-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18664+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1866518665
}
1866618666
}
1866718667

@@ -18687,7 +18687,7 @@ public void TestKnownType_AttributeIsKnown_Field_Known()
1868718687
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1868818688
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1868918689
var typeHeader = serializedMember.AsList()[ 0 ];
18690-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18690+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1869118691
// Verify override in member value.
1869218692
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1869318693
}
@@ -18715,7 +18715,7 @@ public void TestKnownType_AttributeIsKnown_Property_Known()
1871518715
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1871618716
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1871718717
var typeHeader = serializedMember.AsList()[ 0 ];
18718-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18718+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1871918719
// Verify override in member value.
1872018720
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1872118721
}
@@ -18844,7 +18844,11 @@ public void TestRuntimeType_AttributeIsKnown_Field_Known_Fail()
1884418844
using ( var buffer = new MemoryStream() )
1884518845
{
1884618846
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
18847+
#if !UNITY && !XAMARIN
1884718848
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
18849+
#else
18850+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
18851+
#endif // !UNITY && !XAMARIN
1884818852
}
1884918853
}
1885018854

@@ -18863,7 +18867,11 @@ public void TestRuntimeType_AttributeIsKnown_Property_Known_Fail()
1886318867
using ( var buffer = new MemoryStream() )
1886418868
{
1886518869
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
18870+
#if !UNITY && !XAMARIN
1886618871
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
18872+
#else
18873+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
18874+
#endif // !UNITY && !XAMARIN
1886718875
}
1886818876
}
1886918877

@@ -18943,7 +18951,7 @@ public void TestKnownTypeCollection_AttributeIsNothing_Field_Known()
1894318951
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1894418952
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1894518953
var typeHeader = serializedMember.AsList()[ 0 ];
18946-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18954+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1894718955
}
1894818956
}
1894918957

@@ -18969,7 +18977,7 @@ public void TestKnownTypeCollection_AttributeIsNothing_Property_Known()
1896918977
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1897018978
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1897118979
var typeHeader = serializedMember.AsList()[ 0 ];
18972-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
18980+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1897318981
}
1897418982
}
1897518983

@@ -18995,7 +19003,7 @@ public void TestKnownTypeCollection_AttributeIsKnown_Field_Known()
1899519003
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1899619004
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1899719005
var typeHeader = serializedMember.AsList()[ 0 ];
18998-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19006+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1899919007
// Verify override in member value.
1900019008
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1900119009
}
@@ -19023,7 +19031,7 @@ public void TestKnownTypeCollection_AttributeIsKnown_Property_Known()
1902319031
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1902419032
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1902519033
var typeHeader = serializedMember.AsList()[ 0 ];
19026-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19034+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1902719035
// Verify override in member value.
1902819036
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1902919037
}
@@ -19152,7 +19160,11 @@ public void TestRuntimeTypeCollection_AttributeIsKnown_Field_Known_Fail()
1915219160
using ( var buffer = new MemoryStream() )
1915319161
{
1915419162
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
19163+
#if !UNITY && !XAMARIN
1915519164
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
19165+
#else
19166+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
19167+
#endif // !UNITY && !XAMARIN
1915619168
}
1915719169
}
1915819170

@@ -19171,7 +19183,11 @@ public void TestRuntimeTypeCollection_AttributeIsKnown_Property_Known_Fail()
1917119183
using ( var buffer = new MemoryStream() )
1917219184
{
1917319185
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
19186+
#if !UNITY && !XAMARIN
1917419187
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
19188+
#else
19189+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
19190+
#endif // !UNITY && !XAMARIN
1917519191
}
1917619192
}
1917719193

@@ -19251,7 +19267,7 @@ public void TestKnownTypeDictionary_AttributeIsNothing_Field_Known()
1925119267
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1925219268
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1925319269
var typeHeader = serializedMember.AsList()[ 0 ];
19254-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19270+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1925519271
}
1925619272
}
1925719273

@@ -19277,7 +19293,7 @@ public void TestKnownTypeDictionary_AttributeIsNothing_Property_Known()
1927719293
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1927819294
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1927919295
var typeHeader = serializedMember.AsList()[ 0 ];
19280-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19296+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1928119297
}
1928219298
}
1928319299

@@ -19303,7 +19319,7 @@ public void TestKnownTypeDictionary_AttributeIsKnown_Field_Known()
1930319319
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1930419320
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1930519321
var typeHeader = serializedMember.AsList()[ 0 ];
19306-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19322+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1930719323
// Verify override in member value.
1930819324
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1930919325
}
@@ -19331,7 +19347,7 @@ public void TestKnownTypeDictionary_AttributeIsKnown_Property_Known()
1933119347
Assert.That( serializedMember.IsArray, Is.True, serializedObject.ToString() );
1933219348
Assert.That( serializedMember.AsList().Count, Is.EqualTo( 2 ), serializedMember.ToString() );
1933319349
var typeHeader = serializedMember.AsList()[ 0 ];
19334-
Assert.That( typeHeader.IsTypeOf<string>, Is.True, typeHeader.ToString() ); // known type header
19350+
Assert.That( typeHeader.IsTypeOf<string>().GetValueOrDefault(), Is.True, typeHeader.ToString() ); // known type header
1933519351
// Verify override in member value.
1933619352
Assert.That( typeHeader.AsString(), Is.EqualTo( "A" ), typeHeader.ToString() );
1933719353
}
@@ -19460,7 +19476,11 @@ public void TestRuntimeTypeDictionary_AttributeIsKnown_Field_Known_Fail()
1946019476
using ( var buffer = new MemoryStream() )
1946119477
{
1946219478
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
19479+
#if !UNITY && !XAMARIN
1946319480
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
19481+
#else
19482+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
19483+
#endif // !UNITY && !XAMARIN
1946419484
}
1946519485
}
1946619486

@@ -19479,7 +19499,11 @@ public void TestRuntimeTypeDictionary_AttributeIsKnown_Property_Known_Fail()
1947919499
using ( var buffer = new MemoryStream() )
1948019500
{
1948119501
var ex = Assert.Catch<SerializationException>( () => serializer.Pack( buffer ,target ) );
19502+
#if !UNITY && !XAMARIN
1948219503
Assert.That( ex.Message, Does.Contain( "is not defined as known type" ) );
19504+
#else
19505+
Assert.That( ex.Message.Contains( "is not defined as known type" ), ex.Message );
19506+
#endif // !UNITY && !XAMARIN
1948319507
}
1948419508
}
1948519509

@@ -19702,7 +19726,11 @@ public void TestSpecifiedTypeVerifierIsNotFound_BecauseNoMethods_Fail()
1970219726
var target = new RuntimeTypePolymorphicWithInvalidVerifierNoMethods { Value = "Foo" };
1970319727

1970419728
var ex = Assert.Catch<SerializationException>( () => context.GetSerializer<RuntimeTypePolymorphicWithInvalidVerifierNoMethods>() );
19729+
#if !UNITY && !XAMARIN
1970519730
Assert.That( ex.Message, Does.StartWith( "VerifierMethodName cannot be null " ).Or.StartWith( "A public static or instance method " ) );
19731+
#else
19732+
Assert.That( ex.Message.StartsWith( "VerifierMethodName cannot be null " ) || ex.Message.StartsWith( "A public static or instance method " ), ex.Message );
19733+
#endif // !UNITY && !XAMARIN
1970619734
}
1970719735

1970819736
[Test]
@@ -19713,7 +19741,11 @@ public void TestSpecifiedTypeVerifierIsNotFound_BecauseVoidReturnMethod_Fail()
1971319741
var target = new RuntimeTypePolymorphicWithInvalidVerifierVoidReturnMethod { Value = "Foo" };
1971419742

1971519743
var ex = Assert.Catch<SerializationException>( () => context.GetSerializer<RuntimeTypePolymorphicWithInvalidVerifierVoidReturnMethod>() );
19744+
#if !UNITY && !XAMARIN
1971619745
Assert.That( ex.Message, Does.StartWith( "VerifierMethodName cannot be null " ).Or.StartWith( "A public static or instance method " ) );
19746+
#else
19747+
Assert.That( ex.Message.StartsWith( "VerifierMethodName cannot be null " ) || ex.Message.StartsWith( "A public static or instance method " ), ex.Message );
19748+
#endif // !UNITY && !XAMARIN
1971719749
}
1971819750

1971919751
[Test]
@@ -19724,7 +19756,11 @@ public void TestSpecifiedTypeVerifierIsNotFound_BecauseNoParametersMethod_Fail()
1972419756
var target = new RuntimeTypePolymorphicWithInvalidVerifierNoParametersMethod { Value = "Foo" };
1972519757

1972619758
var ex = Assert.Catch<SerializationException>( () => context.GetSerializer<RuntimeTypePolymorphicWithInvalidVerifierNoParametersMethod>() );
19759+
#if !UNITY && !XAMARIN
1972719760
Assert.That( ex.Message, Does.StartWith( "VerifierMethodName cannot be null " ).Or.StartWith( "A public static or instance method " ) );
19761+
#else
19762+
Assert.That( ex.Message.StartsWith( "VerifierMethodName cannot be null " ) || ex.Message.StartsWith( "A public static or instance method " ), ex.Message );
19763+
#endif // !UNITY && !XAMARIN
1972819764
}
1972919765

1973019766
[Test]
@@ -19735,7 +19771,11 @@ public void TestSpecifiedTypeVerifierIsNotFound_BecauseExtraParametersMethod_Fai
1973519771
var target = new RuntimeTypePolymorphicWithInvalidVerifierExtraParametersMethod { Value = "Foo" };
1973619772

1973719773
var ex = Assert.Catch<SerializationException>( () => context.GetSerializer<RuntimeTypePolymorphicWithInvalidVerifierExtraParametersMethod>() );
19774+
#if !UNITY && !XAMARIN
1973819775
Assert.That( ex.Message, Does.StartWith( "VerifierMethodName cannot be null " ).Or.StartWith( "A public static or instance method " ) );
19776+
#else
19777+
Assert.That( ex.Message.StartsWith( "VerifierMethodName cannot be null " ) || ex.Message.StartsWith( "A public static or instance method " ), ex.Message );
19778+
#endif // !UNITY && !XAMARIN
1973919779
}
1974019780

1974119781
[Test]
@@ -19753,7 +19793,11 @@ public void TestTypeVerifierDoesNotLoadTypeItself()
1975319793
packer.PackString( "Foo" ); // Value
1975419794
buffer.Position = 0;
1975519795
var ex = Assert.Catch<SerializationException>( () => serializer.Unpack( buffer ) );
19796+
#if !UNITY && !XAMARIN
1975619797
Assert.That( ex.Message, Does.StartWith( "Type verifier rejects type " ) );
19798+
#else
19799+
Assert.That( ex.Message.StartsWith( "Type verifier rejects type " ), ex.Message );
19800+
#endif // !UNITY && !XAMARIN
1975719801
}
1975819802
}
1975919803

0 commit comments

Comments
 (0)