Permalink
Browse files

die json.net die

  • Loading branch information...
1 parent c952138 commit f9623544c444ab5b4488756734a49a0a3e5ddcba @johnsheehan johnsheehan committed with ayoung Apr 4, 2012
Showing with 55,133 additions and 204 deletions.
  1. +3 −7 RestSharp.Silverlight/RestSharp.Silverlight.csproj
  2. +1 −1 RestSharp.Silverlight/packages.config
  3. +0 −19 RestSharp.Tests/JsonTests.cs
  4. +5 −4 RestSharp.Tests/RestSharp.Tests.csproj
  5. +1 −1 RestSharp.Tests/SampleData/person.json.txt
  6. +1,921 −0 RestSharp.Tests/SimpleJson.cs
  7. +1 −0 RestSharp.Tests/packages.config
  8. +3 −0 RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj
  9. +1 −0 RestSharp.WindowsPhone.Mango/packages.config
  10. +4 −8 RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
  11. +1 −1 RestSharp.WindowsPhone/packages.config
  12. +0 −12 RestSharp.sln
  13. +93 −113 RestSharp/Deserializers/JsonDeserializer.cs
  14. +0 −26 RestSharp/Extensions/MiscExtensions.cs
  15. +1 −1 RestSharp/Extensions/StringExtensions.cs
  16. +1 −1 RestSharp/RestRequest.cs
  17. +2 −6 RestSharp/RestSharp.csproj
  18. +1,921 −0 RestSharp/SimpleJson.cs
  19. +1 −1 RestSharp/packages.config
  20. BIN packages/Newtonsoft.Json.4.5.1/Newtonsoft.Json.4.5.1.nupkg
  21. BIN packages/Newtonsoft.Json.4.5.1/lib/net20/Newtonsoft.Json.dll
  22. +7,938 −0 packages/Newtonsoft.Json.4.5.1/lib/net20/Newtonsoft.Json.xml
  23. BIN packages/Newtonsoft.Json.4.5.1/lib/net35/Newtonsoft.Json.dll
  24. +7,069 −0 packages/Newtonsoft.Json.4.5.1/lib/net35/Newtonsoft.Json.xml
  25. BIN packages/Newtonsoft.Json.4.5.1/lib/net40/Newtonsoft.Json.dll
  26. +7,320 −0 packages/Newtonsoft.Json.4.5.1/lib/net40/Newtonsoft.Json.xml
  27. BIN packages/Newtonsoft.Json.4.5.1/lib/sl3-wp/Newtonsoft.Json.dll
  28. +6,661 −0 packages/Newtonsoft.Json.4.5.1/lib/sl3-wp/Newtonsoft.Json.xml
  29. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4-windowsphone71/Newtonsoft.Json.dll
  30. +6,661 −0 packages/Newtonsoft.Json.4.5.1/lib/sl4-windowsphone71/Newtonsoft.Json.xml
  31. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4/Newtonsoft.Json.dll
  32. +6,691 −0 packages/Newtonsoft.Json.4.5.1/lib/sl4/Newtonsoft.Json.xml
  33. BIN packages/Newtonsoft.Json.4.5.1/lib/winrt45/Newtonsoft.Json.dll
  34. +6,912 −0 packages/Newtonsoft.Json.4.5.1/lib/winrt45/Newtonsoft.Json.xml
  35. +1,921 −0 packages/SimpleJson.0.15.0.0/Content/SimpleJson.cs.pp
  36. BIN packages/SimpleJson.0.15.0.0/SimpleJson.0.15.0.0.nupkg
  37. +0 −3 restsharp.nuspec
@@ -49,10 +49,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
- <Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\sl4\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Windows" />
@@ -179,9 +175,6 @@
<Compile Include="..\RestSharp\Serializers\ISerializer.cs">
<Link>Serializers\ISerializer.cs</Link>
</Compile>
- <Compile Include="..\RestSharp\Serializers\JsonSerializer.cs">
- <Link>Serializers\JsonSerializer.cs</Link>
- </Compile>
<Compile Include="..\RestSharp\Serializers\SerializeAsAttribute.cs">
<Link>Serializers\SerializeAsAttribute.cs</Link>
</Compile>
@@ -191,6 +184,9 @@
<Compile Include="..\RestSharp\SharedAssemblyInfo.cs">
<Link>SharedAssemblyInfo.cs</Link>
</Compile>
+ <Compile Include="..\RestSharp\SimpleJson.cs">
+ <Link>SimpleJson.cs</Link>
+ </Compile>
<Compile Include="..\RestSharp\Validation\Require.cs">
<Link>Validation\Require.cs</Link>
</Compile>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="4.0.8" />
+ <package id="SimpleJson" version="0.15.0.0" />
</packages>
@@ -325,17 +325,6 @@ public void Can_Deserialize_Iso_Json_Dates()
}
[Fact]
- public void Can_Deserialize_JScript_Json_Dates()
- {
- var doc = CreateJScriptDateJson();
- var d = new JsonDeserializer();
- var response = new RestResponse { Content = doc };
- var bd = d.Deserialize<Birthdate>(response);
-
- Assert.Equal(new DateTime(1910, 9, 25, 9, 30, 25, DateTimeKind.Utc), bd.Value);
- }
-
- [Fact]
public void Can_Deserialize_Unix_Json_Dates()
{
var doc = CreateUnixDateJson();
@@ -537,14 +526,6 @@ private string CreateIsoDateJson()
return JsonConvert.SerializeObject(bd, new IsoDateTimeConverter());
}
- private string CreateJScriptDateJson()
- {
- var bd = new Birthdate();
- bd.Value = new DateTime(1910, 9, 25, 9, 30, 25, DateTimeKind.Utc);
-
- return JsonConvert.SerializeObject(bd, new JavaScriptDateTimeConverter());
- }
-
private string CreateUnixDateJson()
{
var doc = new JObject();
@@ -78,8 +78,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="Fakes\NullHttp.cs" />
<Compile Include="JsonTests.cs" />
+ <Compile Include="Fakes\NullHttp.cs" />
<Compile Include="NamespacedXmlTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SampleClasses\BooleanTest.cs" />
@@ -95,6 +95,7 @@
<Compile Include="SampleClasses\TwilioCallList.cs" />
<Compile Include="SampleClasses\twitter.cs" />
<Compile Include="SerializerTests.cs" />
+ <Compile Include="SimpleJson.cs" />
<Compile Include="UrlBuilderTests.cs" />
<Compile Include="XmlTests.cs" />
</ItemGroup>
@@ -114,9 +115,6 @@
<Content Include="SampleData\jsonenums.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="SampleData\person.json.txt">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
<Content Include="SampleData\directlists.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -144,6 +142,9 @@
<Content Include="SampleData\NestedListSample.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="SampleData\person.json.txt">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="SampleData\sojson.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -1,3 +1,3 @@
{
- 'StartDate': '/Date(1309421746929+0000)/'
+ "StartDate": "/Date(1309421746929+0000)/"
}
Oops, something went wrong.

0 comments on commit f962354

Please sign in to comment.