-Updated documentation

-Added complete ADO.NET Entities serialization and deserialization
This commit is contained in:
JamesNK
2009-07-26 06:34:28 +00:00
parent 265abaf08c
commit b20d58bb92
26 changed files with 1491 additions and 409 deletions
+14 -1
View File
@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Utilities;
using System.Runtime.Serialization;
@@ -51,6 +52,13 @@ namespace Newtonsoft.Json
private IReferenceResolver _referenceResolver;
private SerializationBinder _binder;
private static readonly IList<JsonConverter> BuiltInConverters = new List<JsonConverter>
{
#if !PocketPC && !SILVERLIGHT
new EntityKeyMemberConverter()
#endif
};
/// <summary>
/// Gets or sets the <see cref="IReferenceResolver"/> used by the serializer when resolving references.
/// </summary>
@@ -388,7 +396,12 @@ namespace Newtonsoft.Json
internal bool HasMatchingConverter(Type type, out JsonConverter matchingConverter)
{
return HasMatchingConverter(_converters, type, out matchingConverter);
if (HasMatchingConverter(_converters, type, out matchingConverter))
return true;
if (HasMatchingConverter(BuiltInConverters, type, out matchingConverter))
return true;
return false;
}
internal static bool HasMatchingConverter(IList<JsonConverter> converters, Type objectType, out JsonConverter matchingConverter)