Skip to content

Commit 5c1c216

Browse files
author
Joseph Phillips
committed
Merge remote-tracking branch 'upstream/master'
2 parents 747d96d + dbb7241 commit 5c1c216

39 files changed

+33
-27171
lines changed

RestSharp.Silverlight/RestSharp.Silverlight.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<ItemGroup>
5151
<Reference Include="mscorlib" />
5252
<Reference Include="Newtonsoft.Json">
53-
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl4\Newtonsoft.Json.dll</HintPath>
53+
<HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl4\Newtonsoft.Json.dll</HintPath>
5454
</Reference>
5555
<Reference Include="System.ServiceModel" />
5656
<Reference Include="System.ServiceModel.Web" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="4.0.3" />
3+
<package id="Newtonsoft.Json" version="4.0.4" />
44
</packages>

RestSharp.Tests/RestSharp.Tests.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@
5353
<DocumentationFile>bin\Release\RestSharp.Tests.xml</DocumentationFile>
5454
</PropertyGroup>
5555
<ItemGroup>
56-
<Reference Include="Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
56+
<Reference Include="Newtonsoft.Json">
57+
<HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
5958
</Reference>
6059
<Reference Include="System" />
6160
<Reference Include="System.Core">

RestSharp.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="4.0.3" />
3+
<package id="Newtonsoft.Json" version="4.0.4" />
44
<package id="xunit" version="1.8.0.1549" />
55
<package id="xunit.extensions" version="1.8.0.1549" />
66
</packages>

RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="Newtonsoft.Json">
47-
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
47+
<HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
4848
</Reference>
4949
<Reference Include="System.Windows" />
5050
<Reference Include="system" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="4.0.3" />
3+
<package id="Newtonsoft.Json" version="4.0.4" />
44
</packages>

RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<ItemGroup>
4646
<Reference Include="mscorlib" />
4747
<Reference Include="Newtonsoft.Json">
48-
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
48+
<HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System.Windows" />
5151
<Reference Include="system" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="4.0.3" />
3+
<package id="Newtonsoft.Json" version="4.0.4" />
44
</packages>

RestSharp/RestSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</PropertyGroup>
5757
<ItemGroup>
5858
<Reference Include="Newtonsoft.Json">
59-
<HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
59+
<HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net35\Newtonsoft.Json.dll</HintPath>
6060
</Reference>
6161
<Reference Include="System" />
6262
<Reference Include="System.Core">

RestSharp/Serializers/JsonSerializer.cs

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,40 @@ namespace RestSharp.Serializers
2828
/// </summary>
2929
public class JsonSerializer : ISerializer
3030
{
31-
/// <summary>
31+
private readonly Newtonsoft.Json.JsonSerializer _serializer;
32+
33+
/// <summary>
3234
/// Default serializer
3335
/// </summary>
3436
public JsonSerializer() {
3537
ContentType = "application/json";
38+
_serializer = new Newtonsoft.Json.JsonSerializer {
39+
MissingMemberHandling = MissingMemberHandling.Ignore,
40+
NullValueHandling = NullValueHandling.Include,
41+
DefaultValueHandling = DefaultValueHandling.Include
42+
};
3643
}
3744

45+
/// <summary>
46+
/// Default serializer with overload for allowing custom Json.NET settings
47+
/// </summary>
48+
public JsonSerializer(Newtonsoft.Json.JsonSerializer serializer){
49+
ContentType = "application/json";
50+
_serializer = serializer;
51+
}
52+
3853
/// <summary>
3954
/// Serialize the object as JSON
4055
/// </summary>
4156
/// <param name="obj">Object to serialize</param>
4257
/// <returns>JSON as String</returns>
4358
public string Serialize(object obj) {
44-
var serializer = new Newtonsoft.Json.JsonSerializer {
45-
MissingMemberHandling = MissingMemberHandling.Ignore,
46-
NullValueHandling = NullValueHandling.Include,
47-
DefaultValueHandling = DefaultValueHandling.Include
48-
};
49-
5059
using (var stringWriter = new StringWriter()) {
5160
using (var jsonTextWriter = new JsonTextWriter(stringWriter)) {
5261
jsonTextWriter.Formatting = Formatting.Indented;
5362
jsonTextWriter.QuoteChar = '"';
5463

55-
serializer.Serialize(jsonTextWriter, obj);
64+
_serializer.Serialize(jsonTextWriter, obj);
5665

5766
var result = stringWriter.ToString();
5867
return result;

0 commit comments

Comments
 (0)