Skip to content

Commit 2f73bd3

Browse files
committed
die json.net die
1 parent 86b31f9 commit 2f73bd3

37 files changed

+55133
-204
lines changed

RestSharp.Silverlight/RestSharp.Silverlight.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
</PropertyGroup>
5050
<ItemGroup>
5151
<Reference Include="mscorlib" />
52-
<Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\sl4\Newtonsoft.Json.dll</HintPath>
55-
</Reference>
5652
<Reference Include="System.ServiceModel" />
5753
<Reference Include="System.ServiceModel.Web" />
5854
<Reference Include="System.Windows" />
@@ -179,9 +175,6 @@
179175
<Compile Include="..\RestSharp\Serializers\ISerializer.cs">
180176
<Link>Serializers\ISerializer.cs</Link>
181177
</Compile>
182-
<Compile Include="..\RestSharp\Serializers\JsonSerializer.cs">
183-
<Link>Serializers\JsonSerializer.cs</Link>
184-
</Compile>
185178
<Compile Include="..\RestSharp\Serializers\SerializeAsAttribute.cs">
186179
<Link>Serializers\SerializeAsAttribute.cs</Link>
187180
</Compile>
@@ -191,6 +184,9 @@
191184
<Compile Include="..\RestSharp\SharedAssemblyInfo.cs">
192185
<Link>SharedAssemblyInfo.cs</Link>
193186
</Compile>
187+
<Compile Include="..\RestSharp\SimpleJson.cs">
188+
<Link>SimpleJson.cs</Link>
189+
</Compile>
194190
<Compile Include="..\RestSharp\Validation\Require.cs">
195191
<Link>Validation\Require.cs</Link>
196192
</Compile>
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.8" />
3+
<package id="SimpleJson" version="0.15.0.0" />
44
</packages>

RestSharp.Tests/JsonTests.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,6 @@ public void Can_Deserialize_Iso_Json_Dates()
324324
Assert.Equal(new DateTime(1910, 9, 25, 9, 30, 25, DateTimeKind.Utc), bd.Value);
325325
}
326326

327-
[Fact]
328-
public void Can_Deserialize_JScript_Json_Dates()
329-
{
330-
var doc = CreateJScriptDateJson();
331-
var d = new JsonDeserializer();
332-
var response = new RestResponse { Content = doc };
333-
var bd = d.Deserialize<Birthdate>(response);
334-
335-
Assert.Equal(new DateTime(1910, 9, 25, 9, 30, 25, DateTimeKind.Utc), bd.Value);
336-
}
337-
338327
[Fact]
339328
public void Can_Deserialize_Unix_Json_Dates()
340329
{
@@ -537,14 +526,6 @@ private string CreateIsoDateJson()
537526
return JsonConvert.SerializeObject(bd, new IsoDateTimeConverter());
538527
}
539528

540-
private string CreateJScriptDateJson()
541-
{
542-
var bd = new Birthdate();
543-
bd.Value = new DateTime(1910, 9, 25, 9, 30, 25, DateTimeKind.Utc);
544-
545-
return JsonConvert.SerializeObject(bd, new JavaScriptDateTimeConverter());
546-
}
547-
548529
private string CreateUnixDateJson()
549530
{
550531
var doc = new JObject();

RestSharp.Tests/RestSharp.Tests.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
</Reference>
7979
</ItemGroup>
8080
<ItemGroup>
81-
<Compile Include="Fakes\NullHttp.cs" />
8281
<Compile Include="JsonTests.cs" />
82+
<Compile Include="Fakes\NullHttp.cs" />
8383
<Compile Include="NamespacedXmlTests.cs" />
8484
<Compile Include="Properties\AssemblyInfo.cs" />
8585
<Compile Include="SampleClasses\BooleanTest.cs" />
@@ -95,6 +95,7 @@
9595
<Compile Include="SampleClasses\TwilioCallList.cs" />
9696
<Compile Include="SampleClasses\twitter.cs" />
9797
<Compile Include="SerializerTests.cs" />
98+
<Compile Include="SimpleJson.cs" />
9899
<Compile Include="UrlBuilderTests.cs" />
99100
<Compile Include="XmlTests.cs" />
100101
</ItemGroup>
@@ -114,9 +115,6 @@
114115
<Content Include="SampleData\jsonenums.txt">
115116
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
116117
</Content>
117-
<Content Include="SampleData\person.json.txt">
118-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
119-
</Content>
120118
<Content Include="SampleData\directlists.xml">
121119
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
122120
</Content>
@@ -144,6 +142,9 @@
144142
<Content Include="SampleData\NestedListSample.xml">
145143
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
146144
</Content>
145+
<Content Include="SampleData\person.json.txt">
146+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
147+
</Content>
147148
<Content Include="SampleData\sojson.txt">
148149
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
149150
</Content>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
'StartDate': '/Date(1309421746929+0000)/'
2+
"StartDate": "/Date(1309421746929+0000)/"
33
}

0 commit comments

Comments
 (0)