From cb1ed2fb892062538ad2195f49226a851c4a53ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Feb 2018 16:14:39 +0900
Subject: [PATCH 1/2] Update framework

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 458ebc2d46..f6fa5b80ed 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 458ebc2d4626c74bb8059cd28b44eb7adba74fbb
+Subproject commit f6fa5b80ed06f84c8fd25a2576eea8d51565785c

From 31edcfa35c107c19111bbbf05ef4bf7ece0a1b6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Feb 2018 16:12:54 +0900
Subject: [PATCH 2/2] Attempt to fix beatmap carousel test failures

As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164

Potentially was continuing operation too early.
---
 osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
index 4a65d12977..901d24e531 100644
--- a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
@@ -60,7 +60,9 @@ private void load()
 
             AddStep("Load Beatmaps", () => { carousel.BeatmapSets = beatmapSets; });
 
-            AddUntilStep(() => carousel.BeatmapSets.Any(), "Wait for load");
+            bool changed = false;
+            carousel.BeatmapSetsChanged = () => changed = true;
+            AddUntilStep(() => changed, "Wait for load");
 
             testTraversal();
             testFiltering();