-Fixed builds

This commit is contained in:
James Newton-King
2013-12-08 14:38:03 +13:00
parent c7fd4d5e29
commit 7ab381f2e8
22 changed files with 85 additions and 23 deletions
@@ -1546,14 +1546,16 @@ namespace Newtonsoft.Json.Tests.Bson
public class MyBinder : DefaultSerializationBinder
{
public bool BindToNameCalled { get; set; }
public bool BindToTypeCalled { get; set; }
#if !(NET20 || NET35)
public bool BindToNameCalled { get; set; }
public override void BindToName(Type serializedType, out string assemblyName, out string typeName)
{
BindToNameCalled = true;
base.BindToName(serializedType, out assemblyName, out typeName);
}
#endif
public override Type BindToType(string assemblyName, string typeName)
{
@@ -1595,7 +1597,9 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.AreEqual("Dog!", deserialized.Animals[0].Name);
Assert.IsTrue(deserialized.Animals[0] is Dog);
#if !(NET20 || NET35)
Assert.IsTrue(binder.BindToNameCalled);
#endif
Assert.IsTrue(binder.BindToTypeCalled);
}
}