Merge branch 'master' into Move-classes-to-files-under-TestObjects
# Conflicts: # Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs # Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs # Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs # Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs # Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs # Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs # Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs # Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs
This commit is contained in:
@@ -32,11 +32,7 @@ using Newtonsoft.Json.Serialization;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using Newtonsoft.Json.Tests.TestObjects.Organization;
|
||||
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 DNXCORE50
|
||||
#if DNXCORE50
|
||||
using Xunit;
|
||||
using Test = Xunit.FactAttribute;
|
||||
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||
@@ -116,7 +112,6 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
}, @"Cannot preserve reference to array or readonly list, or list created from a non-default constructor: System.String[][]. Path '$values', line 3, position 14.");
|
||||
}
|
||||
|
||||
#if !NETFX_CORE
|
||||
[Test]
|
||||
public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid()
|
||||
{
|
||||
@@ -143,7 +138,6 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Assert.AreEqual(someValue, deserializedObject[contextKey]);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void DeserializeGuid()
|
||||
|
||||
Reference in New Issue
Block a user