diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index 69066175..2953cd90 100644 --- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs @@ -575,7 +575,7 @@ now brown cow?", '"', true); { Assert.AreEqual(value, parsed); } - catch (Exception ex) + catch (Exception) { long valueTicks = GetTicks(value); long parsedTicks = GetTicks(parsed); @@ -601,7 +601,7 @@ now brown cow?", '"', true); { Assert.AreEqual(value, parsed); } - catch (Exception ex) + catch (Exception) { // JavaScript ticks aren't as precise, recheck after rounding long valueTicks = GetTicks(value); diff --git a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs index 867d413b..859361bf 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs @@ -120,7 +120,7 @@ namespace Newtonsoft.Json.Tests.Linq } [Test] - public void ToString() + public void JValueToString() { JValue v; diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index 43167e5d..fae4e66b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; using System.Globalization; #if !NETFX_CORE -using System.IO; using NUnit.Framework; #else using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; diff --git a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs index 0eb49f61..d692480f 100644 --- a/Src/Newtonsoft.Json.Tests/PerformanceTests.cs +++ b/Src/Newtonsoft.Json.Tests/PerformanceTests.cs @@ -772,7 +772,6 @@ namespace Newtonsoft.Json.Tests public void JObjectToString() { JObject test = JObject.Parse(JsonText); - IsoDateTimeConverter isoDateTimeConverter = null; // = new IsoDateTimeConverter(); TimeOperation(() => { @@ -789,7 +788,6 @@ namespace Newtonsoft.Json.Tests public void JObjectToString2() { JObject test = JObject.Parse(JsonText); - IsoDateTimeConverter isoDateTimeConverter = null; // = new IsoDateTimeConverter(); MemoryStream ms = new MemoryStream(); TimeOperation(() => diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 6326d53d..888ec462 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -7311,7 +7311,7 @@ Parameter name: value", internal class Bb : Aa { - public bool no; + public new bool no; } #if !(NET35 || NET20 || SILVERLIGHT || WINDOWS_PHONE) diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index 9c532305..67c66689 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -1497,6 +1497,14 @@ namespace Newtonsoft.Json.Tests.Serialization return Equals(w.Content, Content); } + + public override int GetHashCode() + { + if (Content == null) + return 0; + + return Content.GetHashCode(); + } } public interface IExample @@ -1542,6 +1550,14 @@ namespace Newtonsoft.Json.Tests.Serialization return false; } } + + public override int GetHashCode() + { + if (Name == null) + return 0; + + return Name.GetHashCode(); + } } #endif diff --git a/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs b/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs index e04bf6c7..b5952e9b 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs @@ -47,6 +47,10 @@ namespace Newtonsoft.Json.Serialization /// The of the collection items. public Type CollectionItemType { get; private set; } + /// + /// Gets a value indicating whether the collection type is a multidimensional array. + /// + /// true if the collection type is a multidimensional array; otherwise, false. public bool IsMultidimensionalArray { get; private set; } private readonly bool _isCollectionItemTypeNullableType;