From dd52ff6cd18cce2a74475f97374d431280ac10cf Mon Sep 17 00:00:00 2001
From: Matt Richardson <matt.richardson@octopus.com>
Date: Thu, 4 Jul 2024 19:13:31 +1000
Subject: [PATCH] Re-instate old methods, but as obsolete (#2228)

---
 src/RestSharp/Options/RestClientOptions.cs | 10 ++++++++++
 src/RestSharp/RestClient.Extensions.cs     |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/RestSharp/Options/RestClientOptions.cs b/src/RestSharp/Options/RestClientOptions.cs
index b251a3115..5e924d09f 100644
--- a/src/RestSharp/Options/RestClientOptions.cs
+++ b/src/RestSharp/Options/RestClientOptions.cs
@@ -181,6 +181,16 @@ public RestClientOptions(string baseUrl) : this(new Uri(Ensure.NotEmptyString(ba
     /// </summary>
     public CookieContainer? CookieContainer { get; set; }
 
+    /// <summary>
+    /// Maximum request duration in milliseconds. When the request timeout is specified using <seealso cref="RestRequest.Timeout"/>,
+    /// the lowest value between the client timeout and request timeout will be used.
+    /// </summary>
+    [Obsolete("Use Timeout instead.")]
+    public int MaxTimeout {
+        get => (int) (Timeout?.TotalMilliseconds ?? 0);
+        set => Timeout = TimeSpan.FromMilliseconds(value);
+    }
+
     /// <summary>
     /// Request duration. Used when the request timeout is not specified using <seealso cref="RestRequest.Timeout"/>,
     /// </summary>
diff --git a/src/RestSharp/RestClient.Extensions.cs b/src/RestSharp/RestClient.Extensions.cs
index 7e16487a7..27997aa01 100644
--- a/src/RestSharp/RestClient.Extensions.cs
+++ b/src/RestSharp/RestClient.Extensions.cs
@@ -20,7 +20,12 @@ namespace RestSharp;
 [PublicAPI]
 public static partial class RestClientExtensions {
     [PublicAPI]
-    public static ValueTask<RestResponse<T>> Deserialize<T>(this IRestClient client, RestResponse response, CancellationToken cancellationToken)
+    [Obsolete("Please use the async overload with a cancellation token")]
+    public static RestResponse<T> Deserialize<T>(this IRestClient client, RestResponse response)
+        => AsyncHelpers.RunSync(() => client.Serializers.Deserialize<T>(response.Request, response, client.Options, CancellationToken.None).AsTask());
+
+    [PublicAPI]
+    public static ValueTask<RestResponse<T>> Deserialize<T>(this IRestClient client, RestResponse response, CancellationToken cancellationToken)    
         => client.Serializers.Deserialize<T>(response.Request, response, client.Options, cancellationToken);
 
     /// <summary>