Skip to content

Commit

Permalink
-Fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesNK committed Mar 24, 2013
1 parent 787bde6 commit d9d96b3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@ public void Casting()

Assert.AreEqual(5, (int)(new JValue(StringComparison.OrdinalIgnoreCase)));

#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
string bigIntegerText = "1234567899999999999999999999999999999999999999999999999999999999999990";

#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
Assert.AreEqual(BigInteger.Parse(bigIntegerText), (BigInteger)(new JValue(bigIntegerText)));
Assert.AreEqual(new BigInteger(long.MaxValue), (BigInteger)(new JValue(long.MaxValue)));
Assert.AreEqual(new BigInteger(4.5d), (BigInteger)(new JValue((4.5d))));
Expand Down
6 changes: 5 additions & 1 deletion Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ public void GetTypeCode()
v = new JValue(new Uri("http://www.google.com"));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());

#if !(NET20 || NET35 || SILVERLIGHT)
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
v = new JValue(new BigInteger(3));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
#endif
Expand All @@ -594,8 +594,10 @@ public void ToType()
int i = (int)v.ToType(typeof (int), CultureInfo.InvariantCulture);
Assert.AreEqual(9, i);

#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture);
Assert.AreEqual(new BigInteger(9), bi);
#endif
}
#endif

Expand All @@ -607,6 +609,7 @@ public void ToStringFormat()
Assert.AreEqual("2013", v.ToString("yyyy"));
}

#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
[Test]
public void ToStringNewTypes()
{
Expand All @@ -622,5 +625,6 @@ public void ToStringNewTypes()
1.1
]", a.ToString());
}
#endif
}
}
2 changes: 1 addition & 1 deletion Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
// 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.15923")]
[assembly: AssemblyFileVersion("5.0.1.15924")]
3 changes: 1 addition & 2 deletions Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,12 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="mscorlib" />
<Reference Include="system" />
<Reference Include="System.Core" />
<Reference Include="System.Windows" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
<Compile Include="Bson\BsonBinaryType.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@
// 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.15923")]
[assembly: AssemblyFileVersion("5.0.1.15924")]

[assembly: CLSCompliant(true)]

0 comments on commit d9d96b3

Please sign in to comment.