-Changed portable assembly to .NET 4.5, Silverlight 5, Win8, WP8

-Fixed incorrect namespace when converting XML to JSON
This commit is contained in:
James Newton-King
2013-03-06 23:04:26 +13:00
parent f42a6ca001
commit 92de187a74
37 changed files with 235 additions and 84 deletions
@@ -177,7 +177,7 @@ namespace Newtonsoft.Json.Tests.Serialization
}", json);
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
[Test]
public void DynamicCamelCasePropertyNames()
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
using System;
using System.Collections;
using System.Collections.Generic;
@@ -97,6 +97,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(dynamicObject.ChildObject.Text, d.ChildObject.Text);
}
#if !PORTABLE
[Test]
public void SerializeDynamicObjectWithObjectTracking()
{
@@ -145,6 +146,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual("Child text!", n.DynamicChildObject.Text);
Assert.AreEqual(int.MinValue, n.DynamicChildObject.Integer);
}
#endif
[Test]
public void NoPublicDefaultConstructor()
@@ -2123,7 +2123,7 @@ Path '', line 1, position 1.",
});
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
[Test]
public void CannotDeserializeArrayIntoDynamic()
{
@@ -3454,7 +3454,7 @@ To fix this error either change the environment to be fully trusted, change the
}
#endif
#if !(NET20 || SILVERLIGHT || PORTABLE)
#if !(NET20 || SILVERLIGHT)
[Test]
public void SerializeDeserializeXNodeProperties()
{
@@ -4318,7 +4318,7 @@ To fix this error either change the environment to be fully trusted, change the
}", json);
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
[Test]
public void SerializeExpandoObject()
{
@@ -210,7 +210,7 @@ namespace Newtonsoft.Json.Tests.Serialization
}
#endif
#if !(PORTABLE || NET20 || NET35 || WINDOWS_PHONE)
#if !(NET20 || NET35 || WINDOWS_PHONE)
public class DictionaryDynamicObject : DynamicObject
{
public IDictionary<string, object> Values { get; private set; }
@@ -612,7 +612,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(@"Unexpected end when deserializing object. Path 'events2.code', line 1, position 49.", errors[1]);
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
[Test]
public void ErrorHandlingEndOfContentDynamic()
{
@@ -1445,7 +1445,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(1, (int)j["MyProperty"]);
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
[Test]
public void PropertyItemTypeNameHandlingDynamic()
{
@@ -1651,7 +1651,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public TypeNameHandlingTestObject Data { get; set; }
}
#if !(NET35 || NET20 || WINDOWS_PHONE || PORTABLE)
#if !(NET35 || NET20 || WINDOWS_PHONE)
public class PropertyItemTypeNameHandlingDynamic
{
[JsonProperty(ItemTypeNameHandling = TypeNameHandling.All)]