-Renamed aspnetcore50 to dnxcore50
-Documentation
This commit is contained in:
@@ -41,7 +41,7 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
|
||||
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
|
||||
using TestMethod = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
|
||||
using SetUp = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitializeAttribute;
|
||||
#elif ASPNETCORE50
|
||||
#elif DNXCORE50
|
||||
using Xunit;
|
||||
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||
using XAssert = Xunit.Assert;
|
||||
@@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
public static IEnumerable<ConstructorInfo> GetConstructors(Type type)
|
||||
{
|
||||
#if !(NETFX_CORE || ASPNETCORE50)
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
return type.GetConstructors();
|
||||
#else
|
||||
return type.GetTypeInfo().DeclaredConstructors;
|
||||
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public static PropertyInfo GetProperty(Type type, string name)
|
||||
{
|
||||
#if !(NETFX_CORE || ASPNETCORE50)
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
return type.GetProperty(name);
|
||||
#else
|
||||
return type.GetTypeInfo().GetDeclaredProperty(name);
|
||||
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public static FieldInfo GetField(Type type, string name)
|
||||
{
|
||||
#if !(NETFX_CORE || ASPNETCORE50)
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
return type.GetField(name);
|
||||
#else
|
||||
return type.GetTypeInfo().GetDeclaredField(name);
|
||||
@@ -89,7 +89,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public static MethodInfo GetMethod(Type type, string name)
|
||||
{
|
||||
#if !(NETFX_CORE || ASPNETCORE50)
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
return type.GetMethod(name);
|
||||
#else
|
||||
return type.GetTypeInfo().GetDeclaredMethod(name);
|
||||
@@ -97,7 +97,7 @@ namespace Newtonsoft.Json.Tests
|
||||
}
|
||||
}
|
||||
|
||||
#if ASPNETCORE50
|
||||
#if DNXCORE50
|
||||
public class TestFixtureAttribute : Attribute
|
||||
{
|
||||
// xunit doesn't need a test fixture attribute
|
||||
@@ -254,7 +254,7 @@ namespace Newtonsoft.Json.Tests
|
||||
return bytes;
|
||||
}
|
||||
|
||||
#if ASPNETCORE50
|
||||
#if DNXCORE50
|
||||
protected TestFixtureBase()
|
||||
#else
|
||||
[SetUp]
|
||||
@@ -312,7 +312,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public static void Contains(IList collection, object value, string message)
|
||||
{
|
||||
#if !(NETFX_CORE || ASPNETCORE50)
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
Assert.Contains(value, collection, message);
|
||||
#else
|
||||
if (!collection.Cast<object>().Any(i => i.Equals(value)))
|
||||
|
||||
Reference in New Issue
Block a user