Skip to content

Commit

Permalink
remove ilmerge, update to version 103
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsheehan committed Apr 16, 2012
1 parent 3d3f849 commit 22ae9aa
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
3 changes: 3 additions & 0 deletions RestSharp.sln
Expand Up @@ -13,6 +13,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.WindowsPhone", "R
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{E709A928-A45C-4622-A35C-CCD8EE44CA80}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
package.cmd = package.cmd
readme.txt = readme.txt
restsharp.nuspec = restsharp.nuspec
EndProjectSection
EndProject
Expand Down
Binary file removed Tools/ILMerge.exe
Binary file not shown.
13 changes: 6 additions & 7 deletions package.cmd
Expand Up @@ -7,16 +7,15 @@ if not exist Download\package\lib\sl3-wp mkdir Download\package\lib\sl3-wp
if not exist Download\package\lib\sl4-wp71 mkdir Download\package\lib\sl4-wp71
if not exist Download\package\lib\sl4 mkdir Download\package\lib\sl4

tools\ilmerge.exe /lib:RestSharp\bin\Release /internalize /ndebug /v2 /out:Download\RestSharp.dll RestSharp.dll Newtonsoft.Json.dll
copy RestSharp\bin\Release\RestSharp.xml Download\

copy RestSharp.Silverlight\bin\Release\*.dll Download\Silverlight\
copy RestSharp.Silverlight\bin\Release\*.xml Download\Silverlight\
copy RestSharp.Silverlight\bin\Release\RestSharp.dll Download\Silverlight\
copy RestSharp.Silverlight\bin\Release\RestSharp.xml Download\Silverlight\

copy RestSharp.WindowsPhone\bin\Release\*.dll Download\WindowsPhone\7.0\
copy RestSharp.WindowsPhone\bin\Release\*.xml Download\WindowsPhone\7.0\
copy RestSharp.WindowsPhone.Mango\bin\Release\*.dll Download\WindowsPhone\7.1\
copy RestSharp.WindowsPhone.Mango\bin\Release\*.xml Download\WindowsPhone\7.1\
copy RestSharp.WindowsPhone\bin\Release\RestSharp.dll Download\WindowsPhone\7.0\
copy RestSharp.WindowsPhone\bin\Release\RestSharp.xml Download\WindowsPhone\7.0\
copy RestSharp.WindowsPhone.Mango\bin\Release\RestSharp.dll Download\WindowsPhone\7.1\
copy RestSharp.WindowsPhone.Mango\bin\Release\RestSharp.xml Download\WindowsPhone\7.1\

copy LICENSE.txt Download
copy readme.txt Download
Expand Down
6 changes: 4 additions & 2 deletions readme.txt
@@ -1,12 +1,14 @@
*** IMPORTANT CHANGE IN VERSION 103 ***
*** IMPORTANT CHANGE IN RESTSHARP VERSION 103 ***

In 103.0, JSON.NET was removed as a dependency.

If this is still installed in your project and no other libraries depend on it you may remove it from your installed packages.

There is one breaking change: the default JsonSerializer is no longer compatible with Json.NET. To use Json.NET for serialization, copy the code from https://github.com/restsharp/RestSharp/blob/86b31f9adf049d7fb821de8279154f41a17b36f7/RestSharp/Serializers/JsonSerializer.cs and register it with your client:
There is one breaking change: the default Json*Serializer* is no longer compatible with Json.NET. To use Json.NET for serialization, copy the code from https://github.com/restsharp/RestSharp/blob/86b31f9adf049d7fb821de8279154f41a17b36f7/RestSharp/Serializers/JsonSerializer.cs and register it with your client:

var client = new RestClient();
client.JsonSerializer = new YourCustomSerializer();

The default Json*Deserializer* should be 100% compatible.

If you run into any compatibility issues with deserialization, please report it to http://groups.google.com/group/restsharp
2 changes: 1 addition & 1 deletion restsharp.nuspec
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>RestSharp</id>
<version>103.0.0-nojsondotnet</version>
<version>103.0.0</version>
<authors>John Sheehan, RestSharp Community</authors>
<owners>John Sheehan</owners>
<description>Simple REST and HTTP API Client</description>
Expand Down

0 comments on commit 22ae9aa

Please sign in to comment.