Fix build error with respect to System.Web.HttpUtility.ParseQueryString.. wierd one..

Author: rassilon

src/RestSharp/RestClient.Async.cs

@@ -85,8 +85,6 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo
             await authenticator.Authenticate(this, request).ConfigureAwait(false);
         }
 
-        using var requestContent = new RequestContent(this, request);
-
         var httpMethod = AsHttpMethod(request.Method);
         var url        = this.BuildUri(request);
         var originalUrl = url;
@@ -133,7 +131,7 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo
                 // If we found coookies during a redirect,
                 // we need to update the Cookie headers:
                 if (foundCookies) {
-                    headers.AddCookieHeaders(cookieContainer, url);
+                    headers.AddCookieHeaders(url, cookieContainer);
                 }
                 using var message = PrepareRequestMessage(httpMethod, url, content, headers);
 
@@ -205,21 +203,21 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo
 
                 url = location;
 
-                if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader)) {
+                if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader1)) {
                     foundCookies = true;
                     // ReSharper disable once PossibleMultipleEnumeration
-                    cookieContainer.AddCookies(url, cookiesHeader);
+                    cookieContainer.AddCookies(url, cookiesHeader1);
                     // ReSharper disable once PossibleMultipleEnumeration
-                    Options.CookieContainer?.AddCookies(url, cookiesHeader);
+                    Options.CookieContainer?.AddCookies(url, cookiesHeader1);
                 }
             } while (true);
 
             // Parse all the cookies from the response and update the cookie jar with cookies
-            if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader)) {
+            if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader2)) {
                 // ReSharper disable once PossibleMultipleEnumeration
-                cookieContainer.AddCookies(url, cookiesHeader);
+                cookieContainer.AddCookies(url, cookiesHeader2);
                 // ReSharper disable once PossibleMultipleEnumeration
-                Options.CookieContainer?.AddCookies(url, cookiesHeader);
+                Options.CookieContainer?.AddCookies(url, cookiesHeader2);
             }
         }
         catch (Exception ex) {

test/RestSharp.InteractiveTests/AuthenticationTests.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using System.Text;
 using System.Web;
 using RestSharp.Authenticators;
 
@@ -30,7 +31,7 @@ public static async Task Can_Authenticate_With_OAuth_Async_With_Callback(Twitter
         Assert.NotNull(response);
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
-        var qs               = HttpUtility.ParseQueryString(response.Content);
+        var qs               = HttpUtility.ParseQueryString(response.Content, Encoding.UTF8);
         var oauthToken       = qs["oauth_token"];
         var oauthTokenSecret = qs["oauth_token_secret"];
 

test/RestSharp.Tests/RestSharp.Tests.csproj

@@ -7,6 +7,14 @@
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\RestSharp\RestSharp.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Net">
+      <HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web">
+      <HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <None Update="SampleData\4sq.json" CopyToOutputDirectory="PreserveNewest" />
     <None Update="SampleData\bearertoken.json" CopyToOutputDirectory="PreserveNewest" />