-WinRT build

This commit is contained in:
James Newton-King
2015-01-11 18:17:45 +13:00
parent ec6c64c8b6
commit 3936094b66
7 changed files with 24 additions and 4 deletions
@@ -167,6 +167,8 @@
<Compile Include="Serialization\ConstructorHandlingTests.cs" /> <Compile Include="Serialization\ConstructorHandlingTests.cs" />
<Compile Include="Serialization\ContractResolverTests.cs" /> <Compile Include="Serialization\ContractResolverTests.cs" />
<Compile Include="Serialization\DefaultValueHandlingTests.cs" /> <Compile Include="Serialization\DefaultValueHandlingTests.cs" />
<Compile Include="Serialization\DependencyInjectionTests.cs" />
<Compile Include="Serialization\DynamicConcreteTests.cs" />
<Compile Include="Serialization\DynamicTests.cs" /> <Compile Include="Serialization\DynamicTests.cs" />
<Compile Include="Serialization\EntitiesSerializationTests.cs" /> <Compile Include="Serialization\EntitiesSerializationTests.cs" />
<Compile Include="Serialization\ExtensionDataTests.cs" /> <Compile Include="Serialization\ExtensionDataTests.cs" />
@@ -180,6 +182,7 @@
<Compile Include="Serialization\PopulateTests.cs" /> <Compile Include="Serialization\PopulateTests.cs" />
<Compile Include="Serialization\PreserveReferencesHandlingTests.cs" /> <Compile Include="Serialization\PreserveReferencesHandlingTests.cs" />
<Compile Include="Serialization\ReferenceLoopHandlingTests.cs" /> <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
<Compile Include="Serialization\ReflectionAttributeProviderTests.cs" />
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" /> <Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
<Compile Include="Serialization\SerializationEventAttributeTests.cs" /> <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
<Compile Include="Serialization\ShouldSerializeTests.cs" /> <Compile Include="Serialization\ShouldSerializeTests.cs" />
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#endregion #endregion
#if !(NET40 || NET35 || NET20 || ASPNETCORE50 || PORTABLE || PORTABLE40) #if !(NET40 || NET35 || NET20 || ASPNETCORE50 || PORTABLE || PORTABLE40 || NETFX_CORE)
using Autofac; using Autofac;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -724,7 +724,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.AreEqual(2, (int)c.ExtensionData0["second"]); Assert.AreEqual(2, (int)c.ExtensionData0["second"]);
} }
public class Test public class TestClass
{ {
[JsonProperty("LastActivityDate")] [JsonProperty("LastActivityDate")]
public DateTime? LastActivityDate { get; set; } public DateTime? LastActivityDate { get; set; }
@@ -738,7 +738,7 @@ namespace Newtonsoft.Json.Tests.Serialization
{ {
string json = @"{ ""LastActivityDate"":null, ""CustomField1"":""Testing"" }"; string json = @"{ ""LastActivityDate"":null, ""CustomField1"":""Testing"" }";
var c = JsonConvert.DeserializeObject<Test>(json); var c = JsonConvert.DeserializeObject<TestClass>(json);
Assert.AreEqual(null, c.LastActivityDate); Assert.AreEqual(null, c.LastActivityDate);
Assert.AreEqual(1, c.CustomFields.Count); Assert.AreEqual(1, c.CustomFields.Count);
@@ -58,6 +58,7 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture] [TestFixture]
public class JsonSerializerCollectionsTests : TestFixtureBase public class JsonSerializerCollectionsTests : TestFixtureBase
{ {
#if !NETFX_CORE
public class NameValueCollectionTestClass public class NameValueCollectionTestClass
{ {
public NameValueCollection Collection { get; set; } public NameValueCollection Collection { get; set; }
@@ -70,6 +71,7 @@ namespace Newtonsoft.Json.Tests.Serialization
() => JsonConvert.DeserializeObject<NameValueCollectionTestClass>("{Collection:[]}"), () => JsonConvert.DeserializeObject<NameValueCollectionTestClass>("{Collection:[]}"),
"Cannot create and populate list type System.Collections.Specialized.NameValueCollection. Path 'Collection', line 1, position 13."); "Cannot create and populate list type System.Collections.Specialized.NameValueCollection. Path 'Collection', line 1, position 13.");
} }
#endif
[Test] [Test]
public void MultiDObjectArray() public void MultiDObjectArray()
@@ -8588,6 +8588,7 @@ Path '', line 1, position 1.");
Assert.AreEqual("derived", d.DerivedProperty); Assert.AreEqual("derived", d.DerivedProperty);
} }
#if !NETFX_CORE
[Test] [Test]
public void MailMessageConverterTest() public void MailMessageConverterTest()
{ {
@@ -8732,6 +8733,7 @@ Path '', line 1, position 1.");
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }
#endif
} }
public class DerivedWithPrivate : BaseWithPrivate public class DerivedWithPrivate : BaseWithPrivate
@@ -31,7 +31,18 @@ using System.Runtime.Serialization;
using System.Text; using System.Text;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
using Newtonsoft.Json.Utilities;
#if NETFX_CORE
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#elif ASPNETCORE50
using Xunit;
using Test = Xunit.FactAttribute;
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
#else
using NUnit.Framework; using NUnit.Framework;
#endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
{ {
@@ -75,7 +86,7 @@ namespace Newtonsoft.Json.Tests.Serialization
[Test] [Test]
public void GetAttributes_Field() public void GetAttributes_Field()
{ {
FieldInfo field = typeof(ReflectionTestObject).GetField("TestField"); FieldInfo field = (FieldInfo)typeof(ReflectionTestObject).GetField("TestField");
ReflectionAttributeProvider provider = new ReflectionAttributeProvider(field); ReflectionAttributeProvider provider = new ReflectionAttributeProvider(field);
@@ -235,6 +235,7 @@
<Compile Include="Serialization\ErrorContext.cs" /> <Compile Include="Serialization\ErrorContext.cs" />
<Compile Include="Serialization\ErrorEventArgs.cs" /> <Compile Include="Serialization\ErrorEventArgs.cs" />
<Compile Include="Serialization\ExpressionValueProvider.cs" /> <Compile Include="Serialization\ExpressionValueProvider.cs" />
<Compile Include="Serialization\IAttributeProvider.cs" />
<Compile Include="Serialization\IContractResolver.cs" /> <Compile Include="Serialization\IContractResolver.cs" />
<Compile Include="Serialization\IReferenceResolver.cs" /> <Compile Include="Serialization\IReferenceResolver.cs" />
<Compile Include="Serialization\ITraceWriter.cs" /> <Compile Include="Serialization\ITraceWriter.cs" />
@@ -259,6 +260,7 @@
<Compile Include="Serialization\JsonTypeReflector.cs" /> <Compile Include="Serialization\JsonTypeReflector.cs" />
<Compile Include="Serialization\ObjectConstructor.cs" /> <Compile Include="Serialization\ObjectConstructor.cs" />
<Compile Include="Serialization\OnErrorAttribute.cs" /> <Compile Include="Serialization\OnErrorAttribute.cs" />
<Compile Include="Serialization\ReflectionAttributeProvider.cs" />
<Compile Include="Serialization\ReflectionValueProvider.cs" /> <Compile Include="Serialization\ReflectionValueProvider.cs" />
<Compile Include="Serialization\DiagnosticsTraceWriter.cs" /> <Compile Include="Serialization\DiagnosticsTraceWriter.cs" />
<Compile Include="Serialization\MemoryTraceWriter.cs" /> <Compile Include="Serialization\MemoryTraceWriter.cs" />