-Changed version number to 4.0.6

This commit is contained in:
JamesNK
2012-01-23 06:55:47 +00:00
parent 0c873da0b2
commit 14a2cb2a8a
5 changed files with 156 additions and 114 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<metadata> <metadata>
<id>Newtonsoft.Json</id> <id>Newtonsoft.Json</id>
<title>Json.NET</title> <title>Json.NET</title>
<version>4.0.5</version> <version>4.0.6</version>
<authors>James Newton-King</authors> <authors>James Newton-King</authors>
<description>Json.NET is a popular high-performance JSON framework for .NET</description> <description>Json.NET is a popular high-performance JSON framework for .NET</description>
<language>en-US</language> <language>en-US</language>
+2 -2
View File
@@ -1,6 +1,6 @@
properties { properties {
$zipFileName = "Json40r5.zip" $zipFileName = "Json40r6.zip"
$majorVersion = "4.0.5" $majorVersion = "4.0.6"
$version = GetVersion $majorVersion $version = GetVersion $majorVersion
$signAssemblies = $false $signAssemblies = $false
$signKeyPath = "D:\Development\Releases\newtonsoft.snk" $signKeyPath = "D:\Development\Releases\newtonsoft.snk"
+48 -20
View File
@@ -26,10 +26,13 @@ namespace Newtonsoft.Json.Tests
{ {
[DataMember] [DataMember]
public string FileName { get; set; } public string FileName { get; set; }
[DataMember] [DataMember]
public string Author { get; set; } public string Author { get; set; }
[DataMember] [DataMember]
public string Caption { get; set; } public string Caption { get; set; }
[DataMember] [DataMember]
public byte[] Data { get; set; } public byte[] Data { get; set; }
} }
@@ -39,18 +42,8 @@ namespace Newtonsoft.Json.Tests
//private const int Iterations = 100; //private const int Iterations = 100;
private const int Iterations = 5000; private const int Iterations = 5000;
private static SimpleObject CreateSimpleObject()
{
return new SimpleObject
{
Name = "Simple-1",
Id = 2311,
Address = "Planet Earth",
Scores = new int[] { 82,96,49,40,38,38,78,96,2,39 }
};
}
#region Data #region Data
private const string BsonHex = private const string BsonHex =
@"A9-01-00-00-04-73-74-72-69-6E-67-73-00-2B-00-00-00-0A-30-00-02-31-00-19-00-00-00-4D-61-72-6B-75-73-20-65-67-67-65-72-20-5D-3E-3C-5B-2C-20-28-32-6E-64-29-00-0A-32-00-00-03-64-69-63-74-69-6F-6E-61-72-79-00-37-00-00-00-10-56-61-6C-20-26-20-61-73-64-31-00-01-00-00-00-10-56-61-6C-32-20-26-20-61-73-64-31-00-03-00-00-00-10-56-61-6C-33-20-26-20-61-73-64-31-00-04-00-00-00-00-02-4E-61-6D-65-00-05-00-00-00-52-69-63-6B-00-09-4E-6F-77-00-EF-BD-69-EC-25-01-00-00-01-42-69-67-4E-75-6D-62-65-72-00-E7-7B-CC-26-96-C7-1F-42-03-41-64-64-72-65-73-73-31-00-47-00-00-00-02-53-74-72-65-65-74-00-0B-00-00-00-66-66-66-20-53-74-72-65-65-74-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-FF-31-53-26-01-00-00-00-04-41-64-64-72-65-73-73-65-73-00-A2-00-00-00-03-30-00-4B-00-00-00-02-53-74-72-65-65-74-00-0F-00-00-00-1F-61-72-72-61-79-3C-61-64-64-72-65-73-73-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-73-0C-E7-25-01-00-00-00-03-31-00-4C-00-00-00-02-53-74-72-65-65-74-00-10-00-00-00-61-72-72-61-79-20-32-20-61-64-64-72-65-73-73-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-17-E6-E1-25-01-00-00-00-00-00"; @"A9-01-00-00-04-73-74-72-69-6E-67-73-00-2B-00-00-00-0A-30-00-02-31-00-19-00-00-00-4D-61-72-6B-75-73-20-65-67-67-65-72-20-5D-3E-3C-5B-2C-20-28-32-6E-64-29-00-0A-32-00-00-03-64-69-63-74-69-6F-6E-61-72-79-00-37-00-00-00-10-56-61-6C-20-26-20-61-73-64-31-00-01-00-00-00-10-56-61-6C-32-20-26-20-61-73-64-31-00-03-00-00-00-10-56-61-6C-33-20-26-20-61-73-64-31-00-04-00-00-00-00-02-4E-61-6D-65-00-05-00-00-00-52-69-63-6B-00-09-4E-6F-77-00-EF-BD-69-EC-25-01-00-00-01-42-69-67-4E-75-6D-62-65-72-00-E7-7B-CC-26-96-C7-1F-42-03-41-64-64-72-65-73-73-31-00-47-00-00-00-02-53-74-72-65-65-74-00-0B-00-00-00-66-66-66-20-53-74-72-65-65-74-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-FF-31-53-26-01-00-00-00-04-41-64-64-72-65-73-73-65-73-00-A2-00-00-00-03-30-00-4B-00-00-00-02-53-74-72-65-65-74-00-0F-00-00-00-1F-61-72-72-61-79-3C-61-64-64-72-65-73-73-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-73-0C-E7-25-01-00-00-00-03-31-00-4C-00-00-00-02-53-74-72-65-65-74-00-10-00-00-00-61-72-72-61-79-20-32-20-61-64-64-72-65-73-73-00-02-50-68-6F-6E-65-00-0F-00-00-00-28-35-30-33-29-20-38-31-34-2D-36-33-33-35-00-09-45-6E-74-65-72-65-64-00-6F-17-E6-E1-25-01-00-00-00-00-00";
@@ -75,6 +68,7 @@ namespace Newtonsoft.Json.Tests
DataContractSerializer, DataContractSerializer,
DataContractJsonSerializer DataContractJsonSerializer
} }
#endregion #endregion
[Test] [Test]
@@ -238,11 +232,21 @@ namespace Newtonsoft.Json.Tests
var name = attr.Value; var name = attr.Value;
switch (name) switch (name)
{ {
case "Property1": Int32.Parse(property.Value); break; case "Property1":
case "Property2": Int32.Parse(property.Value); break; Int32.Parse(property.Value);
case "Property3": Int32.Parse(property.Value); break; break;
case "Property4": Int32.Parse(property.Value); break; case "Property2":
case "Property5": Int32.Parse(property.Value); break; Int32.Parse(property.Value);
break;
case "Property3":
Int32.Parse(property.Value);
break;
case "Property4":
Int32.Parse(property.Value);
break;
case "Property5":
Int32.Parse(property.Value);
break;
} }
} }
} }
@@ -330,6 +334,7 @@ namespace Newtonsoft.Json.Tests
} }
#region Serialize #region Serialize
private static readonly byte[] Buffer = new byte[4096]; private static readonly byte[] Buffer = new byte[4096];
public void BenchmarkSerializeMethod(SerializeMethod method, object value) public void BenchmarkSerializeMethod(SerializeMethod method, object value)
@@ -380,6 +385,17 @@ namespace Newtonsoft.Json.Tests
return test; return test;
} }
private static SimpleObject CreateSimpleObject()
{
return new SimpleObject
{
Name = "Simple-1",
Id = 2311,
Address = "Planet Earth",
Scores = new [] { 82, 96, 49, 40, 38, 38, 78, 96, 2, 39 }
};
}
public string SerializeJsonNet(object value) public string SerializeJsonNet(object value)
{ {
Type type = value.GetType(); Type type = value.GetType();
@@ -496,9 +512,11 @@ namespace Newtonsoft.Json.Tests
//json = BitConverter.ToString(ms.ToArray(), 0, (int)ms.Position); //json = BitConverter.ToString(ms.ToArray(), 0, (int)ms.Position);
return json; return json;
} }
#endregion #endregion
#region Deserialize #region Deserialize
public void BenchmarkDeserializeMethod<T>(SerializeMethod method, object json) public void BenchmarkDeserializeMethod<T>(SerializeMethod method, object json)
{ {
Deserialize<T>(method, json); Deserialize<T>(method, json);
@@ -602,6 +620,7 @@ namespace Newtonsoft.Json.Tests
BinaryFormatter formatter = new BinaryFormatter(); BinaryFormatter formatter = new BinaryFormatter();
return (T) formatter.Deserialize(new MemoryStream(bytes)); return (T) formatter.Deserialize(new MemoryStream(bytes));
} }
#endregion #endregion
@@ -680,6 +699,7 @@ namespace Newtonsoft.Json.Tests
} }
#region Classes #region Classes
[Serializable] [Serializable]
[DataContract] [DataContract]
public class TestClass public class TestClass
@@ -690,6 +710,7 @@ namespace Newtonsoft.Json.Tests
get { return _Name; } get { return _Name; }
set { _Name = value; } set { _Name = value; }
} }
private string _Name = "Rick"; private string _Name = "Rick";
[DataMember] [DataMember]
@@ -698,6 +719,7 @@ namespace Newtonsoft.Json.Tests
get { return _Now; } get { return _Now; }
set { _Now = value; } set { _Now = value; }
} }
private DateTime _Now = DateTime.Now; private DateTime _Now = DateTime.Now;
[DataMember] [DataMember]
@@ -706,6 +728,7 @@ namespace Newtonsoft.Json.Tests
get { return _BigNumber; } get { return _BigNumber; }
set { _BigNumber = value; } set { _BigNumber = value; }
} }
private decimal _BigNumber = 1212121.22M; private decimal _BigNumber = 1212121.22M;
[DataMember] [DataMember]
@@ -714,6 +737,7 @@ namespace Newtonsoft.Json.Tests
get { return _Address1; } get { return _Address1; }
set { _Address1 = value; } set { _Address1 = value; }
} }
private Address _Address1 = new Address(); private Address _Address1 = new Address();
@@ -724,13 +748,12 @@ namespace Newtonsoft.Json.Tests
get { return _Addresses; } get { return _Addresses; }
set { _Addresses = value; } set { _Addresses = value; }
} }
private List<Address> _Addresses = new List<Address>(); private List<Address> _Addresses = new List<Address>();
[DataMember] [DataMember] public List<string> strings = new List<string>();
public List<string> strings = new List<string>();
[DataMember] [DataMember] public Dictionary<string, int> dictionary = new Dictionary<string, int>();
public Dictionary<string, int> dictionary = new Dictionary<string, int>();
} }
[Serializable] [Serializable]
@@ -743,6 +766,7 @@ namespace Newtonsoft.Json.Tests
get { return _street; } get { return _street; }
set { _street = value; } set { _street = value; }
} }
private string _street = "32 Kaiea"; private string _street = "32 Kaiea";
[DataMember] [DataMember]
@@ -751,6 +775,7 @@ namespace Newtonsoft.Json.Tests
get { return _Phone; } get { return _Phone; }
set { _Phone = value; } set { _Phone = value; }
} }
private string _Phone = "(503) 814-6335"; private string _Phone = "(503) 814-6335";
[DataMember] [DataMember]
@@ -759,6 +784,7 @@ namespace Newtonsoft.Json.Tests
get { return _Entered; } get { return _Entered; }
set { _Entered = value; } set { _Entered = value; }
} }
private DateTime _Entered = DateTime.Parse("01/01/2007", CultureInfo.CurrentCulture.DateTimeFormat); private DateTime _Entered = DateTime.Parse("01/01/2007", CultureInfo.CurrentCulture.DateTimeFormat);
} }
@@ -778,6 +804,8 @@ namespace Newtonsoft.Json.Tests
[DataMember] [DataMember]
public int[] Scores { get; set; } public int[] Scores { get; set; }
} }
#endregion #endregion
} }
#endif #endif
@@ -5129,6 +5129,20 @@ keyword such as type of business.""
Assert.AreEqual(true, b2.no); Assert.AreEqual(true, b2.no);
} }
[Test]
public void DeserializeNullInt()
{
string json = @"[
1,
2,
3,
null
]";
List<int> numbers = JsonConvert.DeserializeObject<List<int>>(json);
// JsonSerializationException : Error converting value {null} to type 'System.Int32'. Line 5, position 7.
}
} }
public class DecimalTestClass public class DecimalTestClass
Binary file not shown.