From 14efee7ed8568d60953bd6dab3a6a2f20a2d86c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2017 21:02:07 +0900
Subject: [PATCH 1/4] Update deploy dependency paths

Forgot about these. Should probably make them automatically handle version changes at some point...
---
 osu.Desktop.Deploy/Program.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs
index 644987ce5a..929483b428 100644
--- a/osu.Desktop.Deploy/Program.cs
+++ b/osu.Desktop.Deploy/Program.cs
@@ -17,8 +17,8 @@ namespace osu.Desktop.Deploy
 {
     internal static class Program
     {
-        private const string nuget_path = @"packages\NuGet.CommandLine.4.1.0\tools\NuGet.exe";
-        private const string squirrel_path = @"packages\squirrel.windows.1.7.5\tools\Squirrel.exe";
+        private const string nuget_path = @"packages\NuGet.CommandLine.4.3.0\tools\NuGet.exe";
+        private const string squirrel_path = @"packages\squirrel.windows.1.7.8\tools\Squirrel.exe";
         private const string msbuild_path = @"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe";
 
         public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"];

From 160f48bf8587f0a38b15d92fb5187edb84bbb11d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2017 17:50:50 +0900
Subject: [PATCH 2/4] Make VisualTests target 64 bit where possible

---
 osu.Desktop/osu.Desktop.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 5eebad47ef..bb9852681c 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -104,6 +104,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <StartArguments>--tests</StartArguments>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">

From db6437eea9fc1a79e7655cd7cc098cd8383f2b07 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2017 17:58:42 +0900
Subject: [PATCH 3/4] Remove very old defined constants

---
 osu.Desktop/osu.Desktop.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index bb9852681c..ef57265a06 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -69,7 +69,8 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>CuttingEdge NoUpdate</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoStdLib>true</NoStdLib>

From 7cd6caacaa2e0b1be559a1660ef63cc0a349abdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2017 18:08:12 +0900
Subject: [PATCH 4/4] Update to support newer return structure from osu-web API

---
 .../Visual/TestCaseUserProfile.cs             |  9 +++-----
 osu.Game/Overlays/Profile/RankChart.cs        |  2 +-
 osu.Game/Users/User.cs                        | 23 ++++---------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/osu.Desktop.Tests/Visual/TestCaseUserProfile.cs b/osu.Desktop.Tests/Visual/TestCaseUserProfile.cs
index e5955441dc..a94177c1b6 100644
--- a/osu.Desktop.Tests/Visual/TestCaseUserProfile.cs
+++ b/osu.Desktop.Tests/Visual/TestCaseUserProfile.cs
@@ -33,13 +33,10 @@ namespace osu.Desktop.Tests.Visual
                     Rank = 2148,
                     PP = 4567.89m
                 },
-                AllRankHistories = new User.RankHistories
+                RankHistory = new User.RankHistoryData
                 {
-                    Osu = new User.RankHistory
-                    {
-                        Mode = @"osu",
-                        Data = Enumerable.Range(2345,45).Concat(Enumerable.Range(2109,40)).ToArray()
-                    }
+                    Mode = @"osu",
+                    Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
                 }
             }, false));
             AddStep("Show ppy", () => profile.ShowUser(new User
diff --git a/osu.Game/Overlays/Profile/RankChart.cs b/osu.Game/Overlays/Profile/RankChart.cs
index 416bcedfea..2e2286098a 100644
--- a/osu.Game/Overlays/Profile/RankChart.cs
+++ b/osu.Game/Overlays/Profile/RankChart.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Profile
                 }
             };
 
-            ranks = user.AllRankHistories?.Osu?.Data ?? new[] { user.Statistics.Rank };
+            ranks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
         }
 
         private void updateRankTexts()
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 37b426ac2c..2adb809334 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -122,25 +122,10 @@ namespace osu.Game.Users
             public int Available;
         }
 
-        [JsonProperty(@"defaultStatistics")]
+        [JsonProperty(@"statistics")]
         public UserStatistics Statistics;
 
-        public class RankHistories
-        {
-            [JsonProperty(@"osu")]
-            public RankHistory Osu;
-
-            [JsonProperty(@"taiko")]
-            public RankHistory Taiko;
-
-            [JsonProperty(@"fruits")]
-            public RankHistory Fruits;
-
-            [JsonProperty(@"mania")]
-            public RankHistory Mania;
-        }
-
-        public class RankHistory
+        public class RankHistoryData
         {
             [JsonProperty(@"mode")]
             public string Mode;
@@ -149,7 +134,7 @@ namespace osu.Game.Users
             public int[] Data;
         }
 
-        [JsonProperty(@"allRankHistories")]
-        public RankHistories AllRankHistories;
+        [JsonProperty(@"rankHistory")]
+        public RankHistoryData RankHistory;
     }
 }