-Added reading and writing binary JSON (BSON) support - work in progress
-Added BsonReader, BsonWriter -Added support for reading and writing byte arrays to JsonReader, JsonWriter and LINQ to JSON classes -Added ReadAsBytes to JsonReader -Changed Silverlight build serializer to look for a TypeConverter -Changed .NET build to not rely on System.ComponentModel.DataAnnotations assembly to support .NET 4.0 client profile -Remove DateTimeOffset stand-in from Compact Framework build -Fixed .NET 2.0 build to run on environments without .NET 2.0 SP1 -Fixed deserialization to always use a new value created from a JsonConverter -Fixed XmlNodeConverter to support converting comments in JSON
This commit is contained in:
@@ -37,12 +37,24 @@ namespace Newtonsoft.Json
|
||||
/// </summary>
|
||||
public class JsonTextWriter : JsonWriter
|
||||
{
|
||||
private TextWriter _writer;
|
||||
private readonly TextWriter _writer;
|
||||
private Base64Encoder _base64Encoder;
|
||||
private char _indentChar;
|
||||
private int _indentation;
|
||||
private char _quoteChar;
|
||||
private bool _quoteName;
|
||||
|
||||
private Base64Encoder Base64Encoder
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_base64Encoder == null)
|
||||
_base64Encoder = new Base64Encoder(_writer);
|
||||
|
||||
return _base64Encoder;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets how many IndentChars to write for each level in the hierarchy when <paramref name="Formatting"/> is set to <c>Formatting.Indented</c>.
|
||||
/// </summary>
|
||||
@@ -419,6 +431,20 @@ namespace Newtonsoft.Json
|
||||
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Date);
|
||||
}
|
||||
|
||||
public override void WriteValue(byte[] value)
|
||||
{
|
||||
base.WriteValue(value);
|
||||
|
||||
if (value != null)
|
||||
{
|
||||
_writer.Write(_quoteChar);
|
||||
Base64Encoder.Encode(value, 0, value.Length);
|
||||
Base64Encoder.Flush();
|
||||
_writer.Write(_quoteChar);
|
||||
}
|
||||
}
|
||||
|
||||
#if !PocketPC && !NET20
|
||||
/// <summary>
|
||||
/// Writes a <see cref="DateTimeOffset"/> value.
|
||||
/// </summary>
|
||||
@@ -428,6 +454,7 @@ namespace Newtonsoft.Json
|
||||
base.WriteValue(value);
|
||||
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Date);
|
||||
}
|
||||
#endif
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user