-Merge
This commit is contained in:
@@ -27,7 +27,13 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
#if !NETFX_CORE
|
||||
using global::NUnit.Framework;
|
||||
#else
|
||||
using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
|
||||
using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
|
||||
using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
|
||||
#endif
|
||||
using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Utilities
|
||||
|
||||
@@ -23,7 +23,13 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
using NUnit.Framework;
|
||||
#if !NETFX_CORE
|
||||
using global::NUnit.Framework;
|
||||
#else
|
||||
using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
|
||||
using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
|
||||
using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
|
||||
#endif
|
||||
using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Utilities
|
||||
|
||||
Reference in New Issue
Block a user