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:
@@ -23,7 +23,7 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40 || NETFX_CORE)
|
||||
#if !(NET40 || NET35 || NET20 || DNXCORE50 || PORTABLE || PORTABLE40)
|
||||
using Autofac;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
@@ -37,11 +37,7 @@ using Autofac.Core;
|
||||
using Autofac.Core.Activators.Reflection;
|
||||
using Microsoft.FSharp.Collections;
|
||||
using Newtonsoft.Json.Tests.TestObjects.Organization;
|
||||
#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;
|
||||
|
||||
Reference in New Issue
Block a user