-Fixed Metro build

2012-03-15 19:36:29 +13:00
parent 5800e97ff3
commit 9c7fb730f2
4 changed files with 9 additions and 1 deletions
@@ -584,8 +584,10 @@ namespace Newtonsoft.Json
            return ToString(convertible.ToDateTime(CultureInfo.InvariantCulture));
          case TypeCode.Decimal:
            return ToString(convertible.ToDecimal(CultureInfo.InvariantCulture));
+#if !NETFX_CORE
          case TypeCode.DBNull:
            return Null;
+#endif
        }
      }
 #if !PocketPC && !NET20
@@ -629,7 +631,9 @@ namespace Newtonsoft.Json
        case TypeCode.Double:
        case TypeCode.DateTime:
        case TypeCode.Decimal:
+#if !NETFX_CORE
        case TypeCode.DBNull:
+#endif
          return true;
        default:
          return false;
@@ -1211,9 +1211,11 @@ namespace Newtonsoft.Json
          case TypeCode.Decimal:
            WriteValue(convertible.ToDecimal(CultureInfo.InvariantCulture));
            return;
+#if !NETFX_CORE
          case TypeCode.DBNull:
            WriteNull();
            return;
+#endif
        }
      }
 #if !PocketPC && !NET20
@@ -427,8 +427,10 @@ namespace Newtonsoft.Json.Schema
        case TypeCode.Empty:
        case TypeCode.Object:
          return schemaType | JsonSchemaType.String;
+#if !NETFX_CORE
        case TypeCode.DBNull:
          return schemaType | JsonSchemaType.Null;
+#endif
        case TypeCode.Boolean:
          return schemaType | JsonSchemaType.Boolean;
        case TypeCode.Char:
@@ -189,7 +189,7 @@ namespace Newtonsoft.Json.Utilities
        {
          if (name != null && name != m.Name)
            return false;
-          if (m.GetMemberType() != memberType)
+          if (m.MemberType() != memberType)
            return false;
          if (!TestAccessibility(m, bindingFlags))
            return false;