From fc11cac5a0362f5a4cf630c079a41d26ed6aadeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Jan 2018 15:03:19 +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 9c4b79ed97..2610a31337 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 9c4b79ed97eb89dc163cca837e197bfbf41400e3
+Subproject commit 2610a3133721b0bc4af852342aa2a179d0e66497

From 6e0cb1adb3ad0b0d153118e9c048d24ce7066099 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Jan 2018 15:05:07 +0900
Subject: [PATCH 2/2] Remove redundant arguments

---
 osu.Game/OsuGame.cs                   | 2 +-
 osu.Game/OsuGameBase.cs               | 2 +-
 osu.Game/Screens/Select/SongSelect.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 034b857e02..d1555c7270 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -111,7 +111,7 @@ namespace osu.Game
                 Task.Run(() => BeatmapManager.Import(paths.ToArray()));
             }
 
-            dependencies.CacheAs<OsuGame>(this);
+            dependencies.CacheAs(this);
 
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
             Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d0b9634696..794e829e7b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -95,7 +95,7 @@ namespace osu.Game
 
             dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));
 
-            dependencies.CacheAs<OsuGameBase>(this);
+            dependencies.CacheAs(this);
             dependencies.Cache(LocalConfig);
 
             runMigrations();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 79f00cc988..2421a4fdfe 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
         {
-            dependencies.CacheAs<SongSelect>(this);
+            dependencies.CacheAs(this);
 
             if (Footer != null)
             {