Merge pull request restsharp#409 from restsharp/update-simplejson

Upgrade SimpleJson to 0.26.0

Author: haacked

RestSharp.Tests/SimpleJson.cs

@@ -17,7 +17,7 @@
 // <website>https://github.com/facebook-csharp-sdk/simple-json</website>
 //-----------------------------------------------------------------------
 
-// VERSION: 0.25.0
+// VERSION: 0.26.0
 
 // NOTE: uncomment the following line to make SimpleJson class internal.
 //#define SIMPLE_JSON_INTERNAL
@@ -39,6 +39,8 @@
 // usually already defined in properties
 //#define NETFX_CORE;
 
+// If you are targetting WinStore, WP8 and NET4.5+ PCL make sure to #define SIMPLE_JSON_TYPEINFO;
+
 // original json parsing code from http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html
 
 #if NETFX_CORE
@@ -1330,13 +1332,9 @@ public virtual object DeserializeObject(object value, Type type)
                 return value;
             if ((valueIsDouble && type != typeof(double)) || (valueIsLong && type != typeof(long)))
             {
-                obj =
-#if NETFX_CORE
- type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
-#else
- typeof(IConvertible).IsAssignableFrom(type)
-#endif
- ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture) : value;
+                obj = type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
+                            ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture)
+                            : value;
             }
             else
             {

RestSharp.Tests/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="4.5.5" />
-  <package id="SimpleJson" version="0.25.0" targetFramework="net40" />
+  <package id="SimpleJson" version="0.26.0" targetFramework="net35" />
   <package id="xunit" version="1.9.0.1566" />
   <package id="xunit.extensions" version="1.9.0.1566" />
 </packages>

RestSharp/SimpleJson.cs

@@ -17,7 +17,7 @@
 // <website>https://github.com/facebook-csharp-sdk/simple-json</website>
 //-----------------------------------------------------------------------
 
-// VERSION: 0.25.0
+// VERSION: 0.26.0
 
 // NOTE: uncomment the following line to make SimpleJson class internal.
 //#define SIMPLE_JSON_INTERNAL
@@ -39,6 +39,8 @@
 // usually already defined in properties
 //#define NETFX_CORE;
 
+// If you are targetting WinStore, WP8 and NET4.5+ PCL make sure to #define SIMPLE_JSON_TYPEINFO;
+
 // original json parsing code from http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html
 
 #if NETFX_CORE
@@ -1330,13 +1332,9 @@ public virtual object DeserializeObject(object value, Type type)
                 return value;
             if ((valueIsDouble && type != typeof(double)) || (valueIsLong && type != typeof(long)))
             {
-                obj =
-#if NETFX_CORE
- type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
-#else
- typeof(IConvertible).IsAssignableFrom(type)
-#endif
- ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture) : value;
+                obj = type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
+                            ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture)
+                            : value;
             }
             else
             {

RestSharp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SimpleJson" version="0.25.0" targetFramework="net35-Client" />
+  <package id="SimpleJson" version="0.26.0" targetFramework="net35" />
 </packages>