-Updated version to 6.0.6
-Fixed WinRT build
This commit is contained in:
@@ -1191,7 +1191,7 @@ namespace Newtonsoft.Json.Tests
|
||||
public Nest A { get; set; }
|
||||
}
|
||||
|
||||
[Test(Description = "Verifies that parameterized JsonConverter constructors are invoked when 'params' are used in JsonConverterAttribute.")]
|
||||
[Test]
|
||||
public void ParametersPassedToJsonConverterConstructor()
|
||||
{
|
||||
ClobberMyProperties clobber = new ClobberMyProperties { One = "Red", Two = "Green", Three = "Yellow", Four = "Black" };
|
||||
@@ -1265,7 +1265,7 @@ namespace Newtonsoft.Json.Tests
|
||||
public string One { get; set; }
|
||||
}
|
||||
|
||||
[Test(Description = "Uses JsonConverter and ItemConverterParameters to demonstrate custom rounding of doubles on a property-by-property basis.")]
|
||||
[Test]
|
||||
public void CustomDoubleRounding()
|
||||
{
|
||||
var measurements = new Measurements
|
||||
|
||||
@@ -370,6 +370,9 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="large.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx" />
|
||||
<Content Include="SpaceShipV2.bson">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace Newtonsoft.Json.Tests
|
||||
[TestFixture]
|
||||
public class PerformanceTests : TestFixtureBase
|
||||
{
|
||||
private const int Iterations = 100;
|
||||
public int Iterations = 100;
|
||||
//private const int Iterations = 5000;
|
||||
|
||||
#region Data
|
||||
@@ -135,7 +135,7 @@ namespace Newtonsoft.Json.Tests
|
||||
[Test]
|
||||
public void ReadLargeJson()
|
||||
{
|
||||
for (int i = 0; i < 100; i++)
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
using (var fs = System.IO.File.OpenText("large.json"))
|
||||
using (JsonTextReader jsonTextReader = new JsonTextReader(fs))
|
||||
@@ -808,6 +808,8 @@ If attributes are not mentioned, default values are used in each case.
|
||||
#region Deserialize
|
||||
public void BenchmarkDeserializeMethod<T>(SerializeMethod method, object json, int? iterations = null, bool warmUp = true)
|
||||
{
|
||||
GC.Collect();
|
||||
|
||||
if (warmUp)
|
||||
Deserialize<T>(method, json);
|
||||
|
||||
|
||||
@@ -74,4 +74,4 @@ using System.Security;
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("6.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("6.0.5.17728")]
|
||||
[assembly: AssemblyFileVersion("6.0.6.17729")]
|
||||
|
||||
Reference in New Issue
Block a user