103 prerelease stuff

swapped jsonserialier and misc packaging
jxmk · Apr 10, 2012 · 9d11af9 · 9d11af9
1 parent 2f73bd3
commit 9d11af9
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 53 deletions.
diff --git a/RestSharp.Silverlight/RestSharp.Silverlight.csproj b/RestSharp.Silverlight/RestSharp.Silverlight.csproj
@@ -175,6 +175,9 @@
     <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>

diff --git a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
@@ -248,6 +248,9 @@
     <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>

diff --git a/RestSharp/RestRequest.cs b/RestSharp/RestRequest.cs
@@ -49,7 +49,7 @@ public RestRequest()
 			Parameters = new List<Parameter>();
 			Files = new List<FileParameter>();
 			XmlSerializer = new XmlSerializer();
-			//JsonSerializer = new JsonSerializer();
+			JsonSerializer = new JsonSerializer();
 
 			OnBeforeDeserialization = r => { };
 		}

diff --git a/RestSharp/RestSharp.csproj b/RestSharp/RestSharp.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Deserializers\DotNetXmlDeserializer.cs" />
     <Compile Include="Serializers\DotNetXmlSerializer.cs" />
     <Compile Include="Serializers\ISerializer.cs" />
+    <Compile Include="Serializers\JsonSerializer.cs" />
     <Compile Include="Serializers\SerializeAsAttribute.cs" />
     <Compile Include="Serializers\XmlSerializer.cs" />
     <Compile Include="Http.Async.cs" />

diff --git a/RestSharp/Serializers/JsonSerializer.cs b/RestSharp/Serializers/JsonSerializer.cs
@@ -1,24 +1,4 @@
-#region License
-//   Copyright 2010 John Sheehan
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License. 
-#endregion
-#region Acknowledgements
-// Original JsonSerializer contributed by Daniel Crenna (@dimebrain)
-#endregion
-
-using System.IO;
-using Newtonsoft.Json;
+using System.IO;
 
 namespace RestSharp.Serializers
 {
@@ -28,45 +8,22 @@ namespace RestSharp.Serializers
 	/// </summary>
 	public class JsonSerializer : ISerializer
 	{
-	    private readonly Newtonsoft.Json.JsonSerializer _serializer;
-
-        /// <summary>
+		/// <summary>
 		/// Default serializer
 		/// </summary>
-		public JsonSerializer() {
+		public JsonSerializer()
+		{
 			ContentType = "application/json";
-            _serializer = new Newtonsoft.Json.JsonSerializer {
-                MissingMemberHandling = MissingMemberHandling.Ignore,
-                NullValueHandling = NullValueHandling.Include,
-                DefaultValueHandling = DefaultValueHandling.Include
-            };
 		}
 
-        /// <summary>
-        /// Default serializer with overload for allowing custom Json.NET settings
-        /// </summary>
-        public JsonSerializer(Newtonsoft.Json.JsonSerializer serializer){
-            ContentType = "application/json";
-            _serializer = serializer;
-        }
-
 		/// <summary>
 		/// Serialize the object as JSON
 		/// </summary>
 		/// <param name="obj">Object to serialize</param>
 		/// <returns>JSON as String</returns>
-		public string Serialize(object obj) {
-			using (var stringWriter = new StringWriter()) {
-				using (var jsonTextWriter = new JsonTextWriter(stringWriter)) {
-					jsonTextWriter.Formatting = Formatting.Indented;
-					jsonTextWriter.QuoteChar = '"';
-
-					_serializer.Serialize(jsonTextWriter, obj);
-
-					var result = stringWriter.ToString();
-					return result;
-				}
-			}
+		public string Serialize(object obj)
+		{
+			return SimpleJson.SerializeObject(obj);
 		}
 
 		/// <summary>

diff --git a/Tools/NuGet.exe b/Tools/NuGet.exe
diff --git a/package.cmd b/package.cmd
@@ -1,4 +1,4 @@
-if not exist Download\Silverlight mkdir Download\Silverlight
+if not exist Download\Silverlight mkdir Download\Silverlight
 if not exist Download\WindowsPhone\7.0\ mkdir Download\WindowsPhone\7.0\
 if not exist Download\WindowsPhone\7.1\ mkdir Download\WindowsPhone\7.1\
 if not exist Download\package\lib\net35 mkdir Download\package\lib\net35
@@ -19,6 +19,8 @@ copy RestSharp.WindowsPhone.Mango\bin\Release\*.dll Download\WindowsPhone\7.1\
 copy RestSharp.WindowsPhone.Mango\bin\Release\*.xml Download\WindowsPhone\7.1\
 
 copy LICENSE.txt Download
+copy readme.txt Download
+copy readme.txt Download\package
 
 copy RestSharp\bin\Release\RestSharp.dll Download\Package\lib\net35\
 copy RestSharp\bin\Release\RestSharp.dll Download\Package\lib\net35-client\
@@ -32,4 +34,5 @@ copy RestSharp.Silverlight\bin\Release\RestSharp.Silverlight.xml Download\Packag
 copy RestSharp.WindowsPhone\bin\Release\RestSharp.WindowsPhone.xml Download\Package\lib\sl3-wp\
 copy RestSharp.WindowsPhone.Mango\bin\Release\RestSharp.WindowsPhone.xml Download\Package\lib\sl4-wp71\
 
+tools\nuget.exe update -self
 tools\nuget.exe pack restsharp.nuspec -BasePath Download\Package -Output Download
diff --git a/readme.txt b/readme.txt
@@ -0,0 +1,12 @@
+*** IMPORTANT CHANGE IN 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:
+
+var client = new RestClient();
+client.JsonSerializer = new YourCustomSerializer();
+
+If you run into any compatibility issues with deserialization, please report it to http://groups.google.com/group/restsharp
diff --git a/restsharp.nuspec b/restsharp.nuspec
@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>RestSharp</id>
-		<version>102.7</version>
+		<version>103.0.0-nojsondotnet</version>
 		<authors>John Sheehan, RestSharp Community</authors>
 		<owners>John Sheehan</owners>
 		<description>Simple REST and HTTP API Client</description>
@@ -12,6 +12,8 @@
 		<iconUrl>http://dl.dropbox.com/u/1827/restsharp100.png</iconUrl>
 		<tags>REST HTTP API JSON XML</tags>
 		<releaseNotes>
+			103.0 - Remove dependency on Json.NET
+			        Remove WP7.0 support (7.1 Mango remains).
 			102.7 - Updating Json.NET to 4.0.8, misc fixes
 			102.6 - Updating Json.NET reference to 4.0.5
 		</releaseNotes>