-Fixed build

This commit is contained in:
James Newton-King
2013-03-29 17:03:29 +13:00
parent efd31db09e
commit 57d9cb898d
7 changed files with 34 additions and 25 deletions
@@ -56,17 +56,17 @@ namespace Newtonsoft.Json.Tests
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(1.0d, reader.Value);
Assert.AreEqual(1.0m, reader.Value);
Assert.AreEqual(typeof(decimal), reader.ValueType);
Assert.AreEqual(JsonToken.Float, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(1, reader.Value);
Assert.AreEqual(1l, reader.Value);
Assert.AreEqual(typeof(long), reader.ValueType);
Assert.AreEqual(JsonToken.Integer, reader.TokenType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(9.9d, reader.Value);
Assert.AreEqual(9.9m, reader.Value);
Assert.AreEqual(typeof(decimal), reader.ValueType);
Assert.AreEqual(JsonToken.Float, reader.TokenType);
@@ -59,7 +59,7 @@ namespace Newtonsoft.Json.Tests.Linq
FloatParseHandling = Json.FloatParseHandling.Decimal
});
Assert.AreEqual(9.9d, v.Value);
Assert.AreEqual(9.9m, v.Value);
Assert.AreEqual(typeof(decimal), v.Value.GetType());
}
@@ -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.15926")]
[assembly: AssemblyFileVersion("5.0.1.15929")]
@@ -3922,7 +3922,7 @@ To fix this error either change the environment to be fully trusted, change the
});
Assert.AreEqual(typeof(decimal), dic["value"].GetType());
Assert.AreEqual(9.9d, dic["value"]);
Assert.AreEqual(9.9m, dic["value"]);
}
[Test]