-Portable build issue fixed (hopefully)
This commit is contained in:
@@ -27,25 +27,25 @@
|
|||||||
extern alias NewtonsoftJson;
|
extern alias NewtonsoftJson;
|
||||||
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
||||||
#endif
|
#endif
|
||||||
using System;
|
using global::System;
|
||||||
using System.Collections;
|
using global::System.Collections;
|
||||||
using System.Collections.Generic;
|
using global::System.Collections.Generic;
|
||||||
using System.Globalization;
|
using global::System.Globalization;
|
||||||
using System.Runtime.Serialization.Formatters;
|
using global::System.Runtime.Serialization.Formatters;
|
||||||
using Newtonsoft.Json.Linq;
|
using global::Newtonsoft.Json.Linq;
|
||||||
using Newtonsoft.Json.Serialization;
|
using global::Newtonsoft.Json.Serialization;
|
||||||
using Newtonsoft.Json.Tests.TestObjects;
|
using global::Newtonsoft.Json.Tests.TestObjects;
|
||||||
#if !NETFX_CORE
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using global::NUnit.Framework;
|
||||||
#else
|
#else
|
||||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
using global::Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
|
using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
|
||||||
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
|
using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
|
||||||
#endif
|
#endif
|
||||||
using Newtonsoft.Json.Utilities;
|
using global::Newtonsoft.Json.Utilities;
|
||||||
using System.Net;
|
using global::System.Net;
|
||||||
using System.Runtime.Serialization;
|
using global::System.Runtime.Serialization;
|
||||||
using System.IO;
|
using global::System.IO;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Serialization
|
namespace Newtonsoft.Json.Tests.Serialization
|
||||||
{
|
{
|
||||||
@@ -72,9 +72,9 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(wrapper, Formatting.Indented, new JsonSerializerSettings
|
string json = JsonConvert.SerializeObject(wrapper, Formatting.Indented, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
TypeNameHandling = TypeNameHandling.Auto
|
TypeNameHandling = TypeNameHandling.Auto
|
||||||
});
|
});
|
||||||
|
|
||||||
Assert.AreEqual(@"{
|
Assert.AreEqual(@"{
|
||||||
""Array"": [
|
""Array"": [
|
||||||
@@ -277,13 +277,13 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
ExceptionAssert.Throws<JsonSerializationException>(
|
ExceptionAssert.Throws<JsonSerializationException>(
|
||||||
@"Type specified in JSON '" + employeeRef + @"' is not compatible with '" + personRef + @"'. Path '$type', line 3, position 143.",
|
@"Type specified in JSON '" + employeeRef + @"' is not compatible with '" + personRef + @"'. Path '$type', line 3, position 143.",
|
||||||
() =>
|
() =>
|
||||||
|
{
|
||||||
|
JsonConvert.DeserializeObject(json, typeof(Person), new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
JsonConvert.DeserializeObject(json, typeof (Person), new JsonSerializerSettings
|
TypeNameHandling = TypeNameHandling.Objects,
|
||||||
{
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
||||||
TypeNameHandling = TypeNameHandling.Objects,
|
|
||||||
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@@ -319,12 +319,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
ExceptionAssert.Throws<JsonSerializationException>(
|
ExceptionAssert.Throws<JsonSerializationException>(
|
||||||
"Type specified in JSON 'Newtonsoft.Json.Tests.TestObjects.Employee' was not resolved. Path '$type', line 3, position 56.",
|
"Type specified in JSON 'Newtonsoft.Json.Tests.TestObjects.Employee' was not resolved. Path '$type', line 3, position 56.",
|
||||||
() =>
|
() =>
|
||||||
|
{
|
||||||
|
JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
|
TypeNameHandling = TypeNameHandling.Objects
|
||||||
{
|
|
||||||
TypeNameHandling = TypeNameHandling.Objects
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface ICorrelatedMessage
|
public interface ICorrelatedMessage
|
||||||
@@ -369,10 +369,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
}";
|
}";
|
||||||
|
|
||||||
ICorrelatedMessage message = JsonConvert.DeserializeObject<ICorrelatedMessage>(json, new JsonSerializerSettings
|
ICorrelatedMessage message = JsonConvert.DeserializeObject<ICorrelatedMessage>(json, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
TypeNameHandling = TypeNameHandling.Objects,
|
TypeNameHandling = TypeNameHandling.Objects,
|
||||||
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
||||||
});
|
});
|
||||||
|
|
||||||
CustomAssert.IsInstanceOfType(typeof(SendHttpRequest), message);
|
CustomAssert.IsInstanceOfType(typeof(SendHttpRequest), message);
|
||||||
|
|
||||||
@@ -389,18 +389,18 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
string productListTypeName = typeof(List<Product>).AssemblyQualifiedName;
|
string productListTypeName = typeof(List<Product>).AssemblyQualifiedName;
|
||||||
|
|
||||||
Container container = new Container
|
Container container = new Container
|
||||||
{
|
{
|
||||||
In = new List<Product>(),
|
In = new List<Product>(),
|
||||||
Out = new List<Product>()
|
Out = new List<Product>()
|
||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(container, Formatting.Indented,
|
string json = JsonConvert.SerializeObject(container, Formatting.Indented,
|
||||||
new JsonSerializerSettings
|
new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
NullValueHandling = NullValueHandling.Ignore,
|
NullValueHandling = NullValueHandling.Ignore,
|
||||||
TypeNameHandling = TypeNameHandling.All,
|
TypeNameHandling = TypeNameHandling.All,
|
||||||
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
|
||||||
});
|
});
|
||||||
|
|
||||||
Assert.AreEqual(@"{
|
Assert.AreEqual(@"{
|
||||||
""$type"": """ + containerTypeName + @""",
|
""$type"": """ + containerTypeName + @""",
|
||||||
@@ -428,13 +428,13 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
string typeNamePropertyRef = ReflectionUtils.GetTypeName(typeof(TypeNameProperty), FormatterAssemblyStyle.Simple);
|
string typeNamePropertyRef = ReflectionUtils.GetTypeName(typeof(TypeNameProperty), FormatterAssemblyStyle.Simple);
|
||||||
|
|
||||||
TypeNameProperty typeNameProperty = new TypeNameProperty
|
TypeNameProperty typeNameProperty = new TypeNameProperty
|
||||||
{
|
{
|
||||||
Name = "Name!",
|
Name = "Name!",
|
||||||
Value = new TypeNameProperty
|
Value = new TypeNameProperty
|
||||||
{
|
{
|
||||||
Name = "Nested!"
|
Name = "Nested!"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(typeNameProperty, Formatting.Indented);
|
string json = JsonConvert.SerializeObject(typeNameProperty, Formatting.Indented);
|
||||||
|
|
||||||
@@ -522,7 +522,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
public override Type BindToType(string assemblyName, string typeName)
|
public override Type BindToType(string assemblyName, string typeName)
|
||||||
{
|
{
|
||||||
return typeof (Person);
|
return typeof(Person);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -580,10 +580,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
]", json);
|
]", json);
|
||||||
|
|
||||||
IList<object> newValues = JsonConvert.DeserializeObject<IList<object>>(json, new JsonSerializerSettings
|
IList<object> newValues = JsonConvert.DeserializeObject<IList<object>>(json, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
TypeNameHandling = TypeNameHandling.Auto,
|
TypeNameHandling = TypeNameHandling.Auto,
|
||||||
Binder = new TypeNameSerializationBinder("Newtonsoft.Json.Tests.Serialization.{0}, Newtonsoft.Json.Tests")
|
Binder = new TypeNameSerializationBinder("Newtonsoft.Json.Tests.Serialization.{0}, Newtonsoft.Json.Tests")
|
||||||
});
|
});
|
||||||
|
|
||||||
CustomAssert.IsInstanceOfType(typeof(Customer), newValues[0]);
|
CustomAssert.IsInstanceOfType(typeof(Customer), newValues[0]);
|
||||||
Customer customer = (Customer)newValues[0];
|
Customer customer = (Customer)newValues[0];
|
||||||
@@ -699,10 +699,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Message message = new Message();
|
Message message = new Message();
|
||||||
message.Address = "http://www.google.com";
|
message.Address = "http://www.google.com";
|
||||||
message.Body = new SearchDetails
|
message.Body = new SearchDetails
|
||||||
{
|
{
|
||||||
Query = "Json.NET",
|
Query = "Json.NET",
|
||||||
Language = "en-us"
|
Language = "en-us"
|
||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(message, Formatting.Indented);
|
string json = JsonConvert.SerializeObject(message, Formatting.Indented);
|
||||||
// {
|
// {
|
||||||
@@ -716,7 +716,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
|
|
||||||
Message deserialized = JsonConvert.DeserializeObject<Message>(json);
|
Message deserialized = JsonConvert.DeserializeObject<Message>(json);
|
||||||
|
|
||||||
SearchDetails searchDetails = (SearchDetails) deserialized.Body;
|
SearchDetails searchDetails = (SearchDetails)deserialized.Body;
|
||||||
// Json.NET
|
// Json.NET
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -748,7 +748,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
|
||||||
});
|
});
|
||||||
|
|
||||||
string urlStatusTypeName = ReflectionUtils.GetTypeName(typeof (UrlStatus), FormatterAssemblyStyle.Simple);
|
string urlStatusTypeName = ReflectionUtils.GetTypeName(typeof(UrlStatus), FormatterAssemblyStyle.Simple);
|
||||||
|
|
||||||
Assert.AreEqual(@"{
|
Assert.AreEqual(@"{
|
||||||
""$type"": ""System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib"",
|
""$type"": ""System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib"",
|
||||||
@@ -791,7 +791,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(3, newCollection.Count);
|
Assert.AreEqual(3, newCollection.Count);
|
||||||
Assert.AreEqual(@"http://www.bing.com", ((UrlStatus)newCollection["First"]).Url);
|
Assert.AreEqual(@"http://www.bing.com", ((UrlStatus)newCollection["First"]).Url);
|
||||||
|
|
||||||
List<UrlStatus> statues = (List<UrlStatus>) newCollection["List"];
|
List<UrlStatus> statues = (List<UrlStatus>)newCollection["List"];
|
||||||
Assert.AreEqual(2, statues.Count);
|
Assert.AreEqual(2, statues.Count);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -874,7 +874,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
{
|
{
|
||||||
Car testerObject = new Car();
|
Car testerObject = new Car();
|
||||||
testerObject.Year = new DateTime(2000, 10, 5, 1, 1, 1, DateTimeKind.Utc);
|
testerObject.Year = new DateTime(2000, 10, 5, 1, 1, 1, DateTimeKind.Utc);
|
||||||
byte[] data = new byte[] {75, 65, 82, 73, 82, 65};
|
byte[] data = new byte[] { 75, 65, 82, 73, 82, 65 };
|
||||||
testerObject.Objects = new object[] { data, "prueba" };
|
testerObject.Objects = new object[] { data, "prueba" };
|
||||||
|
|
||||||
JsonSerializerSettings jsonSettings = new JsonSerializerSettings();
|
JsonSerializerSettings jsonSettings = new JsonSerializerSettings();
|
||||||
@@ -917,9 +917,9 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
IExample e = new Example("Rob");
|
IExample e = new Example("Rob");
|
||||||
|
|
||||||
SerializableWrapper w = new SerializableWrapper
|
SerializableWrapper w = new SerializableWrapper
|
||||||
{
|
{
|
||||||
Content = e
|
Content = e
|
||||||
};
|
};
|
||||||
|
|
||||||
//Test Binary Serialization Round Trip
|
//Test Binary Serialization Round Trip
|
||||||
//This will work find because the Binary Formatter serializes type names
|
//This will work find because the Binary Formatter serializes type names
|
||||||
@@ -963,23 +963,23 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public void SerializationBinderWithFullName()
|
public void SerializationBinderWithFullName()
|
||||||
{
|
{
|
||||||
Message message = new Message
|
Message message = new Message
|
||||||
{
|
{
|
||||||
Address = "jamesnk@testtown.com",
|
Address = "jamesnk@testtown.com",
|
||||||
Body = new Version(1, 2, 3, 4)
|
Body = new Version(1, 2, 3, 4)
|
||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(message, Formatting.Indented, new JsonSerializerSettings
|
string json = JsonConvert.SerializeObject(message, Formatting.Indented, new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
TypeNameHandling = TypeNameHandling.All,
|
||||||
|
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
|
||||||
|
Binder = new MetroBinder(),
|
||||||
|
ContractResolver = new DefaultContractResolver
|
||||||
{
|
{
|
||||||
TypeNameHandling = TypeNameHandling.All,
|
|
||||||
TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
|
|
||||||
Binder = new MetroBinder(),
|
|
||||||
ContractResolver = new DefaultContractResolver
|
|
||||||
{
|
|
||||||
#if !(SILVERLIGHT || NETFX_CORE || PORTABLE)
|
#if !(SILVERLIGHT || NETFX_CORE || PORTABLE)
|
||||||
IgnoreSerializableAttribute = true
|
IgnoreSerializableAttribute = true
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Assert.AreEqual(@"{
|
Assert.AreEqual(@"{
|
||||||
""$type"": "":::MESSAGE:::, AssemblyName"",
|
""$type"": "":::MESSAGE:::, AssemblyName"",
|
||||||
@@ -1035,10 +1035,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
TypeNameList<object> l = new TypeNameList<object>();
|
TypeNameList<object> l = new TypeNameList<object>();
|
||||||
l.Add(c1);
|
l.Add(c1);
|
||||||
l.Add(new Employee
|
l.Add(new Employee
|
||||||
{
|
{
|
||||||
BirthDate = new DateTime(2000, 12, 12, 12, 12, 12, DateTimeKind.Utc),
|
BirthDate = new DateTime(2000, 12, 12, 12, 12, 12, DateTimeKind.Utc),
|
||||||
Department = "Department!"
|
Department = "Department!"
|
||||||
});
|
});
|
||||||
l.Add("String!");
|
l.Add("String!");
|
||||||
l.Add(long.MaxValue);
|
l.Add(long.MaxValue);
|
||||||
|
|
||||||
|
|||||||
@@ -2,17 +2,17 @@
|
|||||||
extern alias NewtonsoftJson;
|
extern alias NewtonsoftJson;
|
||||||
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
using FormatterAssemblyStyle = NewtonsoftJson::System.Runtime.Serialization.Formatters.FormatterAssemblyStyle;
|
||||||
#endif
|
#endif
|
||||||
using System;
|
using global::System;
|
||||||
using System.Collections.Generic;
|
using global::System.Collections.Generic;
|
||||||
using System.Runtime.Serialization.Formatters;
|
using global::System.Runtime.Serialization.Formatters;
|
||||||
#if !NETFX_CORE
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using global::NUnit.Framework;
|
||||||
#else
|
#else
|
||||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
using global::Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
|
using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
|
||||||
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
|
using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
|
||||||
#endif
|
#endif
|
||||||
using Newtonsoft.Json.Utilities;
|
using global::Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Utilities
|
namespace Newtonsoft.Json.Tests.Utilities
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user