Updating Newtownsoft Json

This commit is contained in:
Nicholas Mayne 2014-05-17 11:12:59 +01:00
parent 6c4b830866
commit 4761ec4313
7 changed files with 164 additions and 56 deletions

Binary file not shown.

View File

@ -133,6 +133,15 @@
the reader is closed; otherwise false. The default is true.
</value>
</member>
<member name="P:Newtonsoft.Json.JsonReader.SupportMultipleContent">
<summary>
Gets or sets a value indicating whether multiple pieces of JSON content can
be read from a continuous stream without erroring.
</summary>
<value>
true to support reading multiple pieces of JSON content; otherwise false. The default is false.
</value>
</member>
<member name="P:Newtonsoft.Json.JsonReader.QuoteChar">
<summary>
Gets the quotation mark character used to enclose the value of a string.
@ -153,6 +162,11 @@
Get or set how floating point numbers, e.g. 1.0 and 9.9, are parsed when reading JSON text.
</summary>
</member>
<member name="P:Newtonsoft.Json.JsonReader.DateFormatString">
<summary>
Get or set how custom date formatted strings are parsed when reading JSON.
</summary>
</member>
<member name="P:Newtonsoft.Json.JsonReader.MaxDepth">
<summary>
Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
@ -1283,6 +1297,38 @@
<c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
</returns>
</member>
<member name="T:Newtonsoft.Json.Converters.DiscriminatedUnionConverter">
<summary>
Converts a F# discriminated union type to and from JSON.
</summary>
</member>
<member name="M:Newtonsoft.Json.Converters.DiscriminatedUnionConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
<summary>
Writes the JSON representation of the object.
</summary>
<param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param>
<param name="value">The value.</param>
<param name="serializer">The calling serializer.</param>
</member>
<member name="M:Newtonsoft.Json.Converters.DiscriminatedUnionConverter.ReadJson(Newtonsoft.Json.JsonReader,System.Type,System.Object,Newtonsoft.Json.JsonSerializer)">
<summary>
Reads the JSON representation of the object.
</summary>
<param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
<param name="objectType">Type of the object.</param>
<param name="existingValue">The existing value of object being read.</param>
<param name="serializer">The calling serializer.</param>
<returns>The object value.</returns>
</member>
<member name="M:Newtonsoft.Json.Converters.DiscriminatedUnionConverter.CanConvert(System.Type)">
<summary>
Determines whether this instance can convert the specified object type.
</summary>
<param name="objectType">Type of the object.</param>
<returns>
<c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
</returns>
</member>
<member name="T:Newtonsoft.Json.Converters.EntityKeyMemberConverter">
<summary>
Converts an Entity Framework EntityKey to and from JSON.
@ -1488,6 +1534,11 @@
Converts an <see cref="T:System.Enum"/> to and from its name string value.
</summary>
</member>
<member name="M:Newtonsoft.Json.Converters.StringEnumConverter.#ctor">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.StringEnumConverter"/> class.
</summary>
</member>
<member name="M:Newtonsoft.Json.Converters.StringEnumConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
<summary>
Writes the JSON representation of the object.
@ -1521,6 +1572,12 @@
</summary>
<value><c>true</c> if the written enum text will be camel case; otherwise, <c>false</c>.</value>
</member>
<member name="P:Newtonsoft.Json.Converters.StringEnumConverter.AllowIntegerValues">
<summary>
Gets or sets a value indicating whether integer values are allowed.
</summary>
<value><c>true</c> if integers are allowed; otherwise, <c>false</c>.</value>
</member>
<member name="T:Newtonsoft.Json.Converters.VersionConverter">
<summary>
Converts a <see cref="T:System.Version"/> to and from a string (e.g. "1.2.3.4").
@ -1707,7 +1764,7 @@
<summary>
Ignore members where the member value is the same as the member's default value when serializing objects
so that is is not written to JSON.
This option will ignore all default values (e.g. <c>null</c> for objects and nullable typesl; <c>0</c> for integers,
This option will ignore all default values (e.g. <c>null</c> for objects and nullable types; <c>0</c> for integers,
decimals and floating point numbers; and <c>false</c> for booleans). The default value ignored can be changed by
placing the <see cref="T:System.ComponentModel.DefaultValueAttribute"/> on the property.
</summary>
@ -2146,6 +2203,22 @@
A JSON string representation of the object.
</returns>
</member>
<member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,System.Type,Newtonsoft.Json.JsonSerializerSettings)">
<summary>
Serializes the specified object to a JSON string using a type, formatting and <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/>.
</summary>
<param name="value">The object to serialize.</param>
<param name="settings">The <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> used to serialize the object.
If this is null, default serialization settings will be is used.</param>
<param name="type">
The type of the value being serialized.
This parameter is used when <see cref="T:Newtonsoft.Json.TypeNameHandling"/> is Auto to write out the type name if the type of the value does not match.
Specifing the type is optional.
</param>
<returns>
A JSON string representation of the object.
</returns>
</member>
<member name="M:Newtonsoft.Json.JsonConvert.SerializeObject(System.Object,Newtonsoft.Json.Formatting,Newtonsoft.Json.JsonSerializerSettings)">
<summary>
Serializes the specified object to a JSON string using formatting and <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/>.
@ -3045,6 +3118,12 @@
</summary>
<value>The constructor handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonSerializer.MetadataPropertyHandling">
<summary>
Gets or sets how metadata properties are used during deserialization.
</summary>
<value>The metadata properties handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonSerializer.Converters">
<summary>
Gets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
@ -3181,6 +3260,12 @@
</summary>
<value>The type name handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonSerializerSettings.MetadataPropertyHandling">
<summary>
Gets or sets how metadata properties are used during deserialization.
</summary>
<value>The metadata properties handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameAssemblyFormat">
<summary>
Gets or sets how a type name assembly is written and resolved by the serializer.
@ -4704,28 +4789,41 @@
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String)">
<summary>
Selects the token that matches the object path.
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
</summary>
<param name="path">
The object path from the current <see cref="T:Newtonsoft.Json.Linq.JToken"/> to the <see cref="T:Newtonsoft.Json.Linq.JToken"/>
to be returned. This must be a string of property names or array indexes separated
by periods, such as <code>Tables[0].DefaultView[0].Price</code> in C# or
<code>Tables(0).DefaultView(0).Price</code> in Visual Basic.
A <see cref="T:System.String"/> that contains a JPath expression.
</param>
<returns>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that matches the object path or a null reference if no matching token is found.</returns>
<returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>, or null.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,System.Boolean)">
<summary>
Selects the token that matches the object path.
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
</summary>
<param name="path">
The object path from the current <see cref="T:Newtonsoft.Json.Linq.JToken"/> to the <see cref="T:Newtonsoft.Json.Linq.JToken"/>
to be returned. This must be a string of property names or array indexes separated
by periods, such as <code>Tables[0].DefaultView[0].Price</code> in C# or
<code>Tables(0).DefaultView(0).Price</code> in Visual Basic.
A <see cref="T:System.String"/> that contains a JPath expression.
</param>
<param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no token is found.</param>
<returns>The <see cref="T:Newtonsoft.Json.Linq.JToken"/> that matches the object path.</returns>
<param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
<returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String)">
<summary>
Selects a collection of elements using a JPath expression.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
</param>
<returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> that contains the selected elements.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String,System.Boolean)">
<summary>
Selects a collection of elements using a JPath expression.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
</param>
<param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
<returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> that contains the selected elements.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.GetMetaObject(System.Linq.Expressions.Expression)">
<summary>
@ -5606,12 +5704,11 @@
Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.
</summary>
</member>
<member name="M:Newtonsoft.Json.Linq.JPropertyDescriptor.#ctor(System.String,System.Type)">
<member name="M:Newtonsoft.Json.Linq.JPropertyDescriptor.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JPropertyDescriptor"/> class.
</summary>
<param name="name">The name.</param>
<param name="propertyType">Type of the property.</param>
</member>
<member name="M:Newtonsoft.Json.Linq.JPropertyDescriptor.CanResetValue(System.Object)">
<summary>
@ -5713,6 +5810,12 @@
</summary>
<param name="value">The value.</param>
</member>
<member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Decimal)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
</summary>
<param name="value">The value.</param>
</member>
<member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Char)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
@ -5743,6 +5846,12 @@
</summary>
<param name="value">The value.</param>
</member>
<member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.DateTimeOffset)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
</summary>
<param name="value">The value.</param>
</member>
<member name="M:Newtonsoft.Json.Linq.JValue.#ctor(System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JValue"/> class with the given value.
@ -6013,6 +6122,11 @@
true if the next token was read successfully; false if there are no more tokens to read.
</returns>
</member>
<member name="P:Newtonsoft.Json.Linq.JTokenReader.Path">
<summary>
Gets the path of the current JSON token.
</summary>
</member>
<member name="T:Newtonsoft.Json.Linq.JTokenType">
<summary>
Specifies the type of token.
@ -6341,6 +6455,21 @@
and setting IgnoreSerializableAttribute on <see cref="T:Newtonsoft.Json.Serialization.DefaultContractResolver"/> to false.
</summary>
</member>
<member name="T:Newtonsoft.Json.MetadataPropertyHandling">
<summary>
Specifies metadata property handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
</summary>
</member>
<member name="F:Newtonsoft.Json.MetadataPropertyHandling.Default">
<summary>
Read metadata properties located at the start of a JSON object.
</summary>
</member>
<member name="F:Newtonsoft.Json.MetadataPropertyHandling.ReadAhead">
<summary>
Read metadata properties located anywhere in a JSON object. Note that this setting will impact performance.
</summary>
</member>
<member name="T:Newtonsoft.Json.MissingMemberHandling">
<summary>
Specifies missing member handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@ -7370,7 +7499,7 @@
</member>
<member name="P:Newtonsoft.Json.Serialization.ErrorContext.Error">
<summary>
Gets or sets the error.
Gets the error.
</summary>
<value>The error.</value>
</member>
@ -7844,31 +7973,31 @@
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.MemberConverter">
<summary>
Gets the member converter.
Gets or sets the member converter.
</summary>
<value>The member converter.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.Ignored">
<summary>
Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is ignored.
Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is ignored.
</summary>
<value><c>true</c> if ignored; otherwise, <c>false</c>.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.Readable">
<summary>
Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is readable.
Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is readable.
</summary>
<value><c>true</c> if readable; otherwise, <c>false</c>.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.Writable">
<summary>
Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is writable.
Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is writable.
</summary>
<value><c>true</c> if writable; otherwise, <c>false</c>.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.HasMemberAttribute">
<summary>
Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> has a member attribute.
Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> has a member attribute.
</summary>
<value><c>true</c> if has a member attribute; otherwise, <c>false</c>.</value>
</member>
@ -7880,13 +8009,13 @@
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.Required">
<summary>
Gets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is required.
Gets or sets a value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is required.
</summary>
<value>A value indicating whether this <see cref="T:Newtonsoft.Json.Serialization.JsonProperty"/> is required.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.IsReference">
<summary>
Gets a value indicating whether this property preserves object references.
Gets or sets a value indicating whether this property preserves object references.
</summary>
<value>
<c>true</c> if this instance is reference; otherwise, <c>false</c>.
@ -7894,31 +8023,31 @@
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.NullValueHandling">
<summary>
Gets the property null value handling.
Gets or sets the property null value handling.
</summary>
<value>The null value handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.DefaultValueHandling">
<summary>
Gets the property default value handling.
Gets or sets the property default value handling.
</summary>
<value>The default value handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.ReferenceLoopHandling">
<summary>
Gets the property reference loop handling.
Gets or sets the property reference loop handling.
</summary>
<value>The reference loop handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.ObjectCreationHandling">
<summary>
Gets the property object creation handling.
Gets or sets the property object creation handling.
</summary>
<value>The object creation handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonProperty.TypeNameHandling">
<summary>
Gets or sets the type name handling.
Gets or sets or sets the type name handling.
</summary>
<value>The type name handling.</value>
</member>
@ -8171,27 +8300,6 @@
<param name="comparer">An equality comparer to compare values.</param>
<returns>The zero-based index of the first occurrence of value within the entire sequence, if found; otherwise, 1.</returns>
</member>
<member name="M:Newtonsoft.Json.Utilities.ConvertUtils.Convert(System.Object,System.Globalization.CultureInfo,System.Type)">
<summary>
Converts the value to the specified type.
</summary>
<param name="initialValue">The value to convert.</param>
<param name="culture">The culture to use when converting.</param>
<param name="targetType">The type to convert the value to.</param>
<returns>The converted type.</returns>
</member>
<member name="M:Newtonsoft.Json.Utilities.ConvertUtils.TryConvert(System.Object,System.Globalization.CultureInfo,System.Type,System.Object@)">
<summary>
Converts the value to the specified type.
</summary>
<param name="initialValue">The value to convert.</param>
<param name="culture">The culture to use when converting.</param>
<param name="targetType">The type to convert the value to.</param>
<param name="convertedValue">The converted value if the conversion was successful or the default value of <c>T</c> if it failed.</param>
<returns>
<c>true</c> if <c>initialValue</c> was converted successfully; otherwise, <c>false</c>.
</returns>
</member>
<member name="M:Newtonsoft.Json.Utilities.ConvertUtils.ConvertOrCast(System.Object,System.Globalization.CultureInfo,System.Type)">
<summary>
Converts the value to the specified type. If the value is unable to be converted, the

View File

@ -202,7 +202,7 @@
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>

View File

@ -22,6 +22,10 @@
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@ -49,10 +49,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>

View File

@ -173,7 +173,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>