-Added XML documentation
-Fixed various compiler warnings
This commit is contained in:
@@ -69,7 +69,6 @@ using Newtonsoft.Json.Utilities;
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
#if !NET20 && !SILVERLIGHT
|
#if !NET20 && !SILVERLIGHT
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Linq.Expressions;
|
using System.Linq.Expressions;
|
||||||
#endif
|
#endif
|
||||||
@@ -10192,6 +10191,11 @@ Parameter name: value",
|
|||||||
Domain = samAccountName.Split('\\')[0];
|
Domain = samAccountName.Split('\\')[0];
|
||||||
UserName = samAccountName.Split('\\')[1];
|
UserName = samAccountName.Split('\\')[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DirectoryAccount()
|
||||||
|
{
|
||||||
|
_additionalData = new Dictionary<string, JToken>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !NETFX_CORE
|
#if !NETFX_CORE
|
||||||
|
|||||||
@@ -940,7 +940,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Serializes the XML node to a JSON string using formatting and omits the root object if <see cref="omitRootObject"/> is <c>true</c>.
|
/// Serializes the XML node to a JSON string using formatting and omits the root object if <paramref name="omitRootObject"/> is <c>true</c>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="node">The node to serialize.</param>
|
/// <param name="node">The node to serialize.</param>
|
||||||
/// <param name="formatting">Indicates how the output is formatted.</param>
|
/// <param name="formatting">Indicates how the output is formatted.</param>
|
||||||
@@ -964,7 +964,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the XmlNode from a JSON string nested in a root elment specified by <see cref="deserializeRootElementName"/>.
|
/// Deserializes the XmlNode from a JSON string nested in a root elment specified by <paramref name="deserializeRootElementName"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The JSON string.</param>
|
/// <param name="value">The JSON string.</param>
|
||||||
/// <param name="deserializeRootElementName">The name of the root element to append when deserializing.</param>
|
/// <param name="deserializeRootElementName">The name of the root element to append when deserializing.</param>
|
||||||
@@ -975,7 +975,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the XmlNode from a JSON string nested in a root elment specified by <see cref="deserializeRootElementName"/>
|
/// Deserializes the XmlNode from a JSON string nested in a root elment specified by <paramref name="deserializeRootElementName"/>
|
||||||
/// and writes a .NET array attribute for collections.
|
/// and writes a .NET array attribute for collections.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The JSON string.</param>
|
/// <param name="value">The JSON string.</param>
|
||||||
@@ -1018,7 +1018,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Serializes the <see cref="XNode"/> to a JSON string using formatting and omits the root object if <see cref="omitRootObject"/> is <c>true</c>.
|
/// Serializes the <see cref="XNode"/> to a JSON string using formatting and omits the root object if <paramref name="omitRootObject"/> is <c>true</c>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="node">The node to serialize.</param>
|
/// <param name="node">The node to serialize.</param>
|
||||||
/// <param name="formatting">Indicates how the output is formatted.</param>
|
/// <param name="formatting">Indicates how the output is formatted.</param>
|
||||||
@@ -1042,7 +1042,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the <see cref="XNode"/> from a JSON string nested in a root elment specified by <see cref="deserializeRootElementName"/>.
|
/// Deserializes the <see cref="XNode"/> from a JSON string nested in a root elment specified by <paramref name="deserializeRootElementName"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The JSON string.</param>
|
/// <param name="value">The JSON string.</param>
|
||||||
/// <param name="deserializeRootElementName">The name of the root element to append when deserializing.</param>
|
/// <param name="deserializeRootElementName">The name of the root element to append when deserializing.</param>
|
||||||
@@ -1053,7 +1053,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserializes the <see cref="XNode"/> from a JSON string nested in a root elment specified by <see cref="deserializeRootElementName"/>
|
/// Deserializes the <see cref="XNode"/> from a JSON string nested in a root elment specified by <paramref name="deserializeRootElementName"/>
|
||||||
/// and writes a .NET array attribute for collections.
|
/// and writes a .NET array attribute for collections.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">The JSON string.</param>
|
/// <param name="value">The JSON string.</param>
|
||||||
|
|||||||
@@ -3,14 +3,31 @@
|
|||||||
namespace Newtonsoft.Json
|
namespace Newtonsoft.Json
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Instructs the <see cref="JsonSerializer"/> to populate properties with no matching class member onto the specified collection.
|
/// Instructs the <see cref="JsonSerializer"/> to deserialize properties with no matching class member into the specified collection
|
||||||
|
/// and write values during serialization.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
|
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
|
||||||
public class JsonExtensionDataAttribute : Attribute
|
public class JsonExtensionDataAttribute : Attribute
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value that indicates whether to write extension data when serializing the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>
|
||||||
|
/// <c>true</c> to write extension data when serializing the object; otherwise, <c>false</c>. The default is <c>true</c>.
|
||||||
|
/// </value>
|
||||||
public bool WriteData { get; set; }
|
public bool WriteData { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value that indicates whether to read extension data when deserializing the object.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>
|
||||||
|
/// <c>true</c> to read extension data when deserializing the object; otherwise, <c>false</c>. The default is <c>true</c>.
|
||||||
|
/// </value>
|
||||||
public bool ReadData { get; set; }
|
public bool ReadData { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="JsonExtensionDataAttribute"/> class.
|
||||||
|
/// </summary>
|
||||||
public JsonExtensionDataAttribute()
|
public JsonExtensionDataAttribute()
|
||||||
{
|
{
|
||||||
WriteData = true;
|
WriteData = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user