From 8fab6abf908b2c53d5428d7fca294f5f66879b5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2017 14:46:17 +0900
Subject: [PATCH] Update WebRequest usage in line with framework changes

---
 osu-framework                     |  2 +-
 osu.Desktop.Deploy/Program.cs     | 12 +++---------
 osu.Game/Online/API/APIRequest.cs |  2 +-
 osu.Game/Online/API/OAuth.cs      |  4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/osu-framework b/osu-framework
index 383a8da7bc..26f3091dca 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 383a8da7bc45af498288b4b72c72a048a0996e74
+Subproject commit 26f3091dcaf47e3b355b7f7ad83b292621d7d6b5
diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs
index 785f915a3e..385bc444d1 100644
--- a/osu.Desktop.Deploy/Program.cs
+++ b/osu.Desktop.Deploy/Program.cs
@@ -7,7 +7,6 @@ using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Net;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using FileWebRequest = osu.Framework.IO.Network.FileWebRequest;
@@ -391,8 +390,8 @@ namespace osu.Desktop.Deploy
 
         public static void AuthenticatedBlockingPerform(this WebRequest r)
         {
-            r.AddHeader("Authorization", $"token {GitHubAccessToken}");
-            r.BlockingPerform();
+            r.Headers.Add("Authorization", $"token {GitHubAccessToken}");
+            r.Perform();
         }
     }
 
@@ -402,12 +401,7 @@ namespace osu.Desktop.Deploy
         {
         }
 
-        protected override HttpWebRequest CreateWebRequest(string requestString = null)
-        {
-            var req = base.CreateWebRequest(requestString);
-            req.Accept = "application/octet-stream";
-            return req;
-        }
+        protected override string Accept => "application/octet-stream";
     }
 
     internal class ReleaseLine
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 37903f924f..9a8180778d 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Online.API
                 return;
 
             if (!WebRequest.Aborted) //could have been aborted by a Cancel() call
-                WebRequest.BlockingPerform();
+                WebRequest.Perform();
 
             if (checkAndProcessFailure())
                 return;
diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 5410bcc55d..445688f2ce 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    req.BlockingPerform();
+                    req.Perform();
                 }
                 catch
                 {
@@ -61,7 +61,7 @@ namespace osu.Game.Online.API
                     ClientSecret = clientSecret
                 })
                 {
-                    req.BlockingPerform();
+                    req.Perform();
 
                     Token = req.ResponseObject;
                     return true;