-Fixed build
This commit is contained in:
@@ -348,9 +348,9 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
|
|
||||||
Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase)));
|
Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase)));
|
||||||
|
|
||||||
|
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
||||||
string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990";
|
string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990";
|
||||||
|
|
||||||
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
|
||||||
Assert.AreEqual(BigInteger.Parse(bigIntegerText), (BigInteger)(new JValue(bigIntegerText)));
|
Assert.AreEqual(BigInteger.Parse(bigIntegerText), (BigInteger)(new JValue(bigIntegerText)));
|
||||||
Assert.AreEqual(new BigInteger(long.MaxValue), (BigInteger)(new JValue(long.MaxValue)));
|
Assert.AreEqual(new BigInteger(long.MaxValue), (BigInteger)(new JValue(long.MaxValue)));
|
||||||
Assert.AreEqual(new BigInteger(4.5d), (BigInteger)(new JValue((4.5d))));
|
Assert.AreEqual(new BigInteger(4.5d), (BigInteger)(new JValue((4.5d))));
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
v = new JValue(new Uri("http://www.google.com"));
|
v = new JValue(new Uri("http://www.google.com"));
|
||||||
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
|
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
|
||||||
|
|
||||||
#if !(NET20 || NET35 || SILVERLIGHT)
|
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
||||||
v = new JValue(new BigInteger(3));
|
v = new JValue(new BigInteger(3));
|
||||||
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
|
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
|
||||||
#endif
|
#endif
|
||||||
@@ -594,8 +594,10 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
int i = (int)v.ToType(typeof (int), CultureInfo.InvariantCulture);
|
int i = (int)v.ToType(typeof (int), CultureInfo.InvariantCulture);
|
||||||
Assert.AreEqual(9, i);
|
Assert.AreEqual(9, i);
|
||||||
|
|
||||||
|
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
||||||
BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture);
|
BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture);
|
||||||
Assert.AreEqual(new BigInteger(9), bi);
|
Assert.AreEqual(new BigInteger(9), bi);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -607,6 +609,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
Assert.AreEqual("2013", v.ToString("yyyy"));
|
Assert.AreEqual("2013", v.ToString("yyyy"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
||||||
[Test]
|
[Test]
|
||||||
public void ToStringNewTypes()
|
public void ToStringNewTypes()
|
||||||
{
|
{
|
||||||
@@ -622,5 +625,6 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
1.1
|
1.1
|
||||||
]", a.ToString());
|
]", a.ToString());
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,4 +75,4 @@ using System.Security;
|
|||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.5.0.0")]
|
[assembly: AssemblyVersion("4.5.0.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.1.15923")]
|
[assembly: AssemblyFileVersion("5.0.1.15924")]
|
||||||
|
|||||||
@@ -74,13 +74,12 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Windows" />
|
|
||||||
<Reference Include="mscorlib" />
|
<Reference Include="mscorlib" />
|
||||||
<Reference Include="system" />
|
<Reference Include="system" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Windows" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.Net" />
|
<Reference Include="System.Net" />
|
||||||
<Reference Include="System.Windows.Browser" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Bson\BsonBinaryType.cs" />
|
<Compile Include="Bson\BsonBinaryType.cs" />
|
||||||
|
|||||||
@@ -90,6 +90,6 @@ using System.Security;
|
|||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.5.0.0")]
|
[assembly: AssemblyVersion("4.5.0.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.1.15923")]
|
[assembly: AssemblyFileVersion("5.0.1.15924")]
|
||||||
|
|
||||||
[assembly: CLSCompliant(true)]
|
[assembly: CLSCompliant(true)]
|
||||||
|
|||||||
Reference in New Issue
Block a user