Merge branch 'feature/timeout-property' into develop

Author: fubar-coder

README.md

@@ -6,10 +6,14 @@ This is some kind of a RestSharp port to PCL.
 
 # News #
 
-* Version 2.3.2 is available now!
+* Version 2.4.0 is available now!
 
 # Changes #
 
+## 2.4.0 ##
+
+* New "Timeout" property to fix issue [#13](https://github.com/FubarDevelopment/restsharp.portable/issues/13) with [CancellationTokenSource.CancelAfter](https://msdn.microsoft.com/de-de/library/hh194678%28v=vs.110%29.aspx)
+
 ## 2.3.2 ##
 
 * Fixes concurrent requests on the same RestClient (fixes [#19](https://github.com/FubarDevelopment/restsharp.portable/issues/19), 

RestSharp.Portable.Encodings.nuspec

@@ -21,7 +21,7 @@ Supported Platforms:
 - Xamarin iOS / MonoTouch
 - Portable Class Libraries</description>
         <summary>Library that will contain some standard Content-Encoding handlers</summary>
-        <releaseNotes>- Parallel release (issues #11, #12, and #15 fixed)</releaseNotes>
+        <releaseNotes>- Parallel release (issue #13)</releaseNotes>
         <copyright>Copyright © RestSharp.Portable project 2013-2015</copyright>
         <language>en-US</language>
         <tags>PCL RestSharp portable encoding gzip</tags>

RestSharp.Portable.OAuth.nuspec

@@ -22,7 +22,7 @@ Supported Platforms:
 - Xamarin iOS / MonoTouch
 - Portable Class Libraries</description>
     <summary>OAuth authenticator</summary>
-    <releaseNotes>- Parallel release (Issues #17 fixed)</releaseNotes>
+    <releaseNotes>- Parallel release (issue #13)</releaseNotes>
     <copyright>Copyright © John Sheehan and RestSharp.Portable project</copyright>
     <language>en-US</language>
     <tags>PCL RestSharp portable OAuth</tags>

RestSharp.Portable.OAuth2.nuspec

@@ -22,7 +22,7 @@ Supported Platforms:
 - Xamarin iOS / MonoTouch
 - Portable Class Libraries (.NET 4.0.3+)</description>
         <summary>OAuth 2.0 authenticators and clients</summary>
-      <releaseNotes>- Parallel release (Issues #17 fixed)</releaseNotes>
+      <releaseNotes>- Parallel release (issues #13)</releaseNotes>
       <copyright>Copyright © Constantin Titarenko, RestSharp.Portable project and others</copyright>
         <language>en-US</language>
         <tags>PCL RestSharp portable OAuth 2.0 OAuth2</tags>

RestSharp.Portable.nuspec

@@ -21,10 +21,7 @@ Supported Platforms:
 - Xamarin iOS / MonoTouch
 - Portable Class Libraries</description>
         <summary>Some kind of a RestSharp port to PCL</summary>
-        <releaseNotes>- New IsSuccess proeprty for IRestResponse (fixes issue #17)
-- All data is converted to a string using the en-US culture
-- All DateTime(Offset) HTTP header values are encoded as described in RFC 1123 after conversion to UTC/GMT
-- Synchronization of requests for the same client (fixes issue #19)</releaseNotes>
+        <releaseNotes>- New timeout property to avoid problems with CancellationTokenSource (issue #13)</releaseNotes>
         <copyright>Copyright © RestSharp.Portable project 2013-2015</copyright>
         <language>en-US</language>
         <tags>PCL RestSharp portable</tags>

RestSharp.Portable/HttpClientImpl/DefaultHttpClientFactory.cs

@@ -42,7 +42,13 @@ public virtual HttpClient CreateClient(IRestClient client, IRestRequest request)
             {
                 BaseAddress = GetBaseAddress(client)
             };
+
             httpClient = AddHttpHeaderParameters(httpClient, client);
+
+            var timeout = client.Timeout;
+            if (timeout.HasValue)
+                httpClient.Timeout = timeout.Value;
+
             return httpClient;
         }
 

RestSharp.Portable/IRestClient.cs

@@ -57,6 +57,15 @@ public interface IRestClient : IDisposable
         /// </remarks>
         StringComparer DefaultParameterNameComparer { get; set; }
 
+        /// <summary>
+        /// Gets or sets the timeout to be used for requests.
+        /// </summary>
+        /// <remarks>
+        /// When the value isn't set, it uses the default timeout of <see cref="System.Net.Http.HttpClient"/> (100 seconds) or whatever
+        /// is used to implement the <see cref="IHttpClientFactory"/>.
+        /// </remarks>
+        TimeSpan? Timeout { get; set; }
+
         /// <summary>
         /// Execute the given request
         /// </summary>

RestSharp.Portable/RestClient.cs

@@ -101,6 +101,15 @@ public RestClient(string baseUrl)
         /// </remarks>
         public StringComparer DefaultParameterNameComparer { get; set; }
 
+        /// <summary>
+        /// Gets or sets the timeout to be used for requests.
+        /// </summary>
+        /// <remarks>
+        /// When the value isn't set, it uses the default timeout of <see cref="System.Net.Http.HttpClient"/> (100 seconds) or whatever
+        /// is used to implement the <see cref="IHttpClientFactory"/>.
+        /// </remarks>
+        public TimeSpan? Timeout { get; set; }
+
         /// <summary>
         /// Gets the collection of the default parameters for all requests
         /// </summary>

SharedAssemblyInfo.cs

@@ -24,9 +24,9 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
 // durch Einsatz von '*', wie in nachfolgendem Beispiel:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.2")]
-[assembly: AssemblyInformationalVersion("2.3.2")]
+[assembly: AssemblyVersion("2.4.0")]
+[assembly: AssemblyFileVersion("2.4.0")]
+[assembly: AssemblyInformationalVersion("2.4.0")]
 
 [assembly: InternalsVisibleTo("RestSharp.Portable.OAuth, PublicKey=" +
 "00240000048000009400000006020000002400005253413100040000010001000f8415df6f1232" +

nuget-pack.ps1

@@ -1,7 +1,7 @@
 [OutputType([void])]
 param(
 	[Parameter()]
-	$version = "2.3.2",
+	$version = "2.4.0",
 	[Parameter()]
 	$config = "Release"
 )