-Fixed Metro build
This commit is contained in:
@@ -584,8 +584,10 @@ namespace Newtonsoft.Json
|
|||||||
return ToString(convertible.ToDateTime(CultureInfo.InvariantCulture));
|
return ToString(convertible.ToDateTime(CultureInfo.InvariantCulture));
|
||||||
case TypeCode.Decimal:
|
case TypeCode.Decimal:
|
||||||
return ToString(convertible.ToDecimal(CultureInfo.InvariantCulture));
|
return ToString(convertible.ToDecimal(CultureInfo.InvariantCulture));
|
||||||
|
#if !NETFX_CORE
|
||||||
case TypeCode.DBNull:
|
case TypeCode.DBNull:
|
||||||
return Null;
|
return Null;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !PocketPC && !NET20
|
#if !PocketPC && !NET20
|
||||||
@@ -629,7 +631,9 @@ namespace Newtonsoft.Json
|
|||||||
case TypeCode.Double:
|
case TypeCode.Double:
|
||||||
case TypeCode.DateTime:
|
case TypeCode.DateTime:
|
||||||
case TypeCode.Decimal:
|
case TypeCode.Decimal:
|
||||||
|
#if !NETFX_CORE
|
||||||
case TypeCode.DBNull:
|
case TypeCode.DBNull:
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1211,9 +1211,11 @@ namespace Newtonsoft.Json
|
|||||||
case TypeCode.Decimal:
|
case TypeCode.Decimal:
|
||||||
WriteValue(convertible.ToDecimal(CultureInfo.InvariantCulture));
|
WriteValue(convertible.ToDecimal(CultureInfo.InvariantCulture));
|
||||||
return;
|
return;
|
||||||
|
#if !NETFX_CORE
|
||||||
case TypeCode.DBNull:
|
case TypeCode.DBNull:
|
||||||
WriteNull();
|
WriteNull();
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !PocketPC && !NET20
|
#if !PocketPC && !NET20
|
||||||
|
|||||||
@@ -427,8 +427,10 @@ namespace Newtonsoft.Json.Schema
|
|||||||
case TypeCode.Empty:
|
case TypeCode.Empty:
|
||||||
case TypeCode.Object:
|
case TypeCode.Object:
|
||||||
return schemaType | JsonSchemaType.String;
|
return schemaType | JsonSchemaType.String;
|
||||||
|
#if !NETFX_CORE
|
||||||
case TypeCode.DBNull:
|
case TypeCode.DBNull:
|
||||||
return schemaType | JsonSchemaType.Null;
|
return schemaType | JsonSchemaType.Null;
|
||||||
|
#endif
|
||||||
case TypeCode.Boolean:
|
case TypeCode.Boolean:
|
||||||
return schemaType | JsonSchemaType.Boolean;
|
return schemaType | JsonSchemaType.Boolean;
|
||||||
case TypeCode.Char:
|
case TypeCode.Char:
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
if (name != null && name != m.Name)
|
if (name != null && name != m.Name)
|
||||||
return false;
|
return false;
|
||||||
if (m.GetMemberType() != memberType)
|
if (m.MemberType() != memberType)
|
||||||
return false;
|
return false;
|
||||||
if (!TestAccessibility(m, bindingFlags))
|
if (!TestAccessibility(m, bindingFlags))
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user