-Fixed using FloatParseHandling.Decimal with XmlNodeConverter

-Fixed using DateParseHandling.DateTimeOffset with XmlNodeConverter
This commit is contained in:
James Newton-King
2014-04-25 23:38:52 +12:00
parent 9133626388
commit 081daae006
4 changed files with 101 additions and 1 deletions
@@ -1397,6 +1397,11 @@ namespace Newtonsoft.Json.Converters
}
else if (reader.TokenType == JsonToken.Float)
{
if (reader.Value is decimal)
return XmlConvert.ToString((decimal)reader.Value);
if (reader.Value is float)
return XmlConvert.ToString((float)reader.Value);
return XmlConvert.ToString(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
}
else if (reader.TokenType == JsonToken.Boolean)
@@ -1405,11 +1410,16 @@ namespace Newtonsoft.Json.Converters
}
else if (reader.TokenType == JsonToken.Date)
{
#if !NET20
if (reader.Value is DateTimeOffset)
return XmlConvert.ToString((DateTimeOffset)reader.Value);
#endif
DateTime d = Convert.ToDateTime(reader.Value, CultureInfo.InvariantCulture);
#if !(NETFX_CORE || PORTABLE)
return XmlConvert.ToString(d, DateTimeUtils.ToSerializationMode(d.Kind));
#else
return XmlConvert.ToString(d);
return XmlConvert.ToString(d);
#endif
}
else if (reader.TokenType == JsonToken.Null)