-Fixed build
This commit is contained in:
@@ -64,6 +64,7 @@ namespace Newtonsoft.Json.Tests
|
||||
Assert.IsTrue(ms.CanRead);
|
||||
}
|
||||
|
||||
#if !(PORTABLE || NETFX_CORE)
|
||||
[Test]
|
||||
public void WriteIConvertable()
|
||||
{
|
||||
@@ -73,6 +74,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
Assert.AreEqual("1", sw.ToString());
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void ValueFormatting()
|
||||
@@ -1272,6 +1274,7 @@ _____'propertyName': NaN
|
||||
}
|
||||
}
|
||||
|
||||
#if !(PORTABLE || NETFX_CORE)
|
||||
public struct ConvertibleInt : IConvertible
|
||||
{
|
||||
private readonly int _value;
|
||||
@@ -1369,4 +1372,5 @@ _____'propertyName': NaN
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -75,4 +75,4 @@ using System.Security;
|
||||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("4.5.0.0")]
|
||||
[assembly: AssemblyFileVersion("5.0.1.15931")]
|
||||
[assembly: AssemblyFileVersion("5.0.1.16001")]
|
||||
|
||||
@@ -5762,6 +5762,7 @@ To fix this error either change the environment to be fully trusted, change the
|
||||
});
|
||||
}
|
||||
|
||||
#if !(PORTABLE || NETFX_CORE)
|
||||
public class ConvertableIntTestClass
|
||||
{
|
||||
public ConvertibleInt Integer { get; set; }
|
||||
@@ -5801,6 +5802,7 @@ To fix this error either change the environment to be fully trusted, change the
|
||||
"Error converting value 1 to type 'Newtonsoft.Json.Tests.ConvertibleInt'. Path 'Integer', line 2, position 15.",
|
||||
() => JsonConvert.DeserializeObject<ConvertableIntTestClass>(json));
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void SerializeNullableWidgetStruct()
|
||||
|
||||
Reference in New Issue
Block a user