-Fixed serializing discriminated unions with type name or reference tracking enabled

-Fixed build
This commit is contained in:
James Newton-King
2015-03-21 20:35:57 +13:00
parent cdac4d8d38
commit a3278ccd6a
12 changed files with 88 additions and 29 deletions
@@ -57,9 +57,9 @@ namespace Newtonsoft.Json.Tests.Serialization
private readonly char _startingWithChar;
public DynamicContractResolver(char startingWithChar)
#pragma warning disable 612
#pragma warning disable 612,618
: base(false)
#pragma warning restore 612
#pragma warning restore 612,618
{
_startingWithChar = startingWithChar;
}
@@ -3879,6 +3879,7 @@ Path '', line 1, position 1.");
}", json);
}
#if !NET20
public class DateTimeOffsetWrapper
{
public DateTimeOffset DateTimeOffsetValue { get; set; }
@@ -3907,6 +3908,7 @@ Path '', line 1, position 1.");
Assert.AreEqual(c.DateTimeOffsetValue, cISO.DateTimeOffsetValue);
}
#endif
[Test]
public void CircularConstructorDeserialize()
@@ -8684,6 +8686,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("derived", d.DerivedProperty);
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40)
[Test]
public void DeserializeNullableUnsignedLong()
{
@@ -8705,6 +8708,7 @@ Path '', line 1, position 1.");
set;
}
}
#endif
#if !NETFX_CORE
[Test]