From 9efe809c1df176d0bf96386bdc4b1d1d44d91199 Mon Sep 17 00:00:00 2001
From: Derek Beattie <derek.beattie@gmail.com>
Date: Mon, 25 Aug 2014 01:08:34 -0700
Subject: [PATCH 1/3] Add file upload

---
 src/PortableRest/ContentTypes.cs     |  4 ++++
 src/PortableRest/FileParameter.cs    | 34 ++++++++++++++++++++++++++++
 src/PortableRest/PortableRest.csproj |  1 +
 src/PortableRest/RestClient.cs       | 27 +++++++++++++++++++++-
 src/PortableRest/RestRequest.cs      | 17 ++++++++++++++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/PortableRest/FileParameter.cs

diff --git a/src/PortableRest/ContentTypes.cs b/src/PortableRest/ContentTypes.cs
index d122763..cd7b04f 100644
--- a/src/PortableRest/ContentTypes.cs
+++ b/src/PortableRest/ContentTypes.cs
@@ -30,5 +30,9 @@ public enum ContentTypes
         /// 
         /// </summary>
         Xml,
+		/// <summary>
+		/// 
+		/// </summary>
+		MultipartFormData
     }
 }
diff --git a/src/PortableRest/FileParameter.cs b/src/PortableRest/FileParameter.cs
new file mode 100644
index 0000000..4a5fb5a
--- /dev/null
+++ b/src/PortableRest/FileParameter.cs
@@ -0,0 +1,34 @@
+namespace PortableRest
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class FileParameter
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		public string FileName { get; set; }
+		/// <summary>
+		/// 
+		/// </summary>
+		public byte[] Data { get; set; }
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Name { get; set; }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="name"></param>
+		/// <param name="bytes"></param>
+		/// <param name="fileName"></param>
+		public FileParameter(string name, byte[] bytes, string fileName)
+		{
+			FileName = fileName;
+			Data = bytes;
+			Name = name;
+		}
+	}
+}
diff --git a/src/PortableRest/PortableRest.csproj b/src/PortableRest/PortableRest.csproj
index 7db4f66..1366d5b 100644
--- a/src/PortableRest/PortableRest.csproj
+++ b/src/PortableRest/PortableRest.csproj
@@ -82,6 +82,7 @@
     <Compile Include="EncodedParameter.cs" />
     <Compile Include="Extensions\StreamExtensions.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
+    <Compile Include="FileParameter.cs" />
     <Compile Include="RestResponse.cs" />
     <Compile Include="ParameterEncoding.cs" />
     <Compile Include="PortableRestException.cs" />
diff --git a/src/PortableRest/RestClient.cs b/src/PortableRest/RestClient.cs
index 6652650..4f848f2 100644
--- a/src/PortableRest/RestClient.cs
+++ b/src/PortableRest/RestClient.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text;
@@ -328,7 +329,31 @@ private static object Transform(XNode node, RestRequest request)
                     if (restRequest.Parameters.Count > 0)
                     {
                         message.Content = new ByteArrayContent(restRequest.Parameters[0].GetEncodedValue() as byte[]);
-                    }
+					}
+					else if (restRequest.ContentType == ContentTypes.MultipartFormData)
+					{
+						var multipartPartFormDataContent = new MultipartFormDataContent();
+						var contentJson = new StringContent(restRequest.GetRequestBody());
+						multipartPartFormDataContent.Add(contentJson);
+						message.Content = contentJson;
+
+						if (restRequest.Files.Any())
+						{
+							foreach (var fileParameter in restRequest.Files)
+							{
+								var streamContent = new StreamContent(new MemoryStream(fileParameter.Data, 0, fileParameter.Data.Length));
+								streamContent.Headers.ContentDisposition = ContentDispositionHeaderValue.Parse("form-data");
+								streamContent.Headers.ContentDisposition.Parameters.Add(
+									new NameValueHeaderValue("name", string.Format("\"{0}\"", fileParameter.Name)));
+								streamContent.Headers.ContentDisposition.Parameters.Add(
+									new NameValueHeaderValue("filename", string.Format("\"{0}\"", fileParameter.FileName)));
+
+								multipartPartFormDataContent.Add(streamContent);
+							}
+
+							message.Content = multipartPartFormDataContent;
+						}
+					}
                 }
                 else
                 {
diff --git a/src/PortableRest/RestRequest.cs b/src/PortableRest/RestRequest.cs
index bfe5611..858374b 100644
--- a/src/PortableRest/RestRequest.cs
+++ b/src/PortableRest/RestRequest.cs
@@ -32,6 +32,11 @@ public class RestRequest
         /// </summary>
         internal List<EncodedParameter> Parameters { get; set; }
 
+		/// <summary>
+		/// 
+		/// </summary>
+		internal List<FileParameter> Files { get; set; }
+
         #endregion
 
         #region Properties
@@ -93,6 +98,7 @@ public RestRequest()
         {
             UrlSegments = new List<UrlSegment>();
             Parameters = new List<EncodedParameter>();
+			Files = new List<FileParameter>();
             Headers = new Dictionary<string, object>();
             Method = HttpMethod.Get;
         }
@@ -192,6 +198,17 @@ public void AddParameter(string key, object value, ParameterEncoding encoding =
             Parameters.Add(new EncodedParameter(key, value, encoding));
         }
 
+		/// <summary>
+		/// Adds the bytes to the Files collection with the specified file name
+		/// </summary>
+		/// <param name="name">The parameter name to use in the request</param>
+		/// <param name="bytes">The file data</param>
+		/// <param name="fileName">The file name to use for the uploaded file</param>
+		/// <returns>This request</returns>
+		public void AddFile(string name, byte[] bytes, string fileName)
+		{
+			Files.Add(new FileParameter(name, bytes, fileName));
+		}
 
         /// <summary>
         /// Replaces tokenized segments of the URL with a desired value.

From 51e84b28c5e2bacd75babe494baa4ffafcf5e867 Mon Sep 17 00:00:00 2001
From: Jeff Hansen <jeffijoe@hotmail.com>
Date: Fri, 31 Oct 2014 14:10:11 +0100
Subject: [PATCH 2/3] Added JsonDeserializerSettings to RestClient - we need
 this for custom converters.

---
 src/.nuget/NuGet.Config                       |   6 +
 src/.nuget/NuGet.targets                      | 144 ++++++++++++++++++
 .../PortableRest.Tests.csproj                 |  24 +--
 src/PortableRest.Tests/app.config             |   2 +-
 src/PortableRest.Tests/packages.config        |   2 +-
 src/PortableRest.sln                          |   4 +-
 src/PortableRest/PortableRest.csproj          |  21 ++-
 src/PortableRest/RestClient.cs                |  15 +-
 src/PortableRest/packages.config              |   8 +-
 9 files changed, 196 insertions(+), 30 deletions(-)
 create mode 100644 src/.nuget/NuGet.Config
 create mode 100644 src/.nuget/NuGet.targets

diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config
new file mode 100644
index 0000000..67f8ea0
--- /dev/null
+++ b/src/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
new file mode 100644
index 0000000..3f8c37b
--- /dev/null
+++ b/src/.nuget/NuGet.targets
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
+      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>
diff --git a/src/PortableRest.Tests/PortableRest.Tests.csproj b/src/PortableRest.Tests/PortableRest.Tests.csproj
index d7ff358..15867c7 100644
--- a/src/PortableRest.Tests/PortableRest.Tests.csproj
+++ b/src/PortableRest.Tests/PortableRest.Tests.csproj
@@ -50,12 +50,10 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\PortableRest.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup Condition="'$(Configuration)|$(Platform)' != 'Release-Signed|AnyCPU'">
+  <ItemGroup>
     <Reference Include="AsyncOAuth">
       <HintPath>..\packages\AsyncOAuth.0.8.4\lib\AsyncOAuth.dll</HintPath>
     </Reference>
-  </ItemGroup>
-  <ItemGroup>
     <Reference Include="FluentAssertions, Version=3.0.107.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentAssertions.3.0.107\lib\net45\FluentAssertions.dll</HintPath>
@@ -77,15 +75,12 @@
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks.Extensions">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -97,17 +92,15 @@
     <Reference Include="System" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.0-rc\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
@@ -194,6 +187,13 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
diff --git a/src/PortableRest.Tests/app.config b/src/PortableRest.Tests/app.config
index b74c831..c736c48 100644
--- a/src/PortableRest.Tests/app.config
+++ b/src/PortableRest.Tests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.22.0" newVersion="4.2.22.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.28.0" newVersion="4.2.28.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/PortableRest.Tests/packages.config b/src/PortableRest.Tests/packages.config
index 4d58944..bb0fba2 100644
--- a/src/PortableRest.Tests/packages.config
+++ b/src/PortableRest.Tests/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net451" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net451" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net451" />
-  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net451" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net451" />
   <package id="Microsoft.Owin" version="3.0.0-beta1" targetFramework="net451" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.0-beta1" targetFramework="net451" />
   <package id="Microsoft.Owin.Hosting" version="3.0.0-beta1" targetFramework="net451" />
diff --git a/src/PortableRest.sln b/src/PortableRest.sln
index 4e3c82f..e274f86 100644
--- a/src/PortableRest.sln
+++ b/src/PortableRest.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableRest", "PortableRest\PortableRest.csproj", "{A3546D1A-CE87-49BB-800A-98018C1FCA00}"
 EndProject
@@ -16,7 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{155D3255-6321-4241-8357-162D6A883535}"
 	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
 		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
 Global
diff --git a/src/PortableRest/PortableRest.csproj b/src/PortableRest/PortableRest.csproj
index 7db4f66..98dc6c1 100644
--- a/src/PortableRest/PortableRest.csproj
+++ b/src/PortableRest/PortableRest.csproj
@@ -93,11 +93,9 @@
   <ItemGroup>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks.Extensions">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
@@ -106,13 +104,13 @@
       <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.27-beta\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.27-beta\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Primitives">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.27-beta\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime">
       <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll</HintPath>
@@ -122,10 +120,17 @@
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/PortableRest/RestClient.cs b/src/PortableRest/RestClient.cs
index 6ab1557..0cae301 100644
--- a/src/PortableRest/RestClient.cs
+++ b/src/PortableRest/RestClient.cs
@@ -73,6 +73,15 @@ public HttpMessageHandler HttpHandler
         /// </summary>
         public JsonSerializerSettings JsonSerializerSettings { get; set; }
 
+        /// <summary>
+        /// Allows you to have more control over how JSON content is deserialized from the response body.
+        /// </summary>
+        /// <value>
+        /// The json deserializer settings.
+        /// </value>
+        public JsonSerializerSettings JsonDeserializerSettings { get; set; }
+
+
         /// <summary>
         /// A list of KeyValuePairs that will be appended to the Headers collection for all requests.
         /// </summary>
@@ -356,7 +365,7 @@ private static object Transform(XNode node, RestRequest request)
         /// <param name="restRequest"></param>
         /// <param name="httpResponseMessage"></param>
         /// <returns></returns>
-        private static async Task<T> GetResponseContent<T>(RestRequest restRequest, HttpResponseMessage httpResponseMessage) where T : class
+        private async Task<T> GetResponseContent<T>(RestRequest restRequest, HttpResponseMessage httpResponseMessage) where T : class
         {
             var rawResponseContent = await GetRawResponseContent(httpResponseMessage).ConfigureAwait(false);
             if (rawResponseContent == null) return null;
@@ -392,7 +401,7 @@ private static async Task<string> GetRawResponseContent(HttpResponseMessage resp
         /// <param name="response"></param>
         /// <param name="responseContent"></param>
         /// <returns></returns>
-        private static T DeserializeResponseContent<T>(RestRequest restRequest, HttpResponseMessage response, string responseContent) where T : class
+        private T DeserializeResponseContent<T>(RestRequest restRequest, HttpResponseMessage response, string responseContent) where T : class
         {
             switch (response.Content.Headers.ContentType.MediaType)
             {
@@ -401,7 +410,7 @@ private static T DeserializeResponseContent<T>(RestRequest restRequest, HttpResp
                     return DeserializeApplicationXml<T>(restRequest, responseContent);
                     //TODO: Handle more response types... like files.
                 default:
-                    return JsonConvert.DeserializeObject<T>(responseContent);
+                    return JsonConvert.DeserializeObject<T>(responseContent, JsonDeserializerSettings);
             }
         }
 
diff --git a/src/PortableRest/packages.config b/src/PortableRest/packages.config
index 75a4915..19069b5 100644
--- a/src/PortableRest/packages.config
+++ b/src/PortableRest/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net45+sl50+win+wpa81+wp80" />
-  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net45+sl50+win+wp80" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net45+sl50+win+wp80+MonoAndroid10+MonoTouch10" requireReinstallation="True" />
-  <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="portable-net45+sl50+win+wpa81+wp80" />
+  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net403+sl50+win+wpa81+wp80" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net403+sl50+win+wpa81+wp80" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net403+sl50+win+wpa81+wp80" />
+  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable-net403+sl50+win+wpa81+wp80" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable-net45+sl50+win+wpa81+wp80" />
 </packages>
\ No newline at end of file

From eb116fed9e8e9f1b3fb35f197a9caa64a05074ff Mon Sep 17 00:00:00 2001
From: Jeff Hansen <jeffijoe@hotmail.com>
Date: Fri, 31 Oct 2014 14:14:32 +0100
Subject: [PATCH 3/3] Added test for JsonDeserializerSettings.

---
 .../Mocks/JsonConverterMock.cs                | 32 +++++++++++++++++++
 .../PortableRest.Tests.csproj                 |  1 +
 src/PortableRest.Tests/SendAsyncTests.cs      | 30 +++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 src/PortableRest.Tests/Mocks/JsonConverterMock.cs

diff --git a/src/PortableRest.Tests/Mocks/JsonConverterMock.cs b/src/PortableRest.Tests/Mocks/JsonConverterMock.cs
new file mode 100644
index 0000000..8f6e616
--- /dev/null
+++ b/src/PortableRest.Tests/Mocks/JsonConverterMock.cs
@@ -0,0 +1,32 @@
+// JsonConverterMock.cs
+// - PortableRest
+// -- PortableRest.Tests
+// 
+// Author: Jeff Hansen <jeff@memberlink.com>
+
+using System;
+using Newtonsoft.Json;
+
+namespace PortableRest.Tests.Mocks
+{
+    public class JsonConverterMock : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            Calls++;
+            return false;
+        }
+
+        public int Calls { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/PortableRest.Tests/PortableRest.Tests.csproj b/src/PortableRest.Tests/PortableRest.Tests.csproj
index 15867c7..0d837e6 100644
--- a/src/PortableRest.Tests/PortableRest.Tests.csproj
+++ b/src/PortableRest.Tests/PortableRest.Tests.csproj
@@ -137,6 +137,7 @@
     <Compile Include="CoreTests.cs" />
     <Compile Include="ExecuteAsyncTests.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Mocks\JsonConverterMock.cs" />
     <Compile Include="SendAsyncTests.cs" />
     <Compile Include="GoogleDiscoveryClientTest.cs" />
     <Compile Include="GoogleDiscovery\Api.cs" />
diff --git a/src/PortableRest.Tests/SendAsyncTests.cs b/src/PortableRest.Tests/SendAsyncTests.cs
index 9766977..4ac0939 100644
--- a/src/PortableRest.Tests/SendAsyncTests.cs
+++ b/src/PortableRest.Tests/SendAsyncTests.cs
@@ -6,7 +6,9 @@
 using FluentAssertions;
 using Microsoft.Owin.Hosting;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
 using PortableRest.Tests.AsyncTestUtilities;
+using PortableRest.Tests.Mocks;
 using PortableRest.Tests.OwinSelfHostServer;
 
 namespace PortableRest.Tests
@@ -146,6 +148,34 @@ public void AsyncLibrariesLikePortableRestShouldNotDeadlockOnTaskResult()
 
         }
 
+        [TestMethod]
+        public void JsonDeserializerSettingsAreUsedWhenDeserializingJson()
+        {
+            // Setup
+            var settings = new JsonSerializerSettings();
+            var converterMock = new JsonConverterMock();
+            settings.Converters.Add(converterMock);
+            var client = new RestClient { BaseUrl = BaseAddress, JsonDeserializerSettings = settings};
+            var request = new RestRequest("api/books");
+            RestResponse<List<Book>> response = null;
+
+            // Execute
+            using (WebApp.Start<WebApiStartup>(BaseAddress))
+            {
+                // Simulate ASP.NET and Windows Forms thread affinity
+                WindowsFormsContext.Run(() =>
+                {
+                    // Should not deadlock on this call
+                    response = client.SendAsync<List<Book>>(request).Result;
+                });
+            }
+
+            // Validate
+            converterMock.Calls.Should().NotBe(0);
+            response.Content.Should().NotBeNull();
+            response.Content.Count().Should().Be(5);
+            
+        }
     }
 
 }
\ No newline at end of file