diff --git a/RestSharp.Silverlight/RestSharp.Silverlight.csproj b/RestSharp.Silverlight/RestSharp.Silverlight.csproj index 115b4b565..d12abcddd 100644 --- a/RestSharp.Silverlight/RestSharp.Silverlight.csproj +++ b/RestSharp.Silverlight/RestSharp.Silverlight.csproj @@ -49,9 +49,9 @@ - + False - ..\packages\Newtonsoft.Json.4.0.7\lib\sl4\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.4.0.8\lib\sl4\Newtonsoft.Json.dll diff --git a/RestSharp.Silverlight/packages.config b/RestSharp.Silverlight/packages.config index b0e40c741..e4a50698d 100644 --- a/RestSharp.Silverlight/packages.config +++ b/RestSharp.Silverlight/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/RestSharp.Tests/RestSharp.Tests.csproj b/RestSharp.Tests/RestSharp.Tests.csproj index bad9adb0d..2d186bf89 100644 --- a/RestSharp.Tests/RestSharp.Tests.csproj +++ b/RestSharp.Tests/RestSharp.Tests.csproj @@ -53,9 +53,9 @@ bin\Release\RestSharp.Tests.xml - + False - ..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll diff --git a/RestSharp.Tests/packages.config b/RestSharp.Tests/packages.config index 5ba5de5dd..fae2c0461 100644 --- a/RestSharp.Tests/packages.config +++ b/RestSharp.Tests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj b/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj index 7d4bfe5e6..29492ee1c 100644 --- a/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj +++ b/RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj @@ -43,9 +43,9 @@ Bin\Release\RestSharp.WindowsPhone.xml - + False - ..\packages\Newtonsoft.Json.4.0.7\lib\sl4-windowsphone71\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.4.0.8\lib\sl4-windowsphone71\Newtonsoft.Json.dll diff --git a/RestSharp.WindowsPhone.Mango/packages.config b/RestSharp.WindowsPhone.Mango/packages.config index b0e40c741..e4a50698d 100644 --- a/RestSharp.WindowsPhone.Mango/packages.config +++ b/RestSharp.WindowsPhone.Mango/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj index da560055f..37b975146 100644 --- a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj +++ b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj @@ -44,9 +44,9 @@ - + False - ..\packages\Newtonsoft.Json.4.0.7\lib\sl3-wp\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.4.0.8\lib\sl3-wp\Newtonsoft.Json.dll diff --git a/RestSharp.WindowsPhone/packages.config b/RestSharp.WindowsPhone/packages.config index b0e40c741..e4a50698d 100644 --- a/RestSharp.WindowsPhone/packages.config +++ b/RestSharp.WindowsPhone/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/RestSharp.sln b/RestSharp.sln index f606d82ee..52c94e09f 100644 --- a/RestSharp.sln +++ b/RestSharp.sln @@ -12,9 +12,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone", "RestSharp.WindowsPhone\RestSharp.WindowsPhone.csproj", "{F4D48DF6-316E-4963-B5C1-59CA39B431B7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{E709A928-A45C-4622-A35C-CCD8EE44CA80}" - ProjectSection(SolutionItems) = preProject - restsharp.nuspec = restsharp.nuspec - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone.Mango", "RestSharp.WindowsPhone.Mango\RestSharp.WindowsPhone.Mango.csproj", "{71647E33-714F-4975-8368-71B075045272}" EndProject diff --git a/RestSharp/RestSharp.csproj b/RestSharp/RestSharp.csproj index 70719f067..d7a819717 100644 --- a/RestSharp/RestSharp.csproj +++ b/RestSharp/RestSharp.csproj @@ -55,9 +55,9 @@ bin\Release\RestSharp.xml - + False - ..\packages\Newtonsoft.Json.4.0.7\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.4.0.8\lib\net35\Newtonsoft.Json.dll diff --git a/RestSharp/SharedAssemblyInfo.cs b/RestSharp/SharedAssemblyInfo.cs index 560f89376..d26edd9fe 100644 --- a/RestSharp/SharedAssemblyInfo.cs +++ b/RestSharp/SharedAssemblyInfo.cs @@ -23,5 +23,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("102.5.0.0")] -[assembly: AssemblyFileVersion("102.5.0.0")] +[assembly: AssemblyVersion("102.7.0.0")] +[assembly: AssemblyFileVersion("102.7.0.0")] diff --git a/RestSharp/packages.config b/RestSharp/packages.config index b0e40c741..e4a50698d 100644 --- a/RestSharp/packages.config +++ b/RestSharp/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/packages/Newtonsoft.Json.4.0.7/Newtonsoft.Json.4.0.7.nupkg b/packages/Newtonsoft.Json.4.0.7/Newtonsoft.Json.4.0.7.nupkg deleted file mode 100644 index 2db57905f..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/Newtonsoft.Json.4.0.7.nupkg and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.dll deleted file mode 100644 index aea7caac9..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.dll deleted file mode 100644 index 95d32883b..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.dll deleted file mode 100644 index c9ad56b11..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.dll deleted file mode 100644 index 52d3ed77b..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.dll deleted file mode 100644 index 52d3ed77b..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.dll deleted file mode 100644 index 0c7b12704..000000000 Binary files a/packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.dll and /dev/null differ diff --git a/packages/Newtonsoft.Json.4.0.8/Newtonsoft.Json.4.0.8.nupkg b/packages/Newtonsoft.Json.4.0.8/Newtonsoft.Json.4.0.8.nupkg new file mode 100644 index 000000000..883e9ce44 Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/Newtonsoft.Json.4.0.8.nupkg differ diff --git a/packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.dll new file mode 100644 index 000000000..9c25fb9ab Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.xml index 96f773a42..b2267e11e 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/net20/Newtonsoft.Json.xml @@ -1249,9 +1249,41 @@ true if the written enum text will be camel case; otherwise, false. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -6091,6 +6123,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.dll new file mode 100644 index 000000000..0b6788211 Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.xml index 01933d8d1..3dbaf6fc1 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/net35/Newtonsoft.Json.xml @@ -1313,9 +1313,41 @@ Allow Json.NET to use a non-public default constructor. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -5392,6 +5424,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.dll new file mode 100644 index 000000000..09560c1b3 Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.xml index 3b52755c6..fb7e97da1 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/net40/Newtonsoft.Json.xml @@ -1353,9 +1353,41 @@ Allow Json.NET to use a non-public default constructor. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -5502,6 +5534,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.dll new file mode 100644 index 000000000..e8be0b5cd Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.xml index 24c88f028..b96db2812 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/sl3-wp/Newtonsoft.Json.xml @@ -1306,6 +1306,38 @@ true if the written enum text will be camel case; otherwise, false. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + Converts XML to and from JSON. @@ -1505,7 +1537,7 @@ - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -5933,6 +5965,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.dll new file mode 100644 index 000000000..e8be0b5cd Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.xml index 24c88f028..b96db2812 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/sl4-windowsphone71/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/sl4-windowsphone71/Newtonsoft.Json.xml @@ -1306,6 +1306,38 @@ true if the written enum text will be camel case; otherwise, false. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + Converts XML to and from JSON. @@ -1505,7 +1537,7 @@ - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -5933,6 +5965,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.dll b/packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.dll new file mode 100644 index 000000000..8795484e1 Binary files /dev/null and b/packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.dll differ diff --git a/packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.xml b/packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.xml similarity index 99% rename from packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.xml rename to packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.xml index e4439f626..583624b20 100644 --- a/packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.xml +++ b/packages/Newtonsoft.Json.4.0.8/lib/sl4/Newtonsoft.Json.xml @@ -1346,6 +1346,38 @@ true if the written enum text will be camel case; otherwise, false. + + + Converts a to and from a string (e.g. "1.2.3.4"). + + + + + Writes the JSON representation of the object. + + The to write to. + The value. + The calling serializer. + + + + Reads the JSON representation of the object. + + The to read from. + Type of the object. + The existing property value of the JSON that is being converted. + The calling serializer. + The object value. + + + + Determines whether this instance can convert the specified object type. + + Type of the object. + + true if this instance can convert the specified object type; otherwise, false. + + Indicates the method that will be used during deserialization for locating and loading assemblies. @@ -1486,7 +1518,7 @@ - Instructs the not to serialize the public field or public read/write property value. + Instructs the to use the specified constructor when deserializing that object. @@ -5963,6 +5995,17 @@ true if the specified is valid; otherwise, false. + + + Determines whether the is valid. + + The source to test. + The schema to test with. + When this method returns, contains any error messages generated while validating. + + true if the specified is valid; otherwise, false. + + Validates the specified . diff --git a/restsharp.nuspec b/restsharp.nuspec index 04d039844..9a111f83c 100644 --- a/restsharp.nuspec +++ b/restsharp.nuspec @@ -2,20 +2,21 @@ RestSharp - 102.6 + 102.7 John Sheehan, RestSharp Community John Sheehan Simple REST and HTTP API Client en-US http://restsharp.org - https://github.com/johnsheehan/RestSharp/blob/master/LICENSE.txt + https://github.com/restsharp/RestSharp/blob/master/LICENSE.txt http://dl.dropbox.com/u/1827/restsharp100.png REST HTTP API JSON XML - 102.6 - Updating JSON.NET reference to 4.0.5 + 102.7 - Updating Json.NET to 4.0.8, misc fixes + 102.6 - Updating Json.NET reference to 4.0.5 \ No newline at end of file