From 3e828c3416bd6d4f4701a5916be185eff71ab0f5 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:11:38 +0300
Subject: [PATCH 01/65] Move base layout from DifficultyMultiplierDisplay to
 another class

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 144 ++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 osu.Game/Overlays/Mods/ModsEffectDisplay.cs

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
new file mode 100644
index 0000000000..a7c5ec9ef9
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -0,0 +1,144 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    /// <inheritdoc />
+    /// <summary>
+    /// Base class for displays of mods effects.
+    /// </summary>
+    public abstract class ModsEffectDisplay : Container
+    {
+        public const float HEIGHT = 42;
+        private const float value_area_width = 56;
+        private const float transition_duration = 200;
+
+        private readonly Box contentBackground;
+        private readonly Box labelBackground;
+        private readonly Container content;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        /// <summary>
+        /// Text to display in the left area of the display.
+        /// </summary>
+        protected abstract LocalisableString Label { get; }
+
+        protected override Container<Drawable> Content => content;
+
+        protected ModsEffectDisplay()
+        {
+            Height = HEIGHT;
+            AutoSizeAxes = Axes.X;
+
+            InternalChild = new InputBlockingContainer
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Masking = true,
+                CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                Children = new Drawable[]
+                {
+                    contentBackground = new Box
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = value_area_width + ModSelectPanel.CORNER_RADIUS
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, value_area_width)
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Masking = true,
+                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                                    Children = new Drawable[]
+                                    {
+                                        labelBackground = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Margin = new MarginPadding { Horizontal = 18 },
+                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                            Text = Label,
+                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                                        }
+                                    }
+                                },
+                                content = new Container
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            labelBackground.Colour = colourProvider.Background4;
+        }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="difference">Difference between actual value and default value.
+        /// Negative leads to green color, positive to red. Can be obtained via CompareTo(defaultValue).</param>
+        protected void SetColours(int difference)
+        {
+            if (difference == 0)
+            {
+                contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+            }
+            else if (difference < 0)
+            {
+                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+            }
+            else
+            {
+                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+            }
+        }
+    }
+}

From 90334a2b91888698e449797f8c29d6f71c526885 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:12:45 +0300
Subject: [PATCH 02/65] Add test scene

---
 .../TestSceneModsEffectDisplay.cs             | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
new file mode 100644
index 0000000000..36267b0e2a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -0,0 +1,60 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModsEffectDisplay : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        [Test]
+        public void TestEffectDisplay()
+        {
+            TestDisplay dsp;
+            Add(dsp = new TestDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+            AddSliderStep("value", 40, 60, 50, i => dsp.Value = i);
+        }
+
+        private class TestDisplay : ModsEffectDisplay
+        {
+            private readonly OsuSpriteText text;
+
+            protected override LocalisableString Label => "Test display";
+
+            public int Value
+            {
+                set
+                {
+                    text.Text = value.ToString();
+                    SetColours(value.CompareTo(50));
+                }
+            }
+
+            public TestDisplay()
+            {
+                Add(text = new OsuSpriteText
+                {
+                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold),
+                    Text = "50"
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load() => SetColours(0);
+        }
+    }
+}

From 039f00956225ef2459da64469206a6a168c18687 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:26:05 +0300
Subject: [PATCH 03/65] Inherit difficulty multiplier display from
 `ModsEffectDiplay`

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 140 +++---------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   4 +-
 2 files changed, 21 insertions(+), 123 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 835883fb93..e5daa2de63 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,27 +3,24 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class DifficultyMultiplierDisplay : CompositeDrawable, IHasCurrentValue<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay, IHasCurrentValue<double>
     {
-        public const float HEIGHT = 42;
+        protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
         public Bindable<double> Current
         {
@@ -33,143 +30,44 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>(1);
 
-        private readonly Box underlayBackground;
-        private readonly Box contentBackground;
-        private readonly FillFlowContainer multiplierFlow;
         private readonly MultiplierCounter multiplierCounter;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
-
-        private const float multiplier_value_area_width = 56;
-        private const float transition_duration = 200;
-
         public DifficultyMultiplierDisplay()
         {
-            Height = HEIGHT;
-            AutoSizeAxes = Axes.X;
-
-            InternalChild = new InputBlockingContainer
+            Add(new FillFlowContainer
             {
-                RelativeSizeAxes = Axes.Y,
-                AutoSizeAxes = Axes.X,
-                Masking = true,
-                CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(2, 0),
                 Children = new Drawable[]
                 {
-                    underlayBackground = new Box
+                    multiplierCounter = new MultiplierCounter
                     {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = multiplier_value_area_width + ModSelectPanel.CORNER_RADIUS
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Current = { BindTarget = Current }
                     },
-                    new GridContainer
+                    new SpriteIcon
                     {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, multiplier_value_area_width)
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Masking = true,
-                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                                    Children = new Drawable[]
-                                    {
-                                        contentBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Margin = new MarginPadding { Horizontal = 18 },
-                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                multiplierFlow = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(2, 0),
-                                    Children = new Drawable[]
-                                    {
-                                        multiplierCounter = new MultiplierCounter
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            Current = { BindTarget = Current }
-                                        },
-                                        new SpriteIcon
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            Icon = FontAwesome.Solid.Times,
-                                            Size = new Vector2(7),
-                                            Margin = new MarginPadding { Top = 1 }
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.Times,
+                        Size = new Vector2(7),
+                        Margin = new MarginPadding { Top = 1 }
                     }
                 }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            contentBackground.Colour = colourProvider.Background4;
+            });
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            current.BindValueChanged(_ => updateState(), true);
+            current.BindValueChanged(e => SetColours(e.NewValue.CompareTo(current.Default)), true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(Current.Value);
-        }
-
-        private void updateState()
-        {
-            if (Current.IsDefault)
-            {
-                underlayBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                multiplierFlow.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                var backgroundColour = Current.Value < 1
-                    ? colours.ForModType(ModType.DifficultyReduction)
-                    : colours.ForModType(ModType.DifficultyIncrease);
-
-                underlayBackground.FadeColour(backgroundColour, transition_duration, Easing.OutQuint);
-                multiplierFlow.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-            }
+            multiplierCounter.SetCountWithoutRolling(current.Value);
         }
 
         private class MultiplierCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b993aca0ca..ccc075b190 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? DifficultyMultiplierDisplay.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = DifficultyMultiplierDisplay.HEIGHT,
+                    Height = ModsEffectDisplay.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {

From 2a12194ff9243e44dc8b29ff6e25dfd456ff4767 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sun, 28 Aug 2022 02:59:38 +0300
Subject: [PATCH 04/65] Test colours

---
 .../TestSceneModsEffectDisplay.cs             | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index 36267b0e2a..dd663ad59d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -1,38 +1,65 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
+    [TestFixture]
     public class TestSceneModsEffectDisplay : OsuTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [Test]
-        public void TestEffectDisplay()
+        public void TestModsEffectDisplay()
         {
-            TestDisplay dsp;
-            Add(dsp = new TestDisplay
+            TestDisplay testDisplay = null!;
+            Box background = null!;
+
+            AddStep("add display", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
+                Add(testDisplay = new TestDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                });
+                var boxes = testDisplay.ChildrenOfType<Box>();
+                background = boxes.First();
             });
-            AddSliderStep("value", 40, 60, 50, i => dsp.Value = i);
+
+            AddStep("set value to default", () => testDisplay.Value = 50);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
+
+            AddStep("set value to less", () => testDisplay.Value = 40);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
+
+            AddStep("set value to bigger", () => testDisplay.Value = 60);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
         private class TestDisplay : ModsEffectDisplay
         {
             private readonly OsuSpriteText text;
 
+            public Container<Drawable> Container => Content;
+
             protected override LocalisableString Label => "Test display";
 
             public int Value

From 7faeed88b053e6b06f3de90fdb74b89ca1793215 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:08:43 +0300
Subject: [PATCH 05/65] Add ability to override width of value area

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index a7c5ec9ef9..4b97614ade 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Overlays.Mods
     public abstract class ModsEffectDisplay : Container
     {
         public const float HEIGHT = 42;
-        private const float value_area_width = 56;
         private const float transition_duration = 200;
 
         private readonly Box contentBackground;
@@ -38,6 +37,8 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
+        protected virtual float ValueAreaWidth => 56;
+
         protected override Container<Drawable> Content => content;
 
         protected ModsEffectDisplay()
@@ -59,7 +60,7 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
                         RelativeSizeAxes = Axes.Y,
-                        Width = value_area_width + ModSelectPanel.CORNER_RADIUS
+                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
                     },
                     new GridContainer
                     {
@@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Mods
                         ColumnDimensions = new[]
                         {
                             new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, value_area_width)
+                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
                         },
                         Content = new[]
                         {

From 5343c2645253407a218ee7916dfe11cd347ed4e5 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:48:27 +0300
Subject: [PATCH 06/65] Control colour via `Current` bindable

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 92 +++++++++++++++++----
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 4b97614ade..2ff6bf043b 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -1,10 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -13,11 +16,10 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    /// <inheritdoc />
     /// <summary>
     /// Base class for displays of mods effects.
     /// </summary>
-    public abstract class ModsEffectDisplay : Container
+    public abstract class ModsEffectDisplay<TValue> : Container, IHasCurrentValue<TValue>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -26,6 +28,14 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly Container content;
 
+        public Bindable<TValue> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly BindableWithCurrent<TValue> current = new BindableWithCurrent<TValue>();
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -37,6 +47,13 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
+        /// <summary>
+        /// Calculates, does current value increase difficulty or decrease it.
+        /// </summary>
+        /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
+        /// <returns>Effect of the value.</returns>
+        protected abstract ModEffect CalculateEffect(TValue value);
+
         protected virtual float ValueAreaWidth => 56;
 
         protected override Container<Drawable> Content => content;
@@ -118,28 +135,67 @@ namespace osu.Game.Overlays.Mods
             labelBackground.Colour = colourProvider.Background4;
         }
 
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(e =>
+            {
+                var effect = CalculateEffect(e.NewValue);
+                setColours(effect);
+            }, true);
+        }
+
         /// <summary>
         /// Fades colours of text and its background according to displayed value.
         /// </summary>
-        /// <param name="difference">Difference between actual value and default value.
-        /// Negative leads to green color, positive to red. Can be obtained via CompareTo(defaultValue).</param>
-        protected void SetColours(int difference)
+        /// <param name="effect">Effect of the value.</param>
+        private void setColours(ModEffect effect)
         {
-            if (difference == 0)
+            switch (effect)
             {
-                contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-            }
-            else if (difference < 0)
-            {
-                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                case ModEffect.NotChanged:
+                    contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyReduction:
+                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyIncrease:
+                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(effect));
             }
         }
+
+        #region Quick implementations for CalculateEffect
+
+        /// <summary>
+        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
+        /// </summary>
+        /// <param name="comparison">Value to convert. Can be obtained from CompareTo.</param>
+        /// <returns>Effect.</returns>
+        protected ModEffect CalculateForSign(int comparison)
+        {
+            if (comparison == 0)
+                return ModEffect.NotChanged;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        #endregion
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
     }
 }

From 545e0bbcef580ab282235ba69585996a16bd6020 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:48:45 +0300
Subject: [PATCH 07/65] Adjust inheritors and test

---
 .../TestSceneModsEffectDisplay.cs             | 25 ++++++++-----------
 .../Mods/DifficultyMultiplierDisplay.cs       | 19 ++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  4 +--
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index dd663ad59d..ec50a07998 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -44,32 +44,24 @@ namespace osu.Game.Tests.Visual.UserInterface
                 background = boxes.First();
             });
 
-            AddStep("set value to default", () => testDisplay.Value = 50);
+            AddStep("set value to default", () => testDisplay.Current.Value = 50);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
 
-            AddStep("set value to less", () => testDisplay.Value = 40);
+            AddStep("set value to less", () => testDisplay.Current.Value = 40);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
 
-            AddStep("set value to bigger", () => testDisplay.Value = 60);
+            AddStep("set value to bigger", () => testDisplay.Current.Value = 60);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private class TestDisplay : ModsEffectDisplay
+        private class TestDisplay : ModsEffectDisplay<int>
         {
             private readonly OsuSpriteText text;
 
             public Container<Drawable> Container => Content;
 
             protected override LocalisableString Label => "Test display";
-
-            public int Value
-            {
-                set
-                {
-                    text.Text = value.ToString();
-                    SetColours(value.CompareTo(50));
-                }
-            }
+            protected override ModEffect CalculateEffect(int value) => CalculateForSign(value.CompareTo(50));
 
             public TestDisplay()
             {
@@ -80,8 +72,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
             }
 
-            [BackgroundDependencyLoader]
-            private void load() => SetColours(0);
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Current.BindValueChanged(e => text.Text = e.NewValue.ToString(), true);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index e5daa2de63..843310249e 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,12 +3,10 @@
 
 #nullable disable
 
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -18,22 +16,17 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay, IHasCurrentValue<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay<double>
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-
-        public Bindable<double> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-
-        private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>(1);
+        protected override ModEffect CalculateEffect(double value) => CalculateForSign(value.CompareTo(1d));
 
         private readonly MultiplierCounter multiplierCounter;
 
         public DifficultyMultiplierDisplay()
         {
+            Current.Default = 1d;
+            Current.Value = 1d;
             Add(new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -63,11 +56,9 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            current.BindValueChanged(e => SetColours(e.NewValue.CompareTo(current.Default)), true);
-
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(current.Value);
+            multiplierCounter.SetCountWithoutRolling(Current.Value);
         }
 
         private class MultiplierCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ccc075b190..80f18eafeb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay<int>.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay.HEIGHT,
+                    Height = ModsEffectDisplay<int>.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {

From b5779508d06bc3455d61a0ef617a35b8f5d8c826 Mon Sep 17 00:00:00 2001
From: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date: Tue, 6 Sep 2022 17:10:32 +0100
Subject: [PATCH 08/65] Retrieve great hit window from the hit object

---
 .../Difficulty/Evaluators/RhythmEvaluator.cs      |  4 ++--
 .../Difficulty/Evaluators/SpeedEvaluator.cs       |  7 +++----
 .../Difficulty/OsuDifficultyCalculator.cs         | 13 ++++++-------
 .../Preprocessing/OsuDifficultyHitObject.cs       | 15 +++++++++++++++
 osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs  |  8 +++-----
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index 3ffd45b588..ca57c87af9 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <summary>
         /// Calculates a rhythm multiplier for the difficulty of the tap associated with historic data of the current <see cref="OsuDifficultyHitObject"/>.
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double lastDelta = lastObj.StrainTime;
                 double currRatio = 1.0 + 6.0 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
 
-                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - greatWindow * 0.6) / (greatWindow * 0.6));
+                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.6) / (currObj.HitWindowGreat * 0.6));
 
                 windowPenalty = Math.Min(1, windowPenalty);
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
index 5187717639..c98f875eb5 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <item><description>and how easily they can be cheesed.</description></item>
         /// </list>
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             var osuNextObj = (OsuDifficultyHitObject)current.Next(0);
 
             double strainTime = osuCurrObj.StrainTime;
-            double greatWindowFull = greatWindow * 2;
             double doubletapness = 1;
 
             // Nerf doubletappable doubles.
@@ -45,13 +44,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double nextDeltaTime = Math.Max(1, osuNextObj.DeltaTime);
                 double deltaDifference = Math.Abs(nextDeltaTime - currDeltaTime);
                 double speedRatio = currDeltaTime / Math.Max(currDeltaTime, deltaDifference);
-                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / greatWindowFull), 2);
+                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / osuCurrObj.HitWindowGreat), 2);
                 doubletapness = Math.Pow(speedRatio, 1 - windowRatio);
             }
 
             // Cap deltatime to the OD 300 hitwindow.
             // 0.93 is derived from making sure 260bpm OD8 streams aren't nerfed harshly, whilst 0.92 limits the effect of the cap.
-            strainTime /= Math.Clamp((strainTime / greatWindowFull) / 0.93, 0.92, 1);
+            strainTime /= Math.Clamp((strainTime / osuCurrObj.HitWindowGreat) / 0.93, 0.92, 1);
 
             // derive speedBonus for calculation
             double speedBonus = 1.0;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 6ef17d47c0..33787da8f6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
     public class OsuDifficultyCalculator : DifficultyCalculator
     {
         private const double difficulty_multiplier = 0.0675;
-        private double hitWindowGreat;
 
         public override int Version => 20220902;
 
@@ -76,6 +75,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
             int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
 
+            HitWindows hitWindows = new OsuHitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
+
             return new OsuDifficultyAttributes
             {
                 StarRating = starRating,
@@ -112,16 +116,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            HitWindows hitWindows = new OsuHitWindows();
-            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
-
-            hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
-
             return new Skill[]
             {
                 new Aim(mods, true),
                 new Aim(mods, false),
-                new Speed(mods, hitWindowGreat),
+                new Speed(mods),
                 new Flashlight(mods)
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index c7c5650184..6aea00fd35 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
@@ -78,6 +79,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public double? Angle { get; private set; }
 
+        /// <summary>
+        /// Retrieves the full hit window for a Great <see cref="HitResult"/>.
+        /// </summary>
+        public double HitWindowGreat { get; private set; }
+
         private readonly OsuHitObject lastLastObject;
         private readonly OsuHitObject lastObject;
 
@@ -90,6 +96,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             // Capped to 25ms to prevent difficulty calculation breaking from simultaneous objects.
             StrainTime = Math.Max(DeltaTime, min_delta_time);
 
+            if (BaseObject is Slider sliderObject)
+            {
+                HitWindowGreat = 2 * sliderObject.HeadCircle.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+            else
+            {
+                HitWindowGreat = 2 * BaseObject.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+
             setDistances(clockRate);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index c39d61020c..efe0e136bf 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -26,14 +26,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
         protected override int ReducedSectionCount => 5;
         protected override double DifficultyMultiplier => 1.04;
-        private readonly double greatWindow;
 
         private readonly List<double> objectStrains = new List<double>();
 
-        public Speed(Mod[] mods, double hitWindowGreat)
+        public Speed(Mod[] mods)
             : base(mods)
         {
-            greatWindow = hitWindowGreat;
         }
 
         private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000);
@@ -43,9 +41,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         protected override double StrainValueAt(DifficultyHitObject current)
         {
             currentStrain *= strainDecay(((OsuDifficultyHitObject)current).StrainTime);
-            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current, greatWindow) * skillMultiplier;
+            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current) * skillMultiplier;
 
-            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current, greatWindow);
+            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current);
 
             double totalStrain = currentStrain * currentRhythm;
 

From 1997519364810b178ddda6b7a21b6110737c4c39 Mon Sep 17 00:00:00 2001
From: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date: Wed, 7 Sep 2022 13:24:54 +0100
Subject: [PATCH 09/65] Don't use full hit window in rhythm

---
 osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index ca57c87af9..3bec2346ce 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double lastDelta = lastObj.StrainTime;
                 double currRatio = 1.0 + 6.0 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
 
-                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.6) / (currObj.HitWindowGreat * 0.6));
+                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.3) / (currObj.HitWindowGreat * 0.3));
 
                 windowPenalty = Math.Min(1, windowPenalty);
 

From b056cac10a1259044e65e67ab059f108b66c23bb Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 08:21:38 +0300
Subject: [PATCH 10/65] Remove generic and add default implementation for
 `CalculateEffect`

---
 .../Overlays/Mods/DifficultyMultiplierDisplay.cs   |  3 +--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs         |  4 ++--
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs        | 14 ++++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 843310249e..5530947d3d 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -16,10 +16,9 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-        protected override ModEffect CalculateEffect(double value) => CalculateForSign(value.CompareTo(1d));
 
         private readonly MultiplierCounter multiplierCounter;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 80f18eafeb..ccc075b190 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? ModsEffectDisplay<int>.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay<int>.HEIGHT,
+                    Height = ModsEffectDisplay.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {
diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 2ff6bf043b..4e630439ee 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// Base class for displays of mods effects.
     /// </summary>
-    public abstract class ModsEffectDisplay<TValue> : Container, IHasCurrentValue<TValue>
+    public abstract class ModsEffectDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -28,13 +28,13 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly Container content;
 
-        public Bindable<TValue> Current
+        public Bindable<double> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
-        private readonly BindableWithCurrent<TValue> current = new BindableWithCurrent<TValue>();
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
@@ -52,7 +52,13 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
         /// <returns>Effect of the value.</returns>
-        protected abstract ModEffect CalculateEffect(TValue value);
+        /// <remarks>
+        /// Default implementation compares the value with <see cref="Current"/>.<see cref="Bindable{T}.Default"/>, bigger value counts as difficulty increase.
+        /// </remarks>
+        protected virtual ModEffect CalculateEffect(double value)
+        {
+            return CalculateForSign(value.CompareTo(Current.Default));
+        }
 
         protected virtual float ValueAreaWidth => 56;
 

From 667854b03445f7eb73292fa40fcc84ac2970fd4a Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:18:48 +0300
Subject: [PATCH 11/65] Make effect display have a built-in counter

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 37 +++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 4e630439ee..98651ef5f0 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -11,6 +12,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 
@@ -26,7 +28,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Box contentBackground;
         private readonly Box labelBackground;
-        private readonly Container content;
+        private readonly FillFlowContainer content;
 
         public Bindable<double> Current
         {
@@ -62,6 +64,8 @@ namespace osu.Game.Overlays.Mods
 
         protected virtual float ValueAreaWidth => 56;
 
+        protected virtual string CounterFormat => "N0";
+
         protected override Container<Drawable> Content => content;
 
         protected ModsEffectDisplay()
@@ -121,12 +125,20 @@ namespace osu.Game.Overlays.Mods
                                         }
                                     }
                                 },
-                                content = new Container
+                                content = new FillFlowContainer
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current }
+                                    }
                                 }
                             }
                         }
@@ -203,5 +215,24 @@ namespace osu.Game.Overlays.Mods
             DifficultyReduction,
             DifficultyIncrease
         }
+
+        private class EffectCounter : RollingCounter<double>
+        {
+            private readonly string? format;
+
+            public EffectCounter(string? format)
+            {
+                this.format = format;
+            }
+
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+            };
+        }
     }
 }

From 064fe832c78196b05cd0a807951747940e81d39b Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:18:59 +0300
Subject: [PATCH 12/65] Fix test

---
 .../TestSceneModsEffectDisplay.cs              | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index ec50a07998..42eceb3242 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
@@ -54,28 +53,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private class TestDisplay : ModsEffectDisplay<int>
+        private class TestDisplay : ModsEffectDisplay
         {
-            private readonly OsuSpriteText text;
-
             public Container<Drawable> Container => Content;
 
             protected override LocalisableString Label => "Test display";
-            protected override ModEffect CalculateEffect(int value) => CalculateForSign(value.CompareTo(50));
 
             public TestDisplay()
             {
-                Add(text = new OsuSpriteText
-                {
-                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold),
-                    Text = "50"
-                });
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                Current.BindValueChanged(e => text.Text = e.NewValue.ToString(), true);
+                Current.Default = 50;
             }
         }
     }

From 3f93ec8538d3082bd0255d46ec0995372c18ed90 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:20:28 +0300
Subject: [PATCH 13/65] Expose counter to inheritors

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 98651ef5f0..3b112fdbd3 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Overlays.Mods
 
         protected override Container<Drawable> Content => content;
 
+        protected readonly RollingCounter<double> Counter;
+
         protected ModsEffectDisplay()
         {
             Height = HEIGHT;
@@ -133,7 +135,7 @@ namespace osu.Game.Overlays.Mods
                                     Direction = FillDirection.Horizontal,
                                     Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
                                     Spacing = new Vector2(2, 0),
-                                    Child = new EffectCounter(CounterFormat)
+                                    Child = Counter = new EffectCounter(CounterFormat)
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,

From 324a3723a5dbba4b85f6d39617028acef7af005a Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:23:04 +0300
Subject: [PATCH 14/65] Rewrite DMD

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 48 ++++---------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 5530947d3d..f582a010c6 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,14 +3,9 @@
 
 #nullable disable
 
-using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osu.Game.Localisation;
 
@@ -20,34 +15,19 @@ namespace osu.Game.Overlays.Mods
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
-        private readonly MultiplierCounter multiplierCounter;
+        protected override string CounterFormat => @"N2";
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-            Add(new FillFlowContainer
+            Add(new SpriteIcon
             {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(2, 0),
-                Children = new Drawable[]
-                {
-                    multiplierCounter = new MultiplierCounter
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Current = { BindTarget = Current }
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.Times,
-                        Size = new Vector2(7),
-                        Margin = new MarginPadding { Top = 1 }
-                    }
-                }
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Icon = FontAwesome.Solid.Times,
+                Size = new Vector2(7),
+                Margin = new MarginPadding { Top = 1 }
             });
         }
 
@@ -57,19 +37,7 @@ namespace osu.Game.Overlays.Mods
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(Current.Value);
-        }
-
-        private class MultiplierCounter : RollingCounter<double>
-        {
-            protected override double RollingDuration => 500;
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(@"N2");
-
-            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
-            {
-                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-            };
+            Counter.SetCountWithoutRolling(Current.Value);
         }
     }
 }

From d6f90e3b9fd23496db6c57b8a3cb5339cf691cca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:32:22 +0900
Subject: [PATCH 15/65] Add basic fling-to-dismiss support

---
 .../Overlays/Notifications/Notification.cs    | 132 +++++++++++++++++-
 1 file changed, 128 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 67739c2089..3e7bd0ab2f 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -2,16 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -56,6 +59,8 @@ namespace osu.Game.Overlays.Notifications
 
         protected Container MainContent;
 
+        private readonly DragContainer dragContainer;
+
         public virtual bool Read { get; set; }
 
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
@@ -80,7 +85,11 @@ namespace osu.Game.Overlays.Notifications
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreRight,
                 },
-                MainContent = new Container
+                dragContainer = new DragContainer(this)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                }.WithChild(MainContent = new Container
                 {
                     CornerRadius = 6,
                     Masking = true,
@@ -144,7 +153,7 @@ namespace osu.Game.Overlays.Notifications
                             Blending = BlendingParameters.Additive,
                         },
                     }
-                }
+                })
             };
         }
 
@@ -213,11 +222,126 @@ namespace osu.Game.Overlays.Notifications
 
             WasClosed = true;
 
-            Closed?.Invoke();
-            this.FadeOut(100);
+            if (dragContainer.FlingLeft())
+            {
+                Light.FadeOut(100);
+                this.FadeOut(600, Easing.In);
+            }
+            else
+            {
+                Closed?.Invoke();
+                this.FadeOut(100);
+            }
+
             Expire();
         }
 
+        private class DragContainer : Container
+        {
+            private Vector2 velocity;
+            private Vector2 lastPosition;
+
+            private readonly Notification notification;
+
+            public DragContainer(Notification notification)
+            {
+                this.notification = notification;
+                notification.Closed += () => FlingLeft();
+            }
+
+            public override RectangleF BoundingBox
+            {
+                get
+                {
+                    var childBounding = Children.First().BoundingBox;
+
+                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 800)));
+                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 800)));
+
+                    return childBounding;
+                }
+            }
+
+            protected override bool OnDragStart(DragStartEvent e) => true;
+
+            protected override void OnDrag(DragEvent e)
+            {
+                Vector2 change = e.MousePosition - e.MouseDownPosition;
+
+                // Diminish the drag distance as we go further to simulate "rubber band" feeling.
+                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.9f) / change.Length;
+
+                // Only apply Y change if dragging to the left.
+                if (change.X > 0)
+                    change.Y = 0;
+
+                this.MoveTo(change);
+            }
+
+            protected override void OnDragEnd(DragEndEvent e)
+            {
+                if (Rotation < -10 || velocity.X < -0.3f)
+                {
+                    FlingLeft();
+                }
+                else
+                {
+                    this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
+                    this.RotateTo(0, 800, Easing.OutElastic);
+                }
+
+                base.OnDragEnd(e);
+            }
+
+            private bool flinging;
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                Rotation = Math.Min(0, X * 0.1f);
+
+                if (flinging)
+                {
+                    velocity.Y += (float)Clock.ElapsedFrameTime * 0.005f;
+                    Position += (float)Clock.ElapsedFrameTime * velocity;
+                }
+                else
+                {
+                    Vector2 change = (Position - lastPosition) / (float)Clock.ElapsedFrameTime;
+
+                    if (velocity.X == 0)
+                        velocity = change;
+                    else
+                    {
+                        velocity = new Vector2(
+                            (float)Interpolation.DampContinuously(velocity.X, change.X, 40, Clock.ElapsedFrameTime),
+                            (float)Interpolation.DampContinuously(velocity.Y, change.Y, 40, Clock.ElapsedFrameTime)
+                        );
+                    }
+
+                    lastPosition = Position;
+                }
+            }
+
+            public bool FlingLeft()
+            {
+                if (this.FindClosestParent<NotificationOverlayToastTray>() == null)
+                    return false;
+
+                if (flinging)
+                    return true;
+
+                if (velocity.X > -0.3f)
+                    velocity.X = -0.3f - 0.5f * RNG.NextSingle();
+
+                flinging = true;
+                ClearTransforms();
+                notification.Close();
+                return true;
+            }
+        }
+
         internal class CloseButton : OsuClickableContainer
         {
             private SpriteIcon icon = null!;

From b5a2f7003e0d0770c53c775a36a2a24a893be05a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:34:35 +0900
Subject: [PATCH 16/65] Disallow flinging when not in toast state

---
 osu.Game/Overlays/NotificationOverlay.cs        | 5 +++++
 osu.Game/Overlays/Notifications/Notification.cs | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b170ea5dfa..708bd4874d 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -158,7 +158,10 @@ namespace osu.Game.Overlays
             playDebouncedSample(notification.PopInSampleName);
 
             if (State.Value == Visibility.Hidden)
+            {
+                notification.IsInTray = true;
                 toastTray.Post(notification);
+            }
             else
                 addPermanently(notification);
 
@@ -167,6 +170,8 @@ namespace osu.Game.Overlays
 
         private void addPermanently(Notification notification)
         {
+            notification.IsInTray = false;
+
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 3e7bd0ab2f..595cff4171 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,6 +68,11 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        /// <summary>
+        /// Whether this notification is in the <see cref="NotificationOverlayToastTray"/>.
+        /// </summary>
+        public bool IsInTray { get; set; }
+
         private readonly Box initialFlash;
 
         private Box background = null!;
@@ -262,7 +267,7 @@ namespace osu.Game.Overlays.Notifications
                 }
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => true;
+            protected override bool OnDragStart(DragStartEvent e) => notification.IsInTray;
 
             protected override void OnDrag(DragEvent e)
             {
@@ -326,7 +331,7 @@ namespace osu.Game.Overlays.Notifications
 
             public bool FlingLeft()
             {
-                if (this.FindClosestParent<NotificationOverlayToastTray>() == null)
+                if (!notification.IsInTray)
                     return false;
 
                 if (flinging)

From a56cadcf9057278f2aa3735a79385e0c2c097239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:52:19 +0900
Subject: [PATCH 17/65] Ensure drag position is reset when transferred to tray

---
 osu.Game/Overlays/NotificationOverlay.cs      |  4 +--
 .../Overlays/Notifications/Notification.cs    | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 708bd4874d..15573f99af 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Overlays
 
             if (State.Value == Visibility.Hidden)
             {
-                notification.IsInTray = true;
+                notification.IsInToastTray = true;
                 toastTray.Post(notification);
             }
             else
@@ -170,7 +170,7 @@ namespace osu.Game.Overlays
 
         private void addPermanently(Notification notification)
         {
-            notification.IsInTray = false;
+            notification.IsInToastTray = false;
 
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 595cff4171..ded3c1606a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,10 +68,21 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        private bool isInToastTray;
+
         /// <summary>
         /// Whether this notification is in the <see cref="NotificationOverlayToastTray"/>.
         /// </summary>
-        public bool IsInTray { get; set; }
+        public bool IsInToastTray
+        {
+            private get => isInToastTray;
+            set
+            {
+                isInToastTray = value;
+                if (!isInToastTray)
+                    dragContainer.ResetPosition();
+            }
+        }
 
         private readonly Box initialFlash;
 
@@ -267,10 +278,13 @@ namespace osu.Game.Overlays.Notifications
                 }
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => notification.IsInTray;
+            protected override bool OnDragStart(DragStartEvent e) => notification.IsInToastTray;
 
             protected override void OnDrag(DragEvent e)
             {
+                if (!notification.IsInToastTray)
+                    return;
+
                 Vector2 change = e.MousePosition - e.MouseDownPosition;
 
                 // Diminish the drag distance as we go further to simulate "rubber band" feeling.
@@ -286,14 +300,9 @@ namespace osu.Game.Overlays.Notifications
             protected override void OnDragEnd(DragEndEvent e)
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
-                {
                     FlingLeft();
-                }
                 else
-                {
-                    this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
-                    this.RotateTo(0, 800, Easing.OutElastic);
-                }
+                    ResetPosition();
 
                 base.OnDragEnd(e);
             }
@@ -331,7 +340,7 @@ namespace osu.Game.Overlays.Notifications
 
             public bool FlingLeft()
             {
-                if (!notification.IsInTray)
+                if (!notification.IsInToastTray)
                     return false;
 
                 if (flinging)
@@ -345,6 +354,12 @@ namespace osu.Game.Overlays.Notifications
                 notification.Close();
                 return true;
             }
+
+            public void ResetPosition()
+            {
+                this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
+                this.RotateTo(0, 800, Easing.OutElastic);
+            }
         }
 
         internal class CloseButton : OsuClickableContainer

From 9ef23c79ced4e8ca705bec6ba20505a216791312 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 22:05:44 +0900
Subject: [PATCH 18/65] Disallow forwarding during a drag operation

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index 40324963fc..e4d3864beb 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Overlays
                     return;
 
                 // Notification hovered; delay dismissal.
-                if (notification.IsHovered)
+                if (notification.IsHovered || notification.IsDragged)
                 {
                     scheduleDismissal();
                     return;

From 92beb6cbe740336ab84e920818bb4fe5b372563f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:16:45 +0900
Subject: [PATCH 19/65] Hide notification read light when in a toast state

Also adds test coverage of read state and light.
---
 .../TestSceneNotificationOverlay.cs           | 20 +++++++++++++++++++
 .../Overlays/Notifications/Notification.cs    | 11 ++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 5f82a0024b..6b737b7f5f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -219,6 +219,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("cancel notification", () => notification.State = ProgressNotificationState.Cancelled);
         }
 
+        [Test]
+        public void TestReadState()
+        {
+            SimpleNotification notification = null!;
+            AddStep(@"post", () => notificationOverlay.Post(notification = new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" }));
+            AddUntilStep("check is toast", () => !notification.IsInToastTray);
+            AddAssert("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
+
+            AddUntilStep("wait for forward to overlay", () => !notification.IsInToastTray);
+
+            setState(Visibility.Visible);
+            AddAssert("state is not read", () => !notification.Read);
+            AddUntilStep("light is visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 1);
+
+            setState(Visibility.Hidden);
+            setState(Visibility.Visible);
+            AddAssert("state is read", () => notification.Read);
+            AddUntilStep("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
+        }
+
         [Test]
         public void TestBasicFlow()
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index ded3c1606a..91f5f3b19b 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -75,12 +75,17 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public bool IsInToastTray
         {
-            private get => isInToastTray;
+            get => isInToastTray;
             set
             {
                 isInToastTray = value;
+
                 if (!isInToastTray)
+                {
                     dragContainer.ResetPosition();
+                    if (!Read)
+                        Light.FadeIn(100);
+                }
             }
         }
 
@@ -97,6 +102,7 @@ namespace osu.Game.Overlays.Notifications
             {
                 Light = new NotificationLight
                 {
+                    Alpha = 0,
                     Margin = new MarginPadding { Right = 5 },
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreRight,
@@ -239,10 +245,7 @@ namespace osu.Game.Overlays.Notifications
             WasClosed = true;
 
             if (dragContainer.FlingLeft())
-            {
-                Light.FadeOut(100);
                 this.FadeOut(600, Easing.In);
-            }
             else
             {
                 Closed?.Invoke();

From e06a0f7300fc9cb71b7a9914a1f8143481a57790 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:21:01 +0900
Subject: [PATCH 20/65] Fix dragged state not being exposed correctly

---
 osu.Game/Overlays/Notifications/Notification.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 91f5f3b19b..248d66ac16 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Overlays.Notifications
 
         public virtual bool Read { get; set; }
 
+        public new bool IsDragged => dragContainer.IsDragged;
+
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
 
         [Resolved]

From 2476cf8fb36e4e964b397d86ae082a0ab1de6149 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:37:48 +0900
Subject: [PATCH 21/65] Adjust movement to look less sudden when snapping back
 to Y=0

---
 osu.Game/Overlays/Notifications/Notification.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 248d66ac16..2e4b0c430a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -293,11 +293,13 @@ namespace osu.Game.Overlays.Notifications
                 Vector2 change = e.MousePosition - e.MouseDownPosition;
 
                 // Diminish the drag distance as we go further to simulate "rubber band" feeling.
-                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.9f) / change.Length;
+                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.8f) / change.Length;
 
                 // Only apply Y change if dragging to the left.
-                if (change.X > 0)
+                if (change.X >= 0)
                     change.Y = 0;
+                else
+                    change.Y *= (float)Interpolation.ApplyEasing(Easing.InOutQuart, Math.Min(1, -change.X / 200));
 
                 this.MoveTo(change);
             }

From bd3673baa9fe9fa5c5b77659e270c1e784938191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:25:32 +0900
Subject: [PATCH 22/65] Fix being able to drag after already closing a
 notification

---
 osu.Game/Overlays/Notifications/Notification.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2e4b0c430a..facf43128d 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -70,6 +70,8 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        public override bool PropagatePositionalInputSubTree => base.PropagatePositionalInputSubTree && !WasClosed;
+
         private bool isInToastTray;
 
         /// <summary>
@@ -327,7 +329,7 @@ namespace osu.Game.Overlays.Notifications
                     velocity.Y += (float)Clock.ElapsedFrameTime * 0.005f;
                     Position += (float)Clock.ElapsedFrameTime * velocity;
                 }
-                else
+                else if (Clock.ElapsedFrameTime > 0)
                 {
                     Vector2 change = (Position - lastPosition) / (float)Clock.ElapsedFrameTime;
 

From a50617857176acbefb571e777429d9411cfdbff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:39:46 +0900
Subject: [PATCH 23/65] Make bounding box shrink faster to allow for rapid
 flinging

---
 osu.Game/Overlays/Notifications/Notification.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index facf43128d..f83be0c446 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -278,8 +278,8 @@ namespace osu.Game.Overlays.Notifications
                 {
                     var childBounding = Children.First().BoundingBox;
 
-                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 800)));
-                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 800)));
+                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 300)));
+                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 200)));
 
                     return childBounding;
                 }

From 5a02e1e7133e2be8f6eba967049b058a720957f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:46:45 +0900
Subject: [PATCH 24/65] Use padding instead of `FillFlow.Spacing` to avoid
 artifact during animation

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs      | 1 -
 osu.Game/Overlays/Notifications/Notification.cs        | 3 +++
 osu.Game/Overlays/Notifications/NotificationSection.cs | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index e4d3864beb..1da05dab75 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -78,7 +78,6 @@ namespace osu.Game.Overlays
                 {
                     LayoutDuration = 150,
                     LayoutEasing = Easing.OutQuart,
-                    Spacing = new Vector2(3),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index f83be0c446..fe2f67973a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -113,6 +113,9 @@ namespace osu.Game.Overlays.Notifications
                 },
                 dragContainer = new DragContainer(this)
                 {
+                    // Use margin instead of FillFlow spacing to fix extra padding appearing when notification shrinks
+                    // in height.
+                    Padding = new MarginPadding { Vertical = 3f },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 }.WithChild(MainContent = new Container
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index d2e18a0cee..14bacca534 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Overlays.Notifications
                     RelativeSizeAxes = Axes.X,
                     LayoutDuration = 150,
                     LayoutEasing = Easing.OutQuart,
-                    Spacing = new Vector2(3),
                 }
             });
         }

From d561fcb126689dade097acce3f4f425504680fff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:54:25 +0900
Subject: [PATCH 25/65] Don't trigger fling animation when `Close` is triggered
 by non-user action

---
 .../Online/TestSceneBeatmapDownloading.cs           |  2 +-
 osu.Game/Database/ModelDownloader.cs                |  2 +-
 osu.Game/Overlays/Notifications/Notification.cs     | 13 ++++++-------
 .../Overlays/Notifications/NotificationSection.cs   |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs  |  6 +++---
 osu.Game/Updater/UpdateManager.cs                   |  6 +++---
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs b/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
index e7a6e9a543..641c1ad523 100644
--- a/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
+++ b/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Online
         {
             AddStep("download beatmap", () => beatmaps.Download(test_db_model));
 
-            AddStep("cancel download from notification", () => recentNotification.Close());
+            AddStep("cancel download from notification", () => recentNotification.Close(true));
 
             AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_db_model) == null);
             AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);
diff --git a/osu.Game/Database/ModelDownloader.cs b/osu.Game/Database/ModelDownloader.cs
index a3678602d1..877c90a534 100644
--- a/osu.Game/Database/ModelDownloader.cs
+++ b/osu.Game/Database/ModelDownloader.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Database
                 {
                     if (error is WebException webException && webException.Message == @"TooManyRequests")
                     {
-                        notification.Close();
+                        notification.Close(false);
                         PostNotification?.Invoke(new TooManyDownloadsNotification());
                     }
                     else
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index fe2f67973a..acb277d4b4 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Notifications
                                     },
                                     new CloseButton(CloseButtonIcon)
                                     {
-                                        Action = Close,
+                                        Action = () => Close(true),
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
                                     }
@@ -214,7 +214,7 @@ namespace osu.Game.Overlays.Notifications
             // right click doesn't trigger OnClick so we need to handle here until that changes.
             if (e.Button != MouseButton.Left)
             {
-                Close();
+                Close(true);
                 return true;
             }
 
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
             if (e.Button == MouseButton.Left)
                 Activated?.Invoke();
 
-            Close();
+            Close(true);
             return true;
         }
 
@@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close()
+        public virtual void Close(bool userTriggered)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
-            if (dragContainer.FlingLeft())
+            if (userTriggered && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
             {
@@ -272,7 +272,6 @@ namespace osu.Game.Overlays.Notifications
             public DragContainer(Notification notification)
             {
                 this.notification = notification;
-                notification.Closed += () => FlingLeft();
             }
 
             public override RectangleF BoundingBox
@@ -363,7 +362,7 @@ namespace osu.Game.Overlays.Notifications
 
                 flinging = true;
                 ClearTransforms();
-                notification.Close();
+                notification.Close(true);
                 return true;
             }
 
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 14bacca534..16105f913f 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            notifications.Children.ForEach(c => c.Close());
+            notifications.Children.ForEach(c => c.Close(true));
         }
 
         protected override void Update()
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index bdf6f704e5..55d6d5057a 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Notifications
                 case ProgressNotificationState.Completed:
                     loadingSpinner.Hide();
                     attemptPostCompletion();
-                    base.Close();
+                    base.Close(false);
                     break;
             }
         }
@@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        public override void Close()
+        public override void Close(bool userTriggered)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close();
+                    base.Close(userTriggered);
                     break;
 
                 case ProgressNotificationState.Active:
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 49009e9124..2ef6741ffd 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Updater
                 StartDownload();
             }
 
-            public override void Close()
+            public override void Close(bool userTriggered)
             {
                 // cancelling updates is not currently supported by the underlying updater.
                 // only allow dismissing for now.
@@ -156,7 +156,7 @@ namespace osu.Game.Updater
                 switch (State)
                 {
                     case ProgressNotificationState.Cancelled:
-                        base.Close();
+                        base.Close(userTriggered);
                         break;
                 }
             }
@@ -177,7 +177,7 @@ namespace osu.Game.Updater
             public void FailDownload()
             {
                 State = ProgressNotificationState.Cancelled;
-                Close();
+                Close(false);
             }
         }
     }

From 4ee3e8f087e14631622ffca7f446485f50d4982c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 18:57:18 +0900
Subject: [PATCH 26/65] Don't play fling animation when activating a
 notification

---
 osu.Game/Overlays/Notifications/Notification.cs         | 6 +++---
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 4 ++--
 osu.Game/Updater/UpdateManager.cs                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index acb277d4b4..887d729de7 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
             if (e.Button == MouseButton.Left)
                 Activated?.Invoke();
 
-            Close(true);
+            Close(false);
             return true;
         }
 
@@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close(bool userTriggered)
+        public virtual void Close(bool runFlingAnimation)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
-            if (userTriggered && dragContainer.FlingLeft())
+            if (runFlingAnimation && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
             {
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 55d6d5057a..c4d402e5b9 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        public override void Close(bool userTriggered)
+        public override void Close(bool runFlingAnimation)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close(userTriggered);
+                    base.Close(runFlingAnimation);
                     break;
 
                 case ProgressNotificationState.Active:
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 2ef6741ffd..100464029b 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Updater
                 StartDownload();
             }
 
-            public override void Close(bool userTriggered)
+            public override void Close(bool runFlingAnimation)
             {
                 // cancelling updates is not currently supported by the underlying updater.
                 // only allow dismissing for now.
@@ -156,7 +156,7 @@ namespace osu.Game.Updater
                 switch (State)
                 {
                     case ProgressNotificationState.Cancelled:
-                        base.Close(userTriggered);
+                        base.Close(runFlingAnimation);
                         break;
                 }
             }

From d92e000fe6db82e258ec9a68e6d0fe9885c99d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:00:03 +0900
Subject: [PATCH 27/65] Fix flinging a notification not correctly running
 `Close`

---
 osu.Game/Overlays/Notifications/Notification.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 887d729de7..6c1b43c3b5 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -254,11 +254,9 @@ namespace osu.Game.Overlays.Notifications
             if (runFlingAnimation && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
-            {
-                Closed?.Invoke();
                 this.FadeOut(100);
-            }
 
+            Closed?.Invoke();
             Expire();
         }
 
@@ -311,7 +309,7 @@ namespace osu.Game.Overlays.Notifications
             protected override void OnDragEnd(DragEndEvent e)
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
-                    FlingLeft();
+                    notification.Close(true);
                 else
                     ResetPosition();
 
@@ -362,7 +360,6 @@ namespace osu.Game.Overlays.Notifications
 
                 flinging = true;
                 ClearTransforms();
-                notification.Close(true);
                 return true;
             }
 

From f56f6545c04cd3f4f56a7398a49998ab8fe13da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:06:09 +0900
Subject: [PATCH 28/65] Add test coverage of flinging

---
 .../TestSceneNotificationOverlay.cs           | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 8504da69a7..3d13e98865 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -48,6 +48,40 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestDismissWithoutActivationFling()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("start drag", () =>
+            {
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
+            });
+
+            AddStep("fling away", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for closed", () => notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
+        }
+
         [Test]
         public void TestDismissWithoutActivationCloseButton()
         {
@@ -75,6 +109,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for closed", () => notification.WasClosed);
             AddAssert("was not activated", () => !activated);
             AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
         }
 
         [Test]

From 88107108eea0c440babac6e69c1367274c509e18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 20:18:40 +0900
Subject: [PATCH 29/65] Add ability to flick notifications to the right to
 store for later

---
 .../TestSceneNotificationOverlay.cs           | 37 +++++++++++++++++++
 .../Overlays/NotificationOverlayToastTray.cs  |  5 +++
 .../Overlays/Notifications/Notification.cs    |  4 ++
 3 files changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 3d13e98865..e978b57ba4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -48,6 +48,43 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestForwardWithFlingRight()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("start drag", () =>
+            {
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(500, 0));
+            });
+
+            AddStep("fling away", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("was not closed", () => !notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddAssert("is not read", () => !notification.Read);
+            AddAssert("is not toast", () => !notification.IsInToastTray);
+
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count one", () => notificationOverlay.UnreadCount.Value == 1);
+        }
+
         [Test]
         public void TestDismissWithoutActivationFling()
         {
diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index 1da05dab75..e3f8734581 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -100,6 +100,8 @@ namespace osu.Game.Overlays
         {
             ++runningDepth;
 
+            notification.ForwardToOverlay = () => forwardNotification(notification);
+
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
             toastFlow.Insert(depth, notification);
@@ -130,6 +132,9 @@ namespace osu.Game.Overlays
 
         private void forwardNotification(Notification notification)
         {
+            if (!notification.IsInToastTray)
+                return;
+
             Debug.Assert(notification.Parent == toastFlow);
 
             // Temporarily remove from flow so we can animate the position off to the right.
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 6c1b43c3b5..885bb2fc6c 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public Func<bool>? Activated;
 
+        public Action? ForwardToOverlay { get; set; }
+
         /// <summary>
         /// Should we show at the top of our section on display?
         /// </summary>
@@ -310,6 +312,8 @@ namespace osu.Game.Overlays.Notifications
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
                     notification.Close(true);
+                else if (X > 30 || velocity.X > 0.3f)
+                    notification.ForwardToOverlay?.Invoke();
                 else
                     ResetPosition();
 

From 8cbc0502aea885ce2468ccfda0b457297382ead9 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 12 Sep 2022 15:51:18 +0300
Subject: [PATCH 30/65] Inline `CalculateEffect`

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 27 ++++-----------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 3b112fdbd3..eed3181e49 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -49,22 +49,9 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
-        /// <summary>
-        /// Calculates, does current value increase difficulty or decrease it.
-        /// </summary>
-        /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
-        /// <returns>Effect of the value.</returns>
-        /// <remarks>
-        /// Default implementation compares the value with <see cref="Current"/>.<see cref="Bindable{T}.Default"/>, bigger value counts as difficulty increase.
-        /// </remarks>
-        protected virtual ModEffect CalculateEffect(double value)
-        {
-            return CalculateForSign(value.CompareTo(Current.Default));
-        }
-
         protected virtual float ValueAreaWidth => 56;
 
-        protected virtual string CounterFormat => "N0";
+        protected virtual string CounterFormat => @"N0";
 
         protected override Container<Drawable> Content => content;
 
@@ -159,7 +146,7 @@ namespace osu.Game.Overlays.Mods
         {
             Current.BindValueChanged(e =>
             {
-                var effect = CalculateEffect(e.NewValue);
+                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
                 setColours(effect);
             }, true);
         }
@@ -192,14 +179,12 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        #region Quick implementations for CalculateEffect
-
         /// <summary>
         /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
         /// </summary>
-        /// <param name="comparison">Value to convert. Can be obtained from CompareTo.</param>
-        /// <returns>Effect.</returns>
-        protected ModEffect CalculateForSign(int comparison)
+        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
+        /// <returns>Effect of the value.</returns>
+        protected virtual ModEffect CalculateEffectForComparison(int comparison)
         {
             if (comparison == 0)
                 return ModEffect.NotChanged;
@@ -209,8 +194,6 @@ namespace osu.Game.Overlays.Mods
             return ModEffect.DifficultyIncrease;
         }
 
-        #endregion
-
         protected enum ModEffect
         {
             NotChanged,

From a5b962d9a3bc55beac3b4f89aa1544879adf6c20 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 01:37:23 +0300
Subject: [PATCH 31/65] Add failing test case

---
 .../Online/TestSceneBeatmapListingOverlay.cs  | 55 ++++++++++++++++---
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 8ef120d252..2c9b34e4a7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Tests.Visual.Online
 
         private OsuConfigManager localConfig;
 
+        private bool returnCursorOnResponse;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,6 +63,7 @@ namespace osu.Game.Tests.Visual.Online
                     searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                     {
                         BeatmapSets = setsForResponse,
+                        Cursor = returnCursorOnResponse ? new Cursor() : null,
                     });
 
                     return true;
@@ -106,7 +109,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
 
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -127,10 +130,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
-            AddStep("show more results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 30).ToArray()));
+            AddStep("show more results", () => fetchFor(getManyBeatmaps(30).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(30);
         }
 
@@ -139,7 +142,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
             setCardSize(BeatmapCardSize.Extra, viaConfig);
@@ -161,7 +164,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("fetch for 0 beatmaps", () => fetchFor());
             placeholderShown();
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 100);
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -180,6 +183,32 @@ namespace osu.Game.Tests.Visual.Online
                 });
         }
 
+        /// <summary>
+        /// During pagination, the first beatmap of the second page may be a duplicate of the last beatmap from the previous page.
+        /// This is currently the case with osu!web API due to ES relevance score's presence in the response cursor.
+        /// See: https://github.com/ppy/osu-web/issues/9270
+        /// </summary>
+        [Test]
+        public void TestDuplicatedBeatmapOnlyShowsOnce()
+        {
+            APIBeatmapSet beatmapSet = null;
+
+            AddStep("show many results", () =>
+            {
+                beatmapSet = CreateAPIBeatmapSet(Ruleset.Value);
+                beatmapSet.Title = "last beatmap of first page";
+
+                fetchFor(getManyBeatmaps(49).Append(beatmapSet).ToArray(), true);
+            });
+            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 50);
+
+            AddStep("set next page", () => setSearchResponse(getManyBeatmaps(49).Prepend(beatmapSet).ToArray(), false));
+            AddStep("scroll to end", () => overlay.ChildrenOfType<OverlayScrollContainer>().Single().ScrollToEnd());
+            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 99);
+
+            AddAssert("beatmap not duplicated", () => overlay.ChildrenOfType<BeatmapCard>().Count(c => c.BeatmapSet.Equals(beatmapSet)) == 1);
+        }
+
         [Test]
         public void TestUserWithoutSupporterUsesSupporterOnlyFiltersWithoutResults()
         {
@@ -336,15 +365,25 @@ namespace osu.Game.Tests.Visual.Online
 
         private static int searchCount;
 
-        private void fetchFor(params APIBeatmapSet[] beatmaps)
+        private APIBeatmapSet[] getManyBeatmaps(int count) => Enumerable.Range(0, count).Select(_ => CreateAPIBeatmapSet(Ruleset.Value)).ToArray();
+
+        private void fetchFor(params APIBeatmapSet[] beatmaps) => fetchFor(beatmaps, false);
+
+        private void fetchFor(APIBeatmapSet[] beatmaps, bool hasNextPage)
         {
-            setsForResponse.Clear();
-            setsForResponse.AddRange(beatmaps);
+            setSearchResponse(beatmaps, hasNextPage);
 
             // trigger arbitrary change for fetching.
             searchControl.Query.Value = $"search {searchCount++}";
         }
 
+        private void setSearchResponse(APIBeatmapSet[] beatmaps, bool hasNextPage)
+        {
+            setsForResponse.Clear();
+            setsForResponse.AddRange(beatmaps);
+            returnCursorOnResponse = hasNextPage;
+        }
+
         private void setRankAchievedFilter(ScoreRank[] ranks)
         {
             AddStep($"set Rank Achieved filter to [{string.Join(',', ranks)}]", () =>

From 07f577a0c67314035588ba33856e135643632a02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 01:38:52 +0300
Subject: [PATCH 32/65] Fix beatmap listing potentially showing duplicate
 beatmap cards

---
 osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs | 13 ++++++++++++-
 osu.Game/Overlays/BeatmapListingOverlay.cs       |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index b9e0a4e6cb..70312a1535 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public abstract class BeatmapCard : OsuClickableContainer
+    public abstract class BeatmapCard : OsuClickableContainer, IEquatable<BeatmapCard>
     {
         public const float TRANSITION_DURATION = 400;
         public const float CORNER_RADIUS = 10;
@@ -96,5 +96,16 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     throw new ArgumentOutOfRangeException(nameof(size), size, @"Unsupported card size");
             }
         }
+
+        public bool Equals(BeatmapCard? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return BeatmapSet.Equals(other.BeatmapSet);
+        }
+
+        public override bool Equals(object obj) => obj is BeatmapCard other && Equals(other);
+        public override int GetHashCode() => BeatmapSet.GetHashCode();
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 3136492af0..70c6c60ecd 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,8 @@ namespace osu.Game.Overlays
             }
             else
             {
+                newCards = newCards.Except(foundContent);
+
                 panelLoadTask = LoadComponentsAsync(newCards, loaded =>
                 {
                     lastFetchDisplayedTime = Time.Current;
@@ -185,7 +187,7 @@ namespace osu.Game.Overlays
             }
         }
 
-        private BeatmapCard[] createCardsFor(IEnumerable<APIBeatmapSet> beatmapSets) => beatmapSets.Select(set => BeatmapCard.Create(set, filterControl.CardSize.Value).With(c =>
+        private IEnumerable<BeatmapCard> createCardsFor(IEnumerable<APIBeatmapSet> beatmapSets) => beatmapSets.Select(set => BeatmapCard.Create(set, filterControl.CardSize.Value).With(c =>
         {
             c.Anchor = Anchor.TopCentre;
             c.Origin = Anchor.TopCentre;

From 04dbb6fc1b61e8e3be64484b079d7c20d0b26127 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Sep 2022 00:49:02 +0300
Subject: [PATCH 33/65] Add inline comment

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 70c6c60ecd..2be328427b 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,9 @@ namespace osu.Game.Overlays
             }
             else
             {
+                // new results may contain beatmaps from a previous page,
+                // this is dodgy but matches web behaviour for now.
+                // see: https://github.com/ppy/osu-web/issues/9270
                 newCards = newCards.Except(foundContent);
 
                 panelLoadTask = LoadComponentsAsync(newCards, loaded =>

From b4e6a20846d10ddd8a2590d0fd5b8701ef9e5294 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 12:59:04 +0900
Subject: [PATCH 34/65] Fix song select status prefix matching no longer
 working

Regressed in #19275 due to weird logic.
Closes #20289.
---
 .../NonVisual/Filtering/FilterQueryParserTest.cs       | 10 ++++++++++
 osu.Game/Screens/Select/FilterQueryParser.cs           |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ac16c59e5b..da32edb8fb 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -191,6 +191,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsTrue(filterCriteria.BeatDivisor.IsUpperInclusive);
         }
 
+        [Test]
+        public void TestPartialStatusMatch()
+        {
+            const string query = "status=r";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Min);
+            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Max);
+        }
+
         [Test]
         public void TestApplyStatusQueries()
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index a7c1aec361..c86554ddbc 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -122,14 +122,17 @@ namespace osu.Game.Screens.Select
 
         private static bool tryParseEnum<TEnum>(string value, out TEnum result) where TEnum : struct
         {
-            if (Enum.TryParse(value, true, out result)) return true;
+            // First try an exact match.
+            if (Enum.TryParse(value, true, out result))
+                return true;
 
+            // Then try a prefix match.
             string? prefixMatch = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
 
             if (prefixMatch == null)
                 return false;
 
-            return Enum.TryParse(value, true, out result);
+            return Enum.TryParse(prefixMatch, true, out result);
         }
 
         private static GroupCollection? tryMatchRegex(string value, string regex)

From 85e3a681b12e79b8cb12b6b8551bb3eea7e28566 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Sep 2022 21:07:30 -0700
Subject: [PATCH 35/65] Fix notification overlay toast tray background
 absorbing input from behind

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index e3f8734581..329379de4a 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays
     {
         public override bool IsPresent => toastContentBackground.Height > 0 || toastFlow.Count > 0;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => toastFlow.ReceivePositionalInputAt(screenSpacePos);
+
         public bool IsDisplayingToasts => toastFlow.Count > 0;
 
         private FillFlowContainer<Notification> toastFlow = null!;

From bc07513c3c19f4440676aff013b111eec321ad50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 14:19:53 +0900
Subject: [PATCH 36/65] Fix local scores potentially not being stable-sorted
 for leaderboard display

---
 osu.Game/Scoring/ScoreManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 6bb31eb4db..8342d3bcc1 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -58,7 +58,10 @@ namespace osu.Game.Scoring
         /// <param name="scores">The array of <see cref="ScoreInfo"/>s to reorder.</param>
         /// <returns>The given <paramref name="scores"/> ordered by decreasing total score.</returns>
         public IEnumerable<ScoreInfo> OrderByTotalScore(IEnumerable<ScoreInfo> scores)
-            => scores.OrderByDescending(s => GetTotalScore(s)).ThenBy(s => s.OnlineID);
+            => scores.OrderByDescending(s => GetTotalScore(s))
+                     .ThenBy(s => s.OnlineID)
+                     // Local scores may not have an online ID. Fall back to date in these cases.
+                     .ThenBy(s => s.Date);
 
         /// <summary>
         /// Retrieves a bindable that represents the total score of a <see cref="ScoreInfo"/>.

From 30cf14e824bc0eeb9f01f0eeb63eb91462c7954e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 14 Sep 2022 14:40:45 +0900
Subject: [PATCH 37/65] Update ReSharper CLI to 2022.2.3

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 57694d7f57..1f937e1837 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.1.1",
+      "version": "2022.2.3",
       "commands": [
         "jb"
       ]

From a9eba2712991229a99e1f1b80c85d92e720a8264 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 15 Jun 2021 19:41:37 +0900
Subject: [PATCH 38/65] Factor out pooling logic from `Playfield`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 69 +++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs             | 49 +++++++------
 2 files changed, 98 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
new file mode 100644
index 0000000000..129c4cab44
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -0,0 +1,69 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace osu.Game.Rulesets.Objects.Pooling
+{
+    /// <summary>
+    /// Manages a mapping between <see cref="HitObject"/> and <see cref="HitObjectLifetimeEntry"/>
+    /// </summary>
+    internal class HitObjectEntryManager
+    {
+        /// <summary>
+        /// All entries, including entries of the nested hit objects.
+        /// </summary>
+        public IEnumerable<HitObjectLifetimeEntry> AllEntries => entryMap.Values;
+
+        public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryAdded;
+        public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
+
+        private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+        private readonly Dictionary<HitObject, HitObject> parentMap = new Dictionary<HitObject, HitObject>();
+
+        public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
+        {
+            this.createLifetimeEntry = createLifetimeEntry;
+        }
+
+        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parentHitObject)
+        {
+            if (parentHitObject != null && !entryMap.TryGetValue(parentHitObject, out var parentEntry))
+                throw new InvalidOperationException($@"The parent {nameof(HitObject)} must be added to this {nameof(HitObjectEntryManager)} before nested {nameof(HitObject)} is added.");
+
+            if (entryMap.ContainsKey(hitObject))
+                throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
+
+            if (parentHitObject != null)
+                parentMap[hitObject] = parentHitObject;
+
+            var entry = createLifetimeEntry(hitObject);
+            entryMap[hitObject] = entry;
+
+            OnEntryAdded?.Invoke(entry, parentHitObject);
+            return entry;
+        }
+
+        public bool Remove(HitObject hitObject)
+        {
+            if (!entryMap.TryGetValue(hitObject, out var entry))
+                return false;
+
+            parentMap.Remove(hitObject, out var parentHitObject);
+
+            OnEntryRemoved?.Invoke(entry, parentHitObject);
+            return true;
+        }
+
+        public bool TryGet(HitObject hitObject, [MaybeNullWhen(false)] out HitObjectLifetimeEntry entry)
+        {
+            return entryMap.TryGetValue(hitObject, out entry);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 60d1555052..5aaa7682db 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
+using osu.Game.Rulesets.Objects.Pooling;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -94,6 +95,8 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
+        private readonly HitObjectEntryManager entryManager;
+
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>
@@ -108,6 +111,10 @@ namespace osu.Game.Rulesets.UI
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
+
+            entryManager = new HitObjectEntryManager(CreateLifetimeEntry);
+            entryManager.OnEntryAdded += onEntryAdded;
+            entryManager.OnEntryRemoved += onEntryRemoved;
         }
 
         [BackgroundDependencyLoader]
@@ -171,6 +178,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The added <see cref="HitObject"/>.</param>
         protected virtual void OnHitObjectAdded(HitObject hitObject)
         {
+            preloadSamples(hitObject);
         }
 
         /// <summary>
@@ -263,13 +271,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject"></param>
         public virtual void Add(HitObject hitObject)
         {
-            var entry = CreateLifetimeEntry(hitObject);
-            lifetimeEntryMap[entry.HitObject] = entry;
-
-            preloadSamples(hitObject);
-
-            HitObjectContainer.Add(entry);
-            OnHitObjectAdded(entry.HitObject);
+            entryManager.Add(hitObject, null);
         }
 
         private void preloadSamples(HitObject hitObject)
@@ -292,14 +294,23 @@ namespace osu.Game.Rulesets.UI
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
         public virtual bool Remove(HitObject hitObject)
         {
-            if (lifetimeEntryMap.Remove(hitObject, out var entry))
-            {
-                HitObjectContainer.Remove(entry);
-                OnHitObjectRemoved(hitObject);
-                return true;
-            }
+            return entryManager.Remove(hitObject) || nestedPlayfields.Any(p => p.Remove(hitObject));
+        }
 
-            return nestedPlayfields.Any(p => p.Remove(hitObject));
+        private void onEntryAdded(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
+        {
+            if (parentHitObject != null) return;
+
+            HitObjectContainer.Add(entry);
+            OnHitObjectAdded(entry.HitObject);
+        }
+
+        private void onEntryRemoved(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
+        {
+            if (parentHitObject != null) return;
+
+            HitObjectContainer.Remove(entry);
+            OnHitObjectRemoved(entry.HitObject);
         }
 
         /// <summary>
@@ -366,8 +377,8 @@ namespace osu.Game.Rulesets.UI
                     }
                 }
 
-                if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))
-                    lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
+                if (!entryManager.TryGet(hitObject, out var entry))
+                    entry = entryManager.Add(hitObject, parent?.HitObject);
 
                 dho.ParentHitObject = parent;
                 dho.Apply(entry);
@@ -442,8 +453,6 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         internal event Action<HitObject> HitObjectUsageFinished;
 
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
         /// <summary>
         /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
         /// </summary>
@@ -451,7 +460,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
         internal void SetKeepAlive(HitObject hitObject, bool keepAlive)
         {
-            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+            if (entryManager.TryGet(hitObject, out var entry))
             {
                 entry.KeepAlive = keepAlive;
                 return;
@@ -466,7 +475,7 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         internal void KeepAllAlive()
         {
-            foreach (var (_, entry) in lifetimeEntryMap)
+            foreach (var entry in entryManager.AllEntries)
                 entry.KeepAlive = true;
 
             foreach (var p in nestedPlayfields)

From bde390828b017f3d62698f263ec14a962d05ad19 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 15 Jun 2021 20:48:00 +0900
Subject: [PATCH 39/65] Manage entries of nested hit objects in
 `HitObjectEntryManager`

- Fix nested hit objects are leaked when parent hit object is edited or deleted
---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 129c4cab44..f14f8b6f61 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -25,39 +25,54 @@ namespace osu.Game.Rulesets.Objects.Pooling
         private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
 
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-        private readonly Dictionary<HitObject, HitObject> parentMap = new Dictionary<HitObject, HitObject>();
+        private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+        private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
         public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
         {
             this.createLifetimeEntry = createLifetimeEntry;
         }
 
-        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parentHitObject)
+        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parent)
         {
-            if (parentHitObject != null && !entryMap.TryGetValue(parentHitObject, out var parentEntry))
-                throw new InvalidOperationException($@"The parent {nameof(HitObject)} must be added to this {nameof(HitObjectEntryManager)} before nested {nameof(HitObject)} is added.");
-
             if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-            if (parentHitObject != null)
-                parentMap[hitObject] = parentHitObject;
-
             var entry = createLifetimeEntry(hitObject);
             entryMap[hitObject] = entry;
+            parentMap[entry] = parent;
 
-            OnEntryAdded?.Invoke(entry, parentHitObject);
+            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+                parentChildEntries.Add(entry);
+
+            hitObject.DefaultsApplied += onDefaultsApplied;
+
+            childrenMap[entry.HitObject] = new List<HitObjectLifetimeEntry>();
+
+            OnEntryAdded?.Invoke(entry, parent);
             return entry;
         }
 
         public bool Remove(HitObject hitObject)
         {
-            if (!entryMap.TryGetValue(hitObject, out var entry))
+            if (!entryMap.Remove(hitObject, out var entry))
                 return false;
 
-            parentMap.Remove(hitObject, out var parentHitObject);
+            parentMap.Remove(entry, out var parent);
 
-            OnEntryRemoved?.Invoke(entry, parentHitObject);
+            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+                parentChildEntries.Remove(entry);
+
+            hitObject.DefaultsApplied -= onDefaultsApplied;
+
+            // Remove all entries of the nested hit objects
+            if (childrenMap.Remove(entry.HitObject, out var childEntries))
+            {
+                foreach (var childEntry in childEntries)
+                    Remove(childEntry.HitObject);
+            }
+
+            OnEntryRemoved?.Invoke(entry, parent);
             return true;
         }
 
@@ -65,5 +80,20 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             return entryMap.TryGetValue(hitObject, out entry);
         }
+
+        /// <summary>
+        /// As nested hit objects are recreated, remove entries of the old nested hit objects.
+        /// </summary>
+        private void onDefaultsApplied(HitObject hitObject)
+        {
+            if (!childrenMap.Remove(hitObject, out var childEntries))
+                return;
+
+            foreach (var entry in childEntries)
+                Remove(entry.HitObject);
+
+            childEntries.Clear();
+            childrenMap[hitObject] = childEntries;
+        }
     }
 }

From 47539e2129d85e50866e659e850d8bc769927057 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 16 Jun 2021 15:09:01 +0900
Subject: [PATCH 40/65] Add doc comments to `HitObjectEntryManager`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index f14f8b6f61..71c0a88616 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -19,13 +19,38 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public IEnumerable<HitObjectLifetimeEntry> AllEntries => entryMap.Values;
 
+        /// <summary>
+        /// Invoked when a new <see cref="HitObjectLifetimeEntry"/> is added to this <see cref="HitObjectEntryManager"/>..
+        /// The second parameter of the event is the parent hit object.
+        /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryAdded;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObjectLifetimeEntry"/> is removed from this <see cref="HitObjectEntryManager"/>.
+        /// The second parameter of the event is the parent hit object.
+        /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
 
         private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
 
+        /// <summary>
+        /// Provides the reverse mapping of <see cref="HitObjectLifetimeEntry.HitObject"/> for each entry.
+        /// </summary>
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
+        /// <summary>
+        /// Stores the parent hit object for entries of the nested hit objects.
+        /// A <c>null</c> is stored for entries of the top-level hit objects.
+        /// </summary>
+        /// <remarks>
+        /// The parent hit object of a pooled hit object may be non-pooled.
+        /// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>.
+        /// </remarks>
         private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+
+        /// <summary>
+        /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
+        /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
         public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)

From c59aa574509d153883fc6dd6f4627058a7089e27 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 16 Jun 2021 15:15:33 +0900
Subject: [PATCH 41/65] Remove `createLifetimeEntry` from
 `HitObjectEntryManager`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 33 ++++++++-----------
 osu.Game/Rulesets/UI/Playfield.cs             | 19 ++++++++---
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 71c0a88616..d8dd6fab7e 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
 
-        private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
-
         /// <summary>
         /// Provides the reverse mapping of <see cref="HitObjectLifetimeEntry.HitObject"/> for each entry.
         /// </summary>
@@ -53,37 +51,33 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
-        public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
+        public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
         {
-            this.createLifetimeEntry = createLifetimeEntry;
-        }
+            if (parentMap.ContainsKey(entry))
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parent)
-        {
-            if (entryMap.ContainsKey(hitObject))
-                throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
-
-            var entry = createLifetimeEntry(hitObject);
-            entryMap[hitObject] = entry;
+            var hitObject = entry.HitObject;
             parentMap[entry] = parent;
+            entryMap[hitObject] = entry;
 
             if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Add(entry);
 
             hitObject.DefaultsApplied += onDefaultsApplied;
 
-            childrenMap[entry.HitObject] = new List<HitObjectLifetimeEntry>();
+            childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
             OnEntryAdded?.Invoke(entry, parent);
-            return entry;
         }
 
-        public bool Remove(HitObject hitObject)
+        public void Remove(HitObjectLifetimeEntry entry)
         {
-            if (!entryMap.Remove(hitObject, out var entry))
-                return false;
+            if (!parentMap.ContainsKey(entry))
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
+            var hitObject = entry.HitObject;
             parentMap.Remove(entry, out var parent);
+            entryMap.Remove(hitObject);
 
             if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
@@ -94,11 +88,10 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (childrenMap.Remove(entry.HitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
-                    Remove(childEntry.HitObject);
+                    Remove(childEntry);
             }
 
             OnEntryRemoved?.Invoke(entry, parent);
-            return true;
         }
 
         public bool TryGet(HitObject hitObject, [MaybeNullWhen(false)] out HitObjectLifetimeEntry entry)
@@ -115,7 +108,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 return;
 
             foreach (var entry in childEntries)
-                Remove(entry.HitObject);
+                Remove(entry);
 
             childEntries.Clear();
             childrenMap[hitObject] = childEntries;
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 5aaa7682db..2ec72d8fe3 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
-        private readonly HitObjectEntryManager entryManager;
+        private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.UI
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
 
-            entryManager = new HitObjectEntryManager(CreateLifetimeEntry);
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
         }
@@ -271,7 +270,8 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject"></param>
         public virtual void Add(HitObject hitObject)
         {
-            entryManager.Add(hitObject, null);
+            var entry = CreateLifetimeEntry(hitObject);
+            entryManager.Add(entry, null);
         }
 
         private void preloadSamples(HitObject hitObject)
@@ -294,7 +294,13 @@ namespace osu.Game.Rulesets.UI
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
         public virtual bool Remove(HitObject hitObject)
         {
-            return entryManager.Remove(hitObject) || nestedPlayfields.Any(p => p.Remove(hitObject));
+            if (entryManager.TryGet(hitObject, out var entry))
+            {
+                entryManager.Remove(entry);
+                return true;
+            }
+
+            return nestedPlayfields.Any(p => p.Remove(hitObject));
         }
 
         private void onEntryAdded(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
@@ -378,7 +384,10 @@ namespace osu.Game.Rulesets.UI
                 }
 
                 if (!entryManager.TryGet(hitObject, out var entry))
-                    entry = entryManager.Add(hitObject, parent?.HitObject);
+                {
+                    entry = CreateLifetimeEntry(hitObject);
+                    entryManager.Add(entry, parent?.HitObject);
+                }
 
                 dho.ParentHitObject = parent;
                 dho.Apply(entry);

From 5dc0d32e4207199f93c0d2f054f3d145952ab066 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 15:24:20 +0900
Subject: [PATCH 42/65] Apply NRT to hitobject lifetime related classes

---
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs        | 4 +---
 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 9af4cf3544..fedf419973 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Judgements;
@@ -24,7 +22,7 @@ namespace osu.Game.Rulesets.Objects
         /// The result that <see cref="HitObject"/> was judged with.
         /// This is set by the accompanying <see cref="DrawableHitObject"/>, and reused when required for rewinding.
         /// </summary>
-        internal JudgementResult Result;
+        internal JudgementResult? Result;
 
         private readonly IBindable<double> startTimeBindable = new BindableDouble();
 
diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index d8dd6fab7e..30a8e8f549 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

From 87384db8729401b7b6824880cd5cc95eeefa9126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 00:51:02 +0900
Subject: [PATCH 43/65] Fix slider rotation causing thousands of new drawables
 to be created

---
 .../Sliders/Components/PathControlPointPiece.cs          | 7 +++++--
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs        | 9 ++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index ab4b492767..59edbe8dc6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -66,11 +66,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             cachePoints(slider);
 
             sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ =>
+
+            // schedule ensure that updates are only applied after all operations from a single frame are applied.
+            // this avoids inadvertently changing the slider path type for bach operations.
+            sliderVersion.BindValueChanged(_ => Scheduler.AddOnce(() =>
             {
                 cachePoints(slider);
                 updatePathType();
-            });
+            }));
 
             controlPoint.Changed += updateMarkerDisplay;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 57d67acad5..280a35500a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -186,13 +186,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 if (h is IHasPath path)
                 {
-                    var controlPoints = path.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(RotatePointAroundOrigin(p.Position, Vector2.Zero, delta), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    path.Path.ControlPoints.Clear();
-                    path.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (PathControlPoint t in path.Path.ControlPoints)
+                        t.Position = RotatePointAroundOrigin(t.Position, Vector2.Zero, delta);
                 }
             }
 

From d6db82283a806ab62114ee3c830cd15152a5a1ef Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Wed, 14 Sep 2022 18:01:29 +0200
Subject: [PATCH 44/65] Removes unused class

---
 osu.Game/Screens/Play/KeyCounterState.cs | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/KeyCounterState.cs

diff --git a/osu.Game/Screens/Play/KeyCounterState.cs b/osu.Game/Screens/Play/KeyCounterState.cs
deleted file mode 100644
index 45d027e5ec..0000000000
--- a/osu.Game/Screens/Play/KeyCounterState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-namespace osu.Game.Screens.Play
-{
-    public class KeyCounterState
-    {
-        public KeyCounterState(double time, int count)
-        {
-            Time = time;
-            Count = count;
-        }
-
-        public readonly double Time;
-        public readonly int Count;
-    }
-}

From c203a030c1bdec9b40168b1ca8844c802436b4d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 04:28:07 +0900
Subject: [PATCH 45/65] Update
 osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs

Co-authored-by: apollo <83023433+apollo-dw@users.noreply.github.com>
---
 .../Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 59edbe8dc6..5dec5d1cb0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             sliderVersion = slider.Path.Version.GetBoundCopy();
 
             // schedule ensure that updates are only applied after all operations from a single frame are applied.
-            // this avoids inadvertently changing the slider path type for bach operations.
+            // this avoids inadvertently changing the slider path type for batch operations.
             sliderVersion.BindValueChanged(_ => Scheduler.AddOnce(() =>
             {
                 cachePoints(slider);

From de7dd29d791304fe588ae1f297ecff8e128168c4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:57:05 +0300
Subject: [PATCH 46/65] Add "Nominations" and "Updated" sorting criteria in
 beatmap listing

---
 osu.Game/Overlays/BeatmapListing/SortCriteria.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
index ff6e62b274..6c010c7504 100644
--- a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
+++ b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Overlays.BeatmapListing
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingDifficulty))]
         Difficulty,
 
+        [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingUpdated))]
+        Updated,
+
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingRanked))]
         Ranked,
 
@@ -32,6 +35,9 @@ namespace osu.Game.Overlays.BeatmapListing
         Favourites,
 
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingRelevance))]
-        Relevance
+        Relevance,
+
+        [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingNominations))]
+        Nominations,
     }
 }

From efebe55d228f9a669bc500a822bf211ca34e6ba3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:58:32 +0300
Subject: [PATCH 47/65] Display certain sort criterias based on selected
 category and query

---
 .../BeatmapListingFilterControl.cs            | 21 ++++----
 .../BeatmapListingSortTabControl.cs           | 53 +++++++++++++++++--
 osu.Game/Overlays/OverlaySortTabControl.cs    |  4 +-
 3 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 2ca369d459..ff9a46ed4f 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -151,19 +151,20 @@ namespace osu.Game.Overlays.BeatmapListing
 
             config.BindWith(OsuSetting.BeatmapListingCardSize, cardSize);
 
-            var sortCriteria = sortControl.Current;
-            var sortDirection = sortControl.SortDirection;
-
-            searchControl.Query.BindValueChanged(query =>
+            searchControl.Query.BindValueChanged(_ =>
             {
-                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? SortCriteria.Ranked : SortCriteria.Relevance;
-                sortDirection.Value = SortDirection.Descending;
+                resetSortControl();
                 queueUpdateSearch(true);
             });
 
+            searchControl.Category.BindValueChanged(_ =>
+            {
+                resetSortControl();
+                queueUpdateSearch();
+            });
+
             searchControl.General.CollectionChanged += (_, _) => queueUpdateSearch();
             searchControl.Ruleset.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Extra.CollectionChanged += (_, _) => queueUpdateSearch();
@@ -171,8 +172,8 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
             searchControl.ExplicitContent.BindValueChanged(_ => queueUpdateSearch());
 
-            sortCriteria.BindValueChanged(_ => queueUpdateSearch());
-            sortDirection.BindValueChanged(_ => queueUpdateSearch());
+            sortControl.Current.BindValueChanged(_ => queueUpdateSearch());
+            sortControl.SortDirection.BindValueChanged(_ => queueUpdateSearch());
 
             apiUser = api.LocalUser.GetBoundCopy();
             apiUser.BindValueChanged(_ => queueUpdateSearch());
@@ -199,6 +200,8 @@ namespace osu.Game.Overlays.BeatmapListing
             performRequest();
         }
 
+        private void resetSortControl() => sortControl.Reset(searchControl.Category.Value, !string.IsNullOrEmpty(searchControl.Query.Value));
+
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
             SearchStarted?.Invoke();
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 454f381c60..bc1f30dcaf 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -17,18 +17,65 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
 
-        public BeatmapListingSortTabControl()
+        private SearchCategory? lastCategory;
+        private bool? lastHasQuery;
+
+        protected override void LoadComplete()
         {
-            Current.Value = SortCriteria.Ranked;
+            base.LoadComplete();
+            Reset(SearchCategory.Leaderboard, false);
+        }
+
+        public void Reset(SearchCategory category, bool hasQuery)
+        {
+            if (category != lastCategory || hasQuery != lastHasQuery)
+            {
+                TabControl.Clear();
+
+                TabControl.AddItem(SortCriteria.Title);
+                TabControl.AddItem(SortCriteria.Artist);
+                TabControl.AddItem(SortCriteria.Difficulty);
+
+                if (category == SearchCategory.Any || category > SearchCategory.Loved)
+                    TabControl.AddItem(SortCriteria.Updated);
+
+                if (category < SearchCategory.Pending || category == SearchCategory.Mine)
+                    TabControl.AddItem(SortCriteria.Ranked);
+
+                TabControl.AddItem(SortCriteria.Rating);
+                TabControl.AddItem(SortCriteria.Plays);
+                TabControl.AddItem(SortCriteria.Favourites);
+
+                if (hasQuery)
+                    TabControl.AddItem(SortCriteria.Relevance);
+
+                if (category == SearchCategory.Pending)
+                    TabControl.AddItem(SortCriteria.Nominations);
+            }
+
+            var nonQueryCriteria = category >= SearchCategory.Pending ? SortCriteria.Updated : SortCriteria.Ranked;
+
+            Current.Value = hasQuery ? SortCriteria.Relevance : nonQueryCriteria;
+            SortDirection.Value = Overlays.SortDirection.Descending;
+
+            // if the new criteria isn't different from the previous one,
+            // then re-adding tab items will not mark the current tab as selected.
+            // see: https://github.com/ppy/osu-framework/issues/5412
+            TabControl.Current.TriggerChange();
+
+            lastCategory = category;
+            lastHasQuery = hasQuery;
         }
 
         protected override SortTabControl CreateControl() => new BeatmapSortTabControl
         {
-            SortDirection = { BindTarget = SortDirection }
+            SortDirection = { BindTarget = SortDirection },
         };
 
         private class BeatmapSortTabControl : SortTabControl
         {
+            protected override bool AddEnumEntriesAutomatically => false;
+
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
             protected override TabItem<SortCriteria> CreateTabItem(SortCriteria value) => new BeatmapSortTabItem(value)
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index f02d2b388f..befb011353 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays
 {
     public class OverlaySortTabControl<T> : CompositeDrawable, IHasCurrentValue<T>
     {
+        public TabControl<T> TabControl { get; }
+
         private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
 
         public Bindable<T> Current
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays
                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                         Text = SortStrings.Default
                     },
-                    CreateControl().With(c =>
+                    TabControl = CreateControl().With(c =>
                     {
                         c.Anchor = Anchor.CentreLeft;
                         c.Origin = Anchor.CentreLeft;

From 9824d09d490341424a52cfa54cb594036710de82 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:58:42 +0300
Subject: [PATCH 48/65] Add test coverage

---
 .../TestSceneBeatmapListingSortTabControl.cs  | 85 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
index 3247461fba..0ef13385ec 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
@@ -3,9 +3,13 @@
 
 #nullable disable
 
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -15,12 +19,13 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapListingSortTabControl : OsuTestScene
     {
+        private readonly BeatmapListingSortTabControl control;
+
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
         public TestSceneBeatmapListingSortTabControl()
         {
-            BeatmapListingSortTabControl control;
             OsuSpriteText current;
             OsuSpriteText direction;
 
@@ -45,5 +50,83 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
             control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
         }
+
+        [Test]
+        public void TestRankedSort()
+        {
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Any);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Ranked);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Qualified);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Loved);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Favourites);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Pending);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Wip);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestUpdatedSort()
+        {
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Any);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Ranked);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Qualified);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Loved);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Favourites);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Pending);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Wip);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestNominationsSort()
+        {
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Any);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Ranked);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Qualified);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Loved);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Favourites);
+            criteriaShowsOnCategory(true, SortCriteria.Nominations, SearchCategory.Pending);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Wip);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestResetNoQuery()
+        {
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Any);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Leaderboard);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Ranked);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Qualified);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Loved);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Favourites);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Pending);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Wip);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Graveyard);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Mine);
+        }
+
+        private void criteriaShowsOnCategory(bool expected, SortCriteria criteria, SearchCategory category)
+        {
+            AddAssert($"{criteria.ToString().ToLowerInvariant()} {(expected ? "shown" : "not shown")} on {category.ToString().ToLowerInvariant()}", () =>
+            {
+                control.Reset(category, false);
+                return control.ChildrenOfType<TabControl<SortCriteria>>().Single().Items.Contains(criteria) == expected;
+            });
+        }
+
+        private void resetUsesCriteriaOnCategory(SortCriteria criteria, SearchCategory category)
+        {
+            AddAssert($"reset uses {criteria.ToString().ToLowerInvariant()} on {category.ToString().ToLowerInvariant()}", () =>
+            {
+                control.Reset(category, false);
+                return control.Current.Value == criteria;
+            });
+        }
     }
 }

From 31bc067dd1f9a194729580875ef0a82f191988fb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 15:38:44 +0900
Subject: [PATCH 49/65] Don't store nulls to parentMap

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 30a8e8f549..66aa2cfaf7 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -36,13 +36,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         /// <summary>
         /// Stores the parent hit object for entries of the nested hit objects.
-        /// A <c>null</c> is stored for entries of the top-level hit objects.
         /// </summary>
         /// <remarks>
         /// The parent hit object of a pooled hit object may be non-pooled.
         /// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>.
         /// </remarks>
-        private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+        private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
 
         /// <summary>
         /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
@@ -55,16 +54,17 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
             var hitObject = entry.HitObject;
-            parentMap[entry] = parent;
             entryMap[hitObject] = entry;
-
-            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
-                parentChildEntries.Add(entry);
-
-            hitObject.DefaultsApplied += onDefaultsApplied;
-
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
+            if (parent != null)
+            {
+                parentMap[entry] = parent;
+                if (childrenMap.TryGetValue(parent, out var parentChildEntries))
+                    parentChildEntries.Add(entry);
+            }
+
+            hitObject.DefaultsApplied += onDefaultsApplied;
             OnEntryAdded?.Invoke(entry, parent);
         }
 
@@ -74,14 +74,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
             var hitObject = entry.HitObject;
-            parentMap.Remove(entry, out var parent);
             entryMap.Remove(hitObject);
 
-            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+            if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
-            hitObject.DefaultsApplied -= onDefaultsApplied;
-
             // Remove all entries of the nested hit objects
             if (childrenMap.Remove(entry.HitObject, out var childEntries))
             {
@@ -89,6 +86,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
                     Remove(childEntry);
             }
 
+            hitObject.DefaultsApplied -= onDefaultsApplied;
             OnEntryRemoved?.Invoke(entry, parent);
         }
 

From 68e4d2289814dedf98fbe48dfe7116c3a30c9df6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 15:40:03 +0900
Subject: [PATCH 50/65] Precondition against entryMap intead of parentMap

---
 .../Objects/Pooling/HitObjectEntryManager.cs         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 66aa2cfaf7..11caf79d8b 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -50,10 +50,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
         {
-            if (parentMap.ContainsKey(entry))
+            HitObject hitObject = entry.HitObject;
+
+            if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-            var hitObject = entry.HitObject;
             entryMap[hitObject] = entry;
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
@@ -70,17 +71,18 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public void Remove(HitObjectLifetimeEntry entry)
         {
-            if (!parentMap.ContainsKey(entry))
+            HitObject hitObject = entry.HitObject;
+
+            if (!entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
-            var hitObject = entry.HitObject;
             entryMap.Remove(hitObject);
 
             if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
             // Remove all entries of the nested hit objects
-            if (childrenMap.Remove(entry.HitObject, out var childEntries))
+            if (childrenMap.Remove(hitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
                     Remove(childEntry);

From c847cc521e34022b9146aa45b96aa069cd2715a1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:00:35 +0900
Subject: [PATCH 51/65] Add some inline comments

---
 .../Rulesets/Objects/Pooling/HitObjectEntryManager.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 11caf79d8b..0b30ec09f9 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -55,9 +55,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
+            // Add the entry.
             entryMap[hitObject] = entry;
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
+            // If the entry has a parent, set it and add the entry to the parent's children.
             if (parent != null)
             {
                 parentMap[entry] = parent;
@@ -74,14 +76,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
             HitObject hitObject = entry.HitObject;
 
             if (!entryMap.ContainsKey(hitObject))
-                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectEntryManager)}.");
 
             entryMap.Remove(hitObject);
 
+            // If the entry has a parent, unset it and remove the entry from the parents' children.
             if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
-            // Remove all entries of the nested hit objects
+            // Remove all the entries' children.
             if (childrenMap.Remove(hitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
@@ -105,9 +108,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (!childrenMap.Remove(hitObject, out var childEntries))
                 return;
 
+            // Remove all the entries' children. At this point the parents' (this entries') children list has been removed from the map, so this does not cause upwards traversal.
             foreach (var entry in childEntries)
                 Remove(entry);
 
+            // The removed children list needs to be added back to the map for the entry to potentially receive children.
             childEntries.Clear();
             childrenMap[hitObject] = childEntries;
         }

From e56ea58e71ca78b6f284e37e0c68def4a5889eb5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:06:21 +0900
Subject: [PATCH 52/65] Fix up xmldoc

---
 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 0b30ec09f9..6c39ea44da 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
 
         /// <summary>
-        /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
+        /// Stores the list of child entries for each hit object managed by this <see cref="HitObjectEntryManager"/>.
         /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 

From 0329601e84c1a26929f0b89c3b86eb1e1ebf350e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:09:27 +0900
Subject: [PATCH 53/65] Fix inspection

---
 .../Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 79e3cf000e..b6da562bd0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hit first hitobject", () =>
             {
                 InputManager.Click(MouseButton.Left);
-                return nextObjectEntry.Result.HasResult;
+                return nextObjectEntry.Result?.HasResult == true;
             });
 
             AddAssert("check correct object after hit", () => sampleTriggerSource.GetMostValidObject() == beatmap.HitObjects[1]);

From 40a60f7145312992a29f0496fc9bb8c08827e1bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:31:00 +0900
Subject: [PATCH 54/65] Remove all entity framework code and migrations

---
 CodeAnalysis/BannedSymbols.txt                |   2 -
 osu.Desktop/osu.Desktop.csproj                |   4 -
 .../Navigation/TestEFToRealmMigration.cs      |  63 --
 .../Beatmaps/BeatmapUpdaterMetadataLookup.cs  |   2 +-
 osu.Game/Database/DatabaseContextFactory.cs   | 218 -------
 osu.Game/Database/DatabaseWriteUsage.cs       |  60 --
 osu.Game/Database/EFToRealmMigrator.cs        | 595 ------------------
 osu.Game/Database/IDatabaseContextFactory.cs  |  23 -
 osu.Game/Database/OsuDbContext.cs             | 214 -------
 .../20171019041408_InitialCreate.Designer.cs  | 293 ---------
 .../20171019041408_InitialCreate.cs           | 314 ---------
 ...025071459_AddMissingIndexRules.Designer.cs | 299 ---------
 .../20171025071459_AddMissingIndexRules.cs    |  83 ---
 ...eatmapOnlineIDUniqueConstraint.Designer.cs | 302 ---------
 ...5731_AddBeatmapOnlineIDUniqueConstraint.cs |  26 -
 ...034410_AddRulesetInfoShortName.Designer.cs | 307 ---------
 .../20171209034410_AddRulesetInfoShortName.cs |  36 --
 .../20180125143340_Settings.Designer.cs       | 329 ----------
 .../Migrations/20180125143340_Settings.cs     |  58 --
 .../20180131154205_AddMuteBinding.cs          |  26 -
 .../20180219060912_AddSkins.Designer.cs       | 379 -----------
 .../Migrations/20180219060912_AddSkins.cs     |  74 ---
 ...54_RemoveUniqueHashConstraints.Designer.cs | 377 -----------
 ...80529055154_RemoveUniqueHashConstraints.cs |  54 --
 ...111_UpdateTaikoDefaultBindings.Designer.cs | 376 -----------
 ...180621044111_UpdateTaikoDefaultBindings.cs |  20 -
 ...628011956_RemoveNegativeSetIDs.Designer.cs | 376 -----------
 .../20180628011956_RemoveNegativeSetIDs.cs    |  21 -
 .../20180913080842_AddRankStatus.Designer.cs  | 380 -----------
 .../20180913080842_AddRankStatus.cs           |  36 --
 ...0181007180454_StandardizePaths.Designer.cs | 380 -----------
 .../20181007180454_StandardizePaths.cs        |  27 -
 ...20181128100659_AddSkinInfoHash.Designer.cs | 387 ------------
 .../20181128100659_AddSkinInfoHash.cs         |  44 --
 ...81130113755_AddScoreInfoTables.Designer.cs | 484 --------------
 .../20181130113755_AddScoreInfoTables.cs      | 115 ----
 ...20190225062029_AddUserIDColumn.Designer.cs | 487 --------------
 .../20190225062029_AddUserIDColumn.cs         |  25 -
 .../20190525060824_SkinSettings.Designer.cs   | 498 ---------------
 .../Migrations/20190525060824_SkinSettings.cs |  57 --
 ...AddDateAddedColumnToBeatmapSet.Designer.cs | 489 --------------
 ...05091246_AddDateAddedColumnToBeatmapSet.cs |  27 -
 ...8070844_AddBPMAndLengthColumns.Designer.cs | 504 ---------------
 .../20190708070844_AddBPMAndLengthColumns.cs  |  36 --
 ...20190913104727_AddBeatmapVideo.Designer.cs | 506 ---------------
 .../20190913104727_AddBeatmapVideo.cs         |  25 -
 ...02094919_RefreshVolumeBindings.Designer.cs | 506 ---------------
 .../20200302094919_RefreshVolumeBindings.cs   |  19 -
 ...01019224408_AddEpilepsyWarning.Designer.cs | 508 ---------------
 .../20201019224408_AddEpilepsyWarning.cs      |  26 -
 ...700_RefreshVolumeBindingsAgain.Designer.cs | 506 ---------------
 ...210412045700_RefreshVolumeBindingsAgain.cs |  19 -
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ---------------
 ...20210511060743_AddSkinInstantiationInfo.cs |  25 -
 ...9_AddAuthorIdToBeatmapMetadata.Designer.cs | 511 ---------------
 ...0514062639_AddAuthorIdToBeatmapMetadata.cs |  26 -
 ...824185035_AddCountdownSettings.Designer.cs | 513 ---------------
 .../20210824185035_AddCountdownSettings.cs    |  26 -
 ...11_AddSamplesMatchPlaybackRate.Designer.cs | 515 ---------------
 ...10912144011_AddSamplesMatchPlaybackRate.cs |  26 -
 .../20211020081609_ResetSkinHashes.cs         |  23 -
 .../Migrations/OsuDbContextModelSnapshot.cs   | 513 ---------------
 osu.Game/OsuGameBase.cs                       |  10 +-
 osu.Game/Screens/Loader.cs                    |  22 +-
 osu.sln.DotSettings                           |   1 -
 65 files changed, 3 insertions(+), 13738 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
 delete mode 100644 osu.Game/Database/DatabaseContextFactory.cs
 delete mode 100644 osu.Game/Database/DatabaseWriteUsage.cs
 delete mode 100644 osu.Game/Database/EFToRealmMigrator.cs
 delete mode 100644 osu.Game/Database/IDatabaseContextFactory.cs
 delete mode 100644 osu.Game/Database/OsuDbContext.cs
 delete mode 100644 osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171019041408_InitialCreate.cs
 delete mode 100644 osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
 delete mode 100644 osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
 delete mode 100644 osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
 delete mode 100644 osu.Game/Migrations/20180125143340_Settings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180125143340_Settings.cs
 delete mode 100644 osu.Game/Migrations/20180131154205_AddMuteBinding.cs
 delete mode 100644 osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180219060912_AddSkins.cs
 delete mode 100644 osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
 delete mode 100644 osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
 delete mode 100644 osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
 delete mode 100644 osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180913080842_AddRankStatus.cs
 delete mode 100644 osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181007180454_StandardizePaths.cs
 delete mode 100644 osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
 delete mode 100644 osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
 delete mode 100644 osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
 delete mode 100644 osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190525060824_SkinSettings.cs
 delete mode 100644 osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
 delete mode 100644 osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
 delete mode 100644 osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
 delete mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
 delete mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
 delete mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
 delete mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
 delete mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
 delete mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
 delete mode 100644 osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
 delete mode 100644 osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
 delete mode 100644 osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
 delete mode 100644 osu.Game/Migrations/OsuDbContextModelSnapshot.cs

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index e779ee6658..022da0a2ea 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -6,8 +6,6 @@ T:System.IComparable;Don't use non-generic IComparable. Use generic version inst
 T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
-T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
-T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
 M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index c67017f175..8ef480d4e3 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -28,10 +28,6 @@
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.14">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
diff --git a/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs b/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
deleted file mode 100644
index c3559589ed..0000000000
--- a/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.Linq;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Models;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osu.Game.Tests.Resources;
-
-namespace osu.Game.Tests.Visual.Navigation
-{
-    public class TestEFToRealmMigration : OsuGameTestScene
-    {
-        public override void RecycleLocalStorage(bool isDisposing)
-        {
-            base.RecycleLocalStorage(isDisposing);
-
-            if (isDisposing)
-                return;
-
-            using (var outStream = LocalStorage.CreateFileSafely(DatabaseContextFactory.DATABASE_NAME))
-            using (var stream = TestResources.OpenResource(DatabaseContextFactory.DATABASE_NAME))
-                stream.CopyTo(outStream);
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                Assert.Ignore("EF-to-realm migrations are not supported on M1 ARM architectures.");
-        }
-
-        public override void SetUpSteps()
-        {
-            // base SetUpSteps are executed before the above SetUp, therefore early-return to allow ignoring test properly.
-            // attempting to ignore here would yield a TargetInvocationException instead.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                return;
-
-            base.SetUpSteps();
-        }
-
-        [Test]
-        public void TestMigration()
-        {
-            // Numbers are taken from the test database (see commit f03de16ee5a46deac3b5f2ca1edfba5c4c5dca7d).
-            AddAssert("Check beatmaps", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<BeatmapSetInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check skins", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<SkinInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check scores", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<ScoreInfo>().Count() == 1));
-
-            // One extra file is created during realm migration / startup due to the circles intro import.
-            AddAssert("Check files", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<RealmFile>().Count() == 271));
-        }
-    }
-}
diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index f96fcc2630..aa773da6d3 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Beatmaps
 
             try
             {
-                using (var db = new SqliteConnection(DatabaseContextFactory.CreateDatabaseConnectionString("online.db", storage)))
+                using (var db = new SqliteConnection(string.Concat("Data Source=", storage.GetFullPath($@"{"online.db"}", true))))
                 {
                     db.Open();
 
diff --git a/osu.Game/Database/DatabaseContextFactory.cs b/osu.Game/Database/DatabaseContextFactory.cs
deleted file mode 100644
index af91fb4971..0000000000
--- a/osu.Game/Database/DatabaseContextFactory.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Framework.Statistics;
-
-namespace osu.Game.Database
-{
-    public class DatabaseContextFactory : IDatabaseContextFactory
-    {
-        private readonly Storage storage;
-
-        public const string DATABASE_NAME = @"client.db";
-
-        private ThreadLocal<OsuDbContext> threadContexts;
-
-        private readonly object writeLock = new object();
-
-        private bool currentWriteDidWrite;
-        private bool currentWriteDidError;
-
-        private int currentWriteUsages;
-
-        private IDbContextTransaction currentWriteTransaction;
-
-        public DatabaseContextFactory(Storage storage)
-        {
-            this.storage = storage;
-            recycleThreadContexts();
-        }
-
-        private static readonly GlobalStatistic<int> reads = GlobalStatistics.Get<int>("Database", "Get (Read)");
-        private static readonly GlobalStatistic<int> writes = GlobalStatistics.Get<int>("Database", "Get (Write)");
-        private static readonly GlobalStatistic<int> commits = GlobalStatistics.Get<int>("Database", "Commits");
-        private static readonly GlobalStatistic<int> rollbacks = GlobalStatistics.Get<int>("Database", "Rollbacks");
-
-        /// <summary>
-        /// Get a context for the current thread for read-only usage.
-        /// If a <see cref="DatabaseWriteUsage"/> is in progress, the existing write-safe context will be returned.
-        /// </summary>
-        public OsuDbContext Get()
-        {
-            reads.Value++;
-            return threadContexts.Value;
-        }
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        public DatabaseWriteUsage GetForWrite(bool withTransaction = true)
-        {
-            writes.Value++;
-            Monitor.Enter(writeLock);
-            OsuDbContext context;
-
-            try
-            {
-                if (currentWriteTransaction == null && withTransaction)
-                {
-                    // this mitigates the fact that changes on tracked entities will not be rolled back with the transaction by ensuring write operations are always executed in isolated contexts.
-                    // if this results in sub-optimal efficiency, we may need to look into removing Database-level transactions in favour of running SaveChanges where we currently commit the transaction.
-                    if (threadContexts.IsValueCreated)
-                        recycleThreadContexts();
-
-                    context = threadContexts.Value;
-                    currentWriteTransaction = context.Database.BeginTransaction();
-                }
-                else
-                {
-                    // we want to try-catch the retrieval of the context because it could throw an error (in CreateContext).
-                    context = threadContexts.Value;
-                }
-            }
-            catch
-            {
-                // retrieval of a context could trigger a fatal error.
-                Monitor.Exit(writeLock);
-                throw;
-            }
-
-            Interlocked.Increment(ref currentWriteUsages);
-
-            return new DatabaseWriteUsage(context, usageCompleted) { IsTransactionLeader = currentWriteTransaction != null && currentWriteUsages == 1 };
-        }
-
-        private void usageCompleted(DatabaseWriteUsage usage)
-        {
-            int usages = Interlocked.Decrement(ref currentWriteUsages);
-
-            try
-            {
-                currentWriteDidWrite |= usage.PerformedWrite;
-                currentWriteDidError |= usage.Errors.Any();
-
-                if (usages == 0)
-                {
-                    if (currentWriteDidError)
-                    {
-                        rollbacks.Value++;
-                        currentWriteTransaction?.Rollback();
-                    }
-                    else
-                    {
-                        commits.Value++;
-                        currentWriteTransaction?.Commit();
-                    }
-
-                    if (currentWriteDidWrite || currentWriteDidError)
-                    {
-                        // explicitly dispose to ensure any outstanding flushes happen as soon as possible (and underlying resources are purged).
-                        usage.Context.Dispose();
-
-                        // once all writes are complete, we want to refresh thread-specific contexts to make sure they don't have stale local caches.
-                        recycleThreadContexts();
-                    }
-
-                    currentWriteTransaction = null;
-                    currentWriteDidWrite = false;
-                    currentWriteDidError = false;
-                }
-            }
-            finally
-            {
-                Monitor.Exit(writeLock);
-            }
-        }
-
-        private void recycleThreadContexts()
-        {
-            // Contexts for other threads are not disposed as they may be in use elsewhere. Instead, fresh contexts are exposed
-            // for other threads to use, and we rely on the finalizer inside OsuDbContext to handle their previous contexts
-            threadContexts?.Value.Dispose();
-            threadContexts = new ThreadLocal<OsuDbContext>(CreateContext, true);
-        }
-
-        protected virtual OsuDbContext CreateContext() => new OsuDbContext(CreateDatabaseConnectionString(DATABASE_NAME, storage))
-        {
-            Database = { AutoTransactionsEnabled = false }
-        };
-
-        public void CreateBackup(string backupFilename)
-        {
-            Logger.Log($"Creating full EF database backup at {backupFilename}", LoggingTarget.Database);
-
-            using (var source = storage.GetStream(DATABASE_NAME, mode: FileMode.Open))
-            using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
-                source.CopyTo(destination);
-        }
-
-        public void ResetDatabase()
-        {
-            lock (writeLock)
-            {
-                recycleThreadContexts();
-
-                try
-                {
-                    int attempts = 10;
-
-                    // Retry logic taken from MigratableStorage.AttemptOperation.
-                    while (true)
-                    {
-                        try
-                        {
-                            storage.Delete(DATABASE_NAME);
-                            return;
-                        }
-                        catch (Exception)
-                        {
-                            if (attempts-- == 0)
-                                throw;
-                        }
-
-                        Thread.Sleep(250);
-                    }
-                }
-                catch
-                {
-                    // for now we are not sure why file handles are kept open by EF, but this is generally only used in testing
-                }
-            }
-        }
-
-        public void FlushConnections()
-        {
-            if (threadContexts != null)
-            {
-                foreach (var context in threadContexts.Values)
-                    context.Dispose();
-            }
-
-            recycleThreadContexts();
-        }
-
-        public static string CreateDatabaseConnectionString(string filename, Storage storage) => string.Concat("Data Source=", storage.GetFullPath($@"{filename}", true));
-
-        private readonly ManualResetEventSlim migrationComplete = new ManualResetEventSlim();
-
-        public void SetMigrationCompletion() => migrationComplete.Set();
-
-        public void WaitForMigrationCompletion()
-        {
-            if (!migrationComplete.Wait(300000))
-                throw new TimeoutException("Migration took too long (likely stuck).");
-        }
-    }
-}
diff --git a/osu.Game/Database/DatabaseWriteUsage.cs b/osu.Game/Database/DatabaseWriteUsage.cs
deleted file mode 100644
index b5f25eae20..0000000000
--- a/osu.Game/Database/DatabaseWriteUsage.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Database
-{
-    public class DatabaseWriteUsage : IDisposable
-    {
-        public readonly OsuDbContext Context;
-        private readonly Action<DatabaseWriteUsage> usageCompleted;
-
-        public DatabaseWriteUsage(OsuDbContext context, Action<DatabaseWriteUsage> onCompleted)
-        {
-            Context = context;
-            usageCompleted = onCompleted;
-        }
-
-        public bool PerformedWrite { get; private set; }
-
-        private bool isDisposed;
-        public List<Exception> Errors = new List<Exception>();
-
-        /// <summary>
-        /// Whether this write usage will commit a transaction on completion.
-        /// If false, there is a parent usage responsible for transaction commit.
-        /// </summary>
-        public bool IsTransactionLeader;
-
-        protected void Dispose(bool disposing)
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            try
-            {
-                PerformedWrite |= Context.SaveChanges() > 0;
-            }
-            catch (Exception e)
-            {
-                Errors.Add(e);
-                throw;
-            }
-            finally
-            {
-                usageCompleted?.Invoke(this);
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
diff --git a/osu.Game/Database/EFToRealmMigrator.cs b/osu.Game/Database/EFToRealmMigrator.cs
deleted file mode 100644
index 294a8cd3ed..0000000000
--- a/osu.Game/Database/EFToRealmMigrator.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Development;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Models;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osuTK;
-using Realms;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
-using SharpCompress.Writers.Zip;
-
-namespace osu.Game.Database
-{
-    internal class EFToRealmMigrator : CompositeDrawable
-    {
-        public Task<bool> MigrationCompleted => migrationCompleted.Task;
-
-        private readonly TaskCompletionSource<bool> migrationCompleted = new TaskCompletionSource<bool>();
-
-        [Resolved]
-        private DatabaseContextFactory efContextFactory { get; set; } = null!;
-
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
-        [Resolved]
-        private OsuConfigManager config { get; set; } = null!;
-
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; } = null!;
-
-        [Resolved]
-        private OsuGame game { get; set; } = null!;
-
-        [Resolved]
-        private Storage storage { get; set; } = null!;
-
-        private readonly OsuTextFlowContainer currentOperationText;
-
-        public EFToRealmMigrator()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Spacing = new Vector2(10),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Database migration in progress",
-                            Font = OsuFont.Default.With(size: 40)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "This could take a few minutes depending on the speed of your disk(s).",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Please keep the window open until this completes!",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new LoadingSpinner(true)
-                        {
-                            State = { Value = Visibility.Visible }
-                        },
-                        currentOperationText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: 30))
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                            TextAnchor = Anchor.TopCentre,
-                        },
-                    }
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            beginMigration();
-        }
-
-        private void beginMigration()
-        {
-            const string backup_folder = "backups";
-
-            string backupSuffix = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
-
-            // required for initial backup.
-            var realmBlockOperations = realm.BlockAllOperations("EF migration");
-
-            Task.Factory.StartNew(() =>
-            {
-                try
-                {
-                    realm.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.realm"));
-                }
-                finally
-                {
-                    // Once the backup is created, we need to stop blocking operations so the migration can complete.
-                    realmBlockOperations.Dispose();
-                    // Clean up here so we don't accidentally dispose twice.
-                    realmBlockOperations = null;
-                }
-
-                efContextFactory.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.db"));
-
-                using (var ef = efContextFactory.Get())
-                {
-                    realm.Write(r =>
-                    {
-                        // Before beginning, ensure realm is in an empty state.
-                        // Migrations which are half-completed could lead to issues if the user tries a second time.
-                        // Note that we only do this for beatmaps and scores since the other migrations are yonks old.
-                        r.RemoveAll<BeatmapSetInfo>();
-                        r.RemoveAll<BeatmapInfo>();
-                        r.RemoveAll<BeatmapMetadata>();
-                        r.RemoveAll<ScoreInfo>();
-                    });
-
-                    ef.Migrate();
-
-                    migrateSettings(ef);
-                    migrateSkins(ef);
-                    migrateBeatmaps(ef);
-                    migrateScores(ef);
-                }
-            }, TaskCreationOptions.LongRunning).ContinueWith(t =>
-            {
-                if (t.Exception == null)
-                {
-                    log("Migration successful!");
-
-                    if (DebugUtils.IsDebugBuild)
-                    {
-                        Logger.Log(
-                            "Your development database has been fully migrated to realm. If you switch back to a pre-realm branch and need your previous database, rename the backup file back to \"client.db\".\n\nNote that doing this can potentially leave your file store in a bad state.",
-                            level: LogLevel.Important);
-                    }
-                }
-                else
-                {
-                    log("Migration failed!");
-                    Logger.Log(t.Exception.ToString(), LoggingTarget.Database);
-
-                    if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && t.Exception.Flatten().InnerException is TypeInitializationException)
-                    {
-                        // Not guaranteed to be the only cause of exception, but let's roll with it for now.
-                        log("Please download and run the intel version of osu! once\nto allow data migration to complete!");
-                        efContextFactory.SetMigrationCompletion();
-                        return;
-                    }
-
-                    notificationOverlay.Post(new SimpleErrorNotification
-                    {
-                        Text =
-                            "IMPORTANT: During data migration, some of your data could not be successfully migrated. The previous version has been backed up.\n\nFor further assistance, please open a discussion on github and attach your backup files (click to get started).",
-                        Activated = () =>
-                        {
-                            game.OpenUrlExternally(
-                                $@"https://github.com/ppy/osu/discussions/new?title=Realm%20migration%20issue ({t.Exception.Message})&body=Please%20drag%20the%20""attach_me.zip""%20file%20here!&category=q-a",
-                                true);
-
-                            const string attachment_filename = "attach_me.zip";
-
-                            var backupStorage = storage.GetStorageForDirectory(backup_folder);
-
-                            backupStorage.Delete(attachment_filename);
-
-                            try
-                            {
-                                using (var zip = ZipArchive.Create())
-                                {
-                                    zip.AddAllFromDirectory(backupStorage.GetFullPath(string.Empty));
-                                    zip.SaveTo(Path.Combine(backupStorage.GetFullPath(string.Empty), attachment_filename), new ZipWriterOptions(CompressionType.Deflate));
-                                }
-                            }
-                            catch { }
-
-                            backupStorage.PresentFileExternally(attachment_filename);
-
-                            return true;
-                        }
-                    });
-                }
-
-                // Regardless of success, since the game is going to continue with startup let's move the ef database out of the way.
-                // If we were to not do this, the migration would run another time the next time the user starts the game.
-                deletePreRealmData();
-
-                // If something went wrong and the disposal token wasn't invoked above, ensure it is here.
-                realmBlockOperations?.Dispose();
-
-                migrationCompleted.SetResult(true);
-                efContextFactory.SetMigrationCompletion();
-            });
-        }
-
-        private void deletePreRealmData()
-        {
-            // Delete the database permanently.
-            // Will cause future startups to not attempt migration.
-            efContextFactory.ResetDatabase();
-        }
-
-        private void log(string message)
-        {
-            Logger.Log(message, LoggingTarget.Database);
-            Scheduler.AddOnce(m => currentOperationText.Text = m, message);
-        }
-
-        private void migrateBeatmaps(OsuDbContext ef)
-        {
-            // can be removed 20220730.
-            var existingBeatmapSets = ef.EFBeatmapSetInfo
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.RulesetInfo)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                                        .Include(s => s.Files).ThenInclude(f => f.FileInfo)
-                                        .Include(s => s.Metadata)
-                                        .AsSplitQuery();
-
-            log("Beginning beatmaps migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingBeatmapSets.Any())
-            {
-                log("No beatmaps found to migrate");
-                return;
-            }
-
-            int count = existingBeatmapSets.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} beatmaps in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var beatmapSet in existingBeatmapSets)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} beatmaps...");
-                        }
-
-                        var realmBeatmapSet = new BeatmapSetInfo
-                        {
-                            OnlineID = beatmapSet.OnlineID ?? -1,
-                            DateAdded = beatmapSet.DateAdded,
-                            Status = beatmapSet.Status,
-                            DeletePending = beatmapSet.DeletePending,
-                            Hash = beatmapSet.Hash,
-                            Protected = beatmapSet.Protected,
-                        };
-
-                        migrateFiles(beatmapSet, r, realmBeatmapSet);
-
-                        foreach (var beatmap in beatmapSet.Beatmaps)
-                        {
-                            var ruleset = r.Find<RulesetInfo>(beatmap.RulesetInfo.ShortName);
-                            var metadata = getBestMetadata(beatmap.Metadata, beatmapSet.Metadata);
-
-                            if (ruleset == null)
-                            {
-                                log($"Skipping {++missing} beatmaps with missing ruleset");
-                                continue;
-                            }
-
-                            var realmBeatmap = new BeatmapInfo(ruleset, new BeatmapDifficulty(beatmap.BaseDifficulty), metadata)
-                            {
-                                DifficultyName = beatmap.DifficultyName,
-                                Status = beatmap.Status,
-                                OnlineID = beatmap.OnlineID ?? -1,
-                                Length = beatmap.Length,
-                                BPM = beatmap.BPM,
-                                Hash = beatmap.Hash,
-                                StarRating = beatmap.StarRating,
-                                MD5Hash = beatmap.MD5Hash,
-                                Hidden = beatmap.Hidden,
-                                AudioLeadIn = beatmap.AudioLeadIn,
-                                StackLeniency = beatmap.StackLeniency,
-                                SpecialStyle = beatmap.SpecialStyle,
-                                LetterboxInBreaks = beatmap.LetterboxInBreaks,
-                                WidescreenStoryboard = beatmap.WidescreenStoryboard,
-                                EpilepsyWarning = beatmap.EpilepsyWarning,
-                                SamplesMatchPlaybackRate = beatmap.SamplesMatchPlaybackRate,
-                                DistanceSpacing = beatmap.DistanceSpacing,
-                                BeatDivisor = beatmap.BeatDivisor,
-                                GridSize = beatmap.GridSize,
-                                TimelineZoom = beatmap.TimelineZoom,
-                                Countdown = beatmap.Countdown,
-                                CountdownOffset = beatmap.CountdownOffset,
-                                Bookmarks = beatmap.Bookmarks,
-                                BeatmapSet = realmBeatmapSet,
-                            };
-
-                            realmBeatmapSet.Beatmaps.Add(realmBeatmap);
-                        }
-
-                        r.Add(realmBeatmapSet);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} beatmaps to realm");
-            });
-        }
-
-        private BeatmapMetadata getBestMetadata(EFBeatmapMetadata? beatmapMetadata, EFBeatmapMetadata? beatmapSetMetadata)
-        {
-            var metadata = beatmapMetadata ?? beatmapSetMetadata ?? new EFBeatmapMetadata();
-
-            return new BeatmapMetadata
-            {
-                Title = metadata.Title,
-                TitleUnicode = metadata.TitleUnicode,
-                Artist = metadata.Artist,
-                ArtistUnicode = metadata.ArtistUnicode,
-                Author =
-                {
-                    OnlineID = metadata.Author.Id,
-                    Username = metadata.Author.Username,
-                },
-                Source = metadata.Source,
-                Tags = metadata.Tags,
-                PreviewTime = metadata.PreviewTime,
-                AudioFile = metadata.AudioFile,
-                BackgroundFile = metadata.BackgroundFile,
-            };
-        }
-
-        private void migrateScores(OsuDbContext db)
-        {
-            // can be removed 20220730.
-            var existingScores = db.ScoreInfo
-                                   .Include(s => s.Ruleset)
-                                   .Include(s => s.BeatmapInfo)
-                                   .Include(s => s.Files)
-                                   .ThenInclude(f => f.FileInfo)
-                                   .AsSplitQuery();
-
-            log("Beginning scores migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingScores.Any())
-            {
-                log("No scores found to migrate");
-                return;
-            }
-
-            int count = existingScores.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} scores in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var score in existingScores)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} scores...");
-                        }
-
-                        var beatmap = r.All<BeatmapInfo>().FirstOrDefault(b => b.Hash == score.BeatmapInfo.Hash);
-                        var ruleset = r.Find<RulesetInfo>(score.Ruleset.ShortName);
-
-                        if (beatmap == null || ruleset == null)
-                        {
-                            log($"Skipping {++missing} scores with missing ruleset or beatmap");
-                            continue;
-                        }
-
-                        var user = new RealmUser
-                        {
-                            OnlineID = score.User.OnlineID,
-                            Username = score.User.Username
-                        };
-
-                        var realmScore = new ScoreInfo(beatmap, ruleset, user)
-                        {
-                            Hash = score.Hash,
-                            DeletePending = score.DeletePending,
-                            OnlineID = score.OnlineID ?? -1,
-                            ModsJson = score.ModsJson,
-                            StatisticsJson = score.StatisticsJson,
-                            TotalScore = score.TotalScore,
-                            MaxCombo = score.MaxCombo,
-                            Accuracy = score.Accuracy,
-                            Date = score.Date,
-                            PP = score.PP,
-                            Rank = score.Rank,
-                            HitEvents = score.HitEvents,
-                            Passed = score.Passed,
-                            Combo = score.Combo,
-                            Position = score.Position,
-                            Statistics = score.Statistics,
-                            Mods = score.Mods,
-                            APIMods = score.APIMods,
-                        };
-
-                        migrateFiles(score, r, realmScore);
-
-                        r.Add(realmScore);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} scores to realm");
-            });
-        }
-
-        private void migrateSkins(OsuDbContext db)
-        {
-            // can be removed 20220530.
-            var existingSkins = db.SkinInfo
-                                  .Include(s => s.Files)
-                                  .ThenInclude(f => f.FileInfo)
-                                  .AsSplitQuery()
-                                  .ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSkins.Any())
-                return;
-
-            var userSkinChoice = config.GetBindable<string>(OsuSetting.Skin);
-            int.TryParse(userSkinChoice.Value, out int userSkinInt);
-
-            switch (userSkinInt)
-            {
-                case EFSkinInfo.DEFAULT_SKIN:
-                    userSkinChoice.Value = SkinInfo.DEFAULT_SKIN.ToString();
-                    break;
-
-                case EFSkinInfo.CLASSIC_SKIN:
-                    userSkinChoice.Value = SkinInfo.CLASSIC_SKIN.ToString();
-                    break;
-            }
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    // note that this cannot be written as: `r.All<SkinInfo>().All(s => s.Protected)`, because realm does not support `.All()`.
-                    if (!r.All<SkinInfo>().Any(s => !s.Protected))
-                    {
-                        log($"Migrating {existingSkins.Count} skins");
-
-                        foreach (var skin in existingSkins)
-                        {
-                            var realmSkin = new SkinInfo
-                            {
-                                Name = skin.Name,
-                                Creator = skin.Creator,
-                                Hash = skin.Hash,
-                                Protected = false,
-                                InstantiationInfo = skin.InstantiationInfo,
-                            };
-
-                            migrateFiles(skin, r, realmSkin);
-
-                            r.Add(realmSkin);
-
-                            if (skin.ID == userSkinInt)
-                                userSkinChoice.Value = realmSkin.ID.ToString();
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private static void migrateFiles<T>(IHasFiles<T> fileSource, Realm realm, IHasRealmFiles realmObject) where T : INamedFileInfo
-        {
-            foreach (var file in fileSource.Files)
-            {
-                var realmFile = realm.Find<RealmFile>(file.FileInfo.Hash);
-
-                if (realmFile == null)
-                    realm.Add(realmFile = new RealmFile { Hash = file.FileInfo.Hash });
-
-                realmObject.Files.Add(new RealmNamedFileUsage(realmFile, file.Filename));
-            }
-        }
-
-        private void migrateSettings(OsuDbContext db)
-        {
-            // migrate ruleset settings. can be removed 20220315.
-            var existingSettings = db.DatabasedSetting.ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSettings.Any())
-                return;
-
-            log("Beginning settings migration to realm");
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    if (!r.All<RealmRulesetSetting>().Any())
-                    {
-                        log($"Migrating {existingSettings.Count} settings");
-
-                        foreach (var dkb in existingSettings)
-                        {
-                            if (dkb.RulesetID == null)
-                                continue;
-
-                            string? shortName = getRulesetShortNameFromLegacyID(dkb.RulesetID.Value);
-
-                            if (string.IsNullOrEmpty(shortName))
-                                continue;
-
-                            r.Add(new RealmRulesetSetting
-                            {
-                                Key = dkb.Key,
-                                Value = dkb.StringValue,
-                                RulesetName = shortName,
-                                Variant = dkb.Variant ?? 0,
-                            });
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
-    }
-}
diff --git a/osu.Game/Database/IDatabaseContextFactory.cs b/osu.Game/Database/IDatabaseContextFactory.cs
deleted file mode 100644
index bddabad586..0000000000
--- a/osu.Game/Database/IDatabaseContextFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-namespace osu.Game.Database
-{
-    public interface IDatabaseContextFactory
-    {
-        /// <summary>
-        /// Get a context for read-only usage.
-        /// </summary>
-        OsuDbContext Get();
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        DatabaseWriteUsage GetForWrite(bool withTransaction = true);
-    }
-}
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
deleted file mode 100644
index 118a8ee469..0000000000
--- a/osu.Game/Database/OsuDbContext.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using osu.Framework.Logging;
-using osu.Framework.Statistics;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.IO;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using SQLitePCL;
-using LogLevel = Microsoft.Extensions.Logging.LogLevel;
-
-namespace osu.Game.Database
-{
-    public class OsuDbContext : DbContext
-    {
-        public DbSet<EFBeatmapInfo> EFBeatmapInfo { get; set; }
-        public DbSet<EFBeatmapDifficulty> BeatmapDifficulty { get; set; }
-        public DbSet<EFBeatmapMetadata> BeatmapMetadata { get; set; }
-        public DbSet<EFBeatmapSetInfo> EFBeatmapSetInfo { get; set; }
-        public DbSet<FileInfo> FileInfo { get; set; }
-        public DbSet<EFRulesetInfo> RulesetInfo { get; set; }
-        public DbSet<EFSkinInfo> SkinInfo { get; set; }
-        public DbSet<EFScoreInfo> ScoreInfo { get; set; }
-
-        // migrated to realm
-        public DbSet<DatabasedSetting> DatabasedSetting { get; set; }
-
-        private readonly string connectionString;
-
-        private static readonly Lazy<OsuDbLoggerFactory> logger = new Lazy<OsuDbLoggerFactory>(() => new OsuDbLoggerFactory());
-
-        private static readonly GlobalStatistic<int> contexts = GlobalStatistics.Get<int>("Database", "Contexts");
-
-        static OsuDbContext()
-        {
-            // required to initialise native SQLite libraries on some platforms.
-            Batteries_V2.Init();
-
-            // https://github.com/aspnet/EntityFrameworkCore/issues/9994#issuecomment-508588678
-            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
-        }
-
-        /// <summary>
-        /// Create a new in-memory OsuDbContext instance.
-        /// </summary>
-        public OsuDbContext()
-            : this("DataSource=:memory:")
-        {
-            // required for tooling (see https://wildermuth.com/2017/07/06/Program-cs-in-ASP-NET-Core-2-0).
-
-            Migrate();
-        }
-
-        /// <summary>
-        /// Create a new OsuDbContext instance.
-        /// </summary>
-        /// <param name="connectionString">A valid SQLite connection string.</param>
-        public OsuDbContext(string connectionString)
-        {
-            this.connectionString = connectionString;
-
-            var connection = Database.GetDbConnection();
-
-            try
-            {
-                connection.Open();
-
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "PRAGMA journal_mode=WAL;";
-                    cmd.ExecuteNonQuery();
-
-                    cmd.CommandText = "PRAGMA foreign_keys=OFF;";
-                    cmd.ExecuteNonQuery();
-                }
-            }
-            catch
-            {
-                connection.Close();
-                throw;
-            }
-
-            contexts.Value++;
-        }
-
-        ~OsuDbContext()
-        {
-            // DbContext does not contain a finalizer (https://github.com/aspnet/EntityFrameworkCore/issues/8872)
-            // This is used to clean up previous contexts when fresh contexts are exposed via DatabaseContextFactory
-            Dispose();
-        }
-
-        private bool isDisposed;
-
-        public override void Dispose()
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            base.Dispose();
-
-            contexts.Value--;
-            GC.SuppressFinalize(this);
-        }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            base.OnConfiguring(optionsBuilder);
-            optionsBuilder
-                // this is required for the time being due to the way we are querying in places like BeatmapStore.
-                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
-                .UseLoggerFactory(logger.Value);
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.MD5Hash);
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.Hash);
-
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.Hash).IsUnique();
-
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFSkinInfo>().HasMany(s => s.Files).WithOne(f => f.SkinInfo);
-
-            modelBuilder.Entity<DatabasedSetting>().HasIndex(b => new { b.RulesetID, b.Variant });
-
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.ReferenceCount);
-
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.Available);
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.ShortName).IsUnique();
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasOne(b => b.BaseDifficulty);
-
-            modelBuilder.Entity<EFScoreInfo>().HasIndex(b => b.OnlineID).IsUnique();
-        }
-
-        private class OsuDbLoggerFactory : ILoggerFactory
-        {
-            #region Disposal
-
-            public void Dispose()
-            {
-            }
-
-            #endregion
-
-            public ILogger CreateLogger(string categoryName) => new OsuDbLogger();
-
-            public void AddProvider(ILoggerProvider provider)
-            {
-                // no-op. called by tooling.
-            }
-
-            private class OsuDbLogger : ILogger
-            {
-                public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-                {
-                    if (logLevel < LogLevel.Information)
-                        return;
-
-                    Framework.Logging.LogLevel frameworkLogLevel;
-
-                    switch (logLevel)
-                    {
-                        default:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Debug;
-                            break;
-
-                        case LogLevel.Warning:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Important;
-                            break;
-
-                        case LogLevel.Error:
-                        case LogLevel.Critical:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Error;
-                            break;
-                    }
-
-                    Logger.Log(formatter(state, exception), LoggingTarget.Database, frameworkLogLevel);
-                }
-
-                public bool IsEnabled(LogLevel logLevel)
-                {
-#if DEBUG_DATABASE
-                    return logLevel > LogLevel.Debug;
-#else
-                    return logLevel > LogLevel.Information;
-#endif
-                }
-
-                public IDisposable BeginScope<TState>(TState state) => null;
-            }
-        }
-
-        public void Migrate() => Database.Migrate();
-    }
-}
diff --git a/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs b/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
deleted file mode 100644
index c751530bf4..0000000000
--- a/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171019041408_InitialCreate")]
-    partial class InitialCreate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171019041408_InitialCreate.cs b/osu.Game/Migrations/20171019041408_InitialCreate.cs
deleted file mode 100644
index 08ab64fd08..0000000000
--- a/osu.Game/Migrations/20171019041408_InitialCreate.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class InitialCreate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "BeatmapDifficulty",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    ApproachRate = table.Column<float>(type: "REAL", nullable: false),
-                    CircleSize = table.Column<float>(type: "REAL", nullable: false),
-                    DrainRate = table.Column<float>(type: "REAL", nullable: false),
-                    OverallDifficulty = table.Column<float>(type: "REAL", nullable: false),
-                    SliderMultiplier = table.Column<float>(type: "REAL", nullable: false),
-                    SliderTickRate = table.Column<float>(type: "REAL", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapDifficulty", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapMetadata",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Artist = table.Column<string>(type: "TEXT", nullable: true),
-                    ArtistUnicode = table.Column<string>(type: "TEXT", nullable: true),
-                    AudioFile = table.Column<string>(type: "TEXT", nullable: true),
-                    Author = table.Column<string>(type: "TEXT", nullable: true),
-                    BackgroundFile = table.Column<string>(type: "TEXT", nullable: true),
-                    PreviewTime = table.Column<int>(type: "INTEGER", nullable: false),
-                    Source = table.Column<string>(type: "TEXT", nullable: true),
-                    Tags = table.Column<string>(type: "TEXT", nullable: true),
-                    Title = table.Column<string>(type: "TEXT", nullable: true),
-                    TitleUnicode = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapMetadata", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "FileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    ReferenceCount = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_FileInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "KeyBinding",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Action = table.Column<int>(type: "INTEGER", nullable: false),
-                    Keys = table.Column<string>(type: "TEXT", nullable: true),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Variant = table.Column<int>(type: "INTEGER", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_KeyBinding", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "RulesetInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Available = table.Column<bool>(type: "INTEGER", nullable: false),
-                    InstantiationInfo = table.Column<string>(type: "TEXT", nullable: true),
-                    Name = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RulesetInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapSetInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    DeletePending = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    MetadataID = table.Column<int>(type: "INTEGER", nullable: true),
-                    OnlineBeatmapSetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Protected = table.Column<bool>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapSetInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetInfo_BeatmapMetadata_MetadataID",
-                        column: x => x.MetadataID,
-                        principalTable: "BeatmapMetadata",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    AudioLeadIn = table.Column<int>(type: "INTEGER", nullable: false),
-                    BaseDifficultyID = table.Column<int>(type: "INTEGER", nullable: false),
-                    BeatDivisor = table.Column<int>(type: "INTEGER", nullable: false),
-                    BeatmapSetInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Countdown = table.Column<bool>(type: "INTEGER", nullable: false),
-                    DistanceSpacing = table.Column<double>(type: "REAL", nullable: false),
-                    GridSize = table.Column<int>(type: "INTEGER", nullable: false),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    Hidden = table.Column<bool>(type: "INTEGER", nullable: false),
-                    LetterboxInBreaks = table.Column<bool>(type: "INTEGER", nullable: false),
-                    MD5Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    MetadataID = table.Column<int>(type: "INTEGER", nullable: true),
-                    OnlineBeatmapID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Path = table.Column<string>(type: "TEXT", nullable: true),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: false),
-                    SpecialStyle = table.Column<bool>(type: "INTEGER", nullable: false),
-                    StackLeniency = table.Column<float>(type: "REAL", nullable: false),
-                    StarDifficulty = table.Column<double>(type: "REAL", nullable: false),
-                    StoredBookmarks = table.Column<string>(type: "TEXT", nullable: true),
-                    TimelineZoom = table.Column<double>(type: "REAL", nullable: false),
-                    Version = table.Column<string>(type: "TEXT", nullable: true),
-                    WidescreenStoryboard = table.Column<bool>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapDifficulty_BaseDifficultyID",
-                        column: x => x.BaseDifficultyID,
-                        principalTable: "BeatmapDifficulty",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapSetInfo_BeatmapSetInfoID",
-                        column: x => x.BeatmapSetInfoID,
-                        principalTable: "BeatmapSetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapMetadata_MetadataID",
-                        column: x => x.MetadataID,
-                        principalTable: "BeatmapMetadata",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_RulesetInfo_RulesetID",
-                        column: x => x.RulesetID,
-                        principalTable: "RulesetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapSetFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    BeatmapSetInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    FileInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Filename = table.Column<string>(type: "TEXT", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapSetFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetFileInfo_BeatmapSetInfo_BeatmapSetInfoID",
-                        column: x => x.BeatmapSetInfoID,
-                        principalTable: "BeatmapSetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_BaseDifficultyID",
-                table: "BeatmapInfo",
-                column: "BaseDifficultyID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_BeatmapSetInfoID",
-                table: "BeatmapInfo",
-                column: "BeatmapSetInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MetadataID",
-                table: "BeatmapInfo",
-                column: "MetadataID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_RulesetID",
-                table: "BeatmapInfo",
-                column: "RulesetID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetFileInfo_BeatmapSetInfoID",
-                table: "BeatmapSetFileInfo",
-                column: "BeatmapSetInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetFileInfo_FileInfoID",
-                table: "BeatmapSetFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_DeletePending",
-                table: "BeatmapSetInfo",
-                column: "DeletePending");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_MetadataID",
-                table: "BeatmapSetInfo",
-                column: "MetadataID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FileInfo_Hash",
-                table: "FileInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FileInfo_ReferenceCount",
-                table: "FileInfo",
-                column: "ReferenceCount");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Action",
-                table: "KeyBinding",
-                column: "Action");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding",
-                column: "Variant");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RulesetInfo_Available",
-                table: "RulesetInfo",
-                column: "Available");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BeatmapInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapSetFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "KeyBinding");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapDifficulty");
-
-            migrationBuilder.DropTable(
-                name: "RulesetInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapSetInfo");
-
-            migrationBuilder.DropTable(
-                name: "FileInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs b/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
deleted file mode 100644
index 4cd234f2ef..0000000000
--- a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171025071459_AddMissingIndexRules")]
-    partial class AddMissingIndexRules
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs b/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
deleted file mode 100644
index 4ec3952941..0000000000
--- a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddMissingIndexRules : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_OnlineBeatmapSetID",
-                table: "BeatmapSetInfo",
-                column: "OnlineBeatmapSetID",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_OnlineBeatmapSetID",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs b/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
deleted file mode 100644
index 006acf12cd..0000000000
--- a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171119065731_AddBeatmapOnlineIDUniqueConstraint")]
-    partial class AddBeatmapOnlineIDUniqueConstraint
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs b/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
deleted file mode 100644
index 6aba12f86f..0000000000
--- a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBeatmapOnlineIDUniqueConstraint : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_OnlineBeatmapID",
-                table: "BeatmapInfo",
-                column: "OnlineBeatmapID",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_OnlineBeatmapID",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs b/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
deleted file mode 100644
index fc2496bc24..0000000000
--- a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171209034410_AddRulesetInfoShortName")]
-    partial class AddRulesetInfoShortName
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs b/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
deleted file mode 100644
index 5688455f79..0000000000
--- a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddRulesetInfoShortName : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "ShortName",
-                table: "RulesetInfo",
-                type: "TEXT",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RulesetInfo_ShortName",
-                table: "RulesetInfo",
-                column: "ShortName",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_RulesetInfo_ShortName",
-                table: "RulesetInfo");
-
-            migrationBuilder.DropColumn(
-                name: "ShortName",
-                table: "RulesetInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180125143340_Settings.Designer.cs b/osu.Game/Migrations/20180125143340_Settings.Designer.cs
deleted file mode 100644
index 4bb599eec1..0000000000
--- a/osu.Game/Migrations/20180125143340_Settings.Designer.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180125143340_Settings")]
-    partial class Settings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180125143340_Settings.cs b/osu.Game/Migrations/20180125143340_Settings.cs
deleted file mode 100644
index 1feb37531f..0000000000
--- a/osu.Game/Migrations/20180125143340_Settings.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class Settings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding");
-
-            migrationBuilder.CreateTable(
-                name: "Settings",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Key = table.Column<int>(type: "TEXT", nullable: false),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Value = table.Column<string>(type: "TEXT", nullable: true),
-                    Variant = table.Column<int>(type: "INTEGER", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Settings", x => x.ID);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_RulesetID_Variant",
-                table: "KeyBinding",
-                columns: new[] { "RulesetID", "Variant" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Settings_RulesetID_Variant",
-                table: "Settings",
-                columns: new[] { "RulesetID", "Variant" });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Settings");
-
-            migrationBuilder.DropIndex(
-                name: "IX_KeyBinding_RulesetID_Variant",
-                table: "KeyBinding");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding",
-                column: "Variant");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180131154205_AddMuteBinding.cs b/osu.Game/Migrations/20180131154205_AddMuteBinding.cs
deleted file mode 100644
index 8646d1d76b..0000000000
--- a/osu.Game/Migrations/20180131154205_AddMuteBinding.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using osu.Game.Database;
-using osu.Game.Input.Bindings;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180131154205_AddMuteBinding")]
-    public partial class AddMuteBinding : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"UPDATE KeyBinding SET Action = Action + 1 WHERE RulesetID IS NULL AND Variant IS NULL AND Action >= {(int)GlobalAction.ToggleMute}");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"DELETE FROM KeyBinding WHERE RulesetID IS NULL AND Variant IS NULL AND Action = {(int)GlobalAction.ToggleMute}");
-            migrationBuilder.Sql($"UPDATE KeyBinding SET Action = Action - 1 WHERE RulesetID IS NULL AND Variant IS NULL AND Action > {(int)GlobalAction.ToggleMute}");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs b/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
deleted file mode 100644
index cdc4ef2e66..0000000000
--- a/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180219060912_AddSkins")]
-    partial class AddSkins
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180219060912_AddSkins.cs b/osu.Game/Migrations/20180219060912_AddSkins.cs
deleted file mode 100644
index 319748bed6..0000000000
--- a/osu.Game/Migrations/20180219060912_AddSkins.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkins : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "SkinInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Creator = table.Column<string>(type: "TEXT", nullable: true),
-                    DeletePending = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SkinInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SkinFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    FileInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Filename = table.Column<string>(type: "TEXT", nullable: false),
-                    SkinInfoID = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SkinFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_SkinFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SkinFileInfo_SkinInfo_SkinInfoID",
-                        column: x => x.SkinInfoID,
-                        principalTable: "SkinInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinFileInfo_FileInfoID",
-                table: "SkinFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinFileInfo_SkinInfoID",
-                table: "SkinFileInfo",
-                column: "SkinInfoID");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "SkinFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs b/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
deleted file mode 100644
index f28408bfb3..0000000000
--- a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180529055154_RemoveUniqueHashConstraints")]
-    partial class RemoveUniqueHashConstraints
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.3-rtm-10026");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs b/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
deleted file mode 100644
index 91eabe8868..0000000000
--- a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RemoveUniqueHashConstraints : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash",
-                unique: true);
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs b/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
deleted file mode 100644
index aaa11e88b6..0000000000
--- a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180621044111_UpdateTaikoDefaultBindings")]
-    partial class UpdateTaikoDefaultBindings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs b/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
deleted file mode 100644
index d888ccd5a2..0000000000
--- a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class UpdateTaikoDefaultBindings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE RulesetID = 1");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // we can't really tell if these should be restored or not, so let's just not do so.
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
deleted file mode 100644
index 7eeacd56d7..0000000000
--- a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180628011956_RemoveNegativeSetIDs")]
-    partial class RemoveNegativeSetIDs
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
deleted file mode 100644
index fdea636ac6..0000000000
--- a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RemoveNegativeSetIDs : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            // There was a change that beatmaps were being loaded with "-1" online IDs, which is completely incorrect.
-            // This ensures there will not be unique key conflicts as a result of these incorrectly imported beatmaps.
-            migrationBuilder.Sql("UPDATE BeatmapSetInfo SET OnlineBeatmapSetID = null WHERE OnlineBeatmapSetID <= 0");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs b/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
deleted file mode 100644
index 5ab43da046..0000000000
--- a/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180913080842_AddRankStatus")]
-    partial class AddRankStatus
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.2-rtm-30932");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180913080842_AddRankStatus.cs b/osu.Game/Migrations/20180913080842_AddRankStatus.cs
deleted file mode 100644
index bb147dff84..0000000000
--- a/osu.Game/Migrations/20180913080842_AddRankStatus.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddRankStatus : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "Status",
-                table: "BeatmapSetInfo",
-                nullable: false,
-                defaultValue: -3); // NONE
-
-            migrationBuilder.AddColumn<int>(
-                name: "Status",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: -3); // NONE
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Status",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Status",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs b/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
deleted file mode 100644
index b387a45ecf..0000000000
--- a/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181007180454_StandardizePaths")]
-    partial class StandardizePaths
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.3-rtm-32065");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181007180454_StandardizePaths.cs b/osu.Game/Migrations/20181007180454_StandardizePaths.cs
deleted file mode 100644
index 30f27043a0..0000000000
--- a/osu.Game/Migrations/20181007180454_StandardizePaths.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class StandardizePaths : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            string windowsStyle = @"\";
-            string standardized = "/";
-
-            // Escaping \ does not seem to be needed.
-            migrationBuilder.Sql($"UPDATE `BeatmapInfo` SET `Path` = REPLACE(`Path`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapMetadata` SET `AudioFile` = REPLACE(`AudioFile`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapMetadata` SET `BackgroundFile` = REPLACE(`BackgroundFile`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapSetFileInfo` SET `Filename` = REPLACE(`Filename`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `SkinFileInfo` SET `Filename` = REPLACE(`Filename`, '{windowsStyle}', '{standardized}')");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs b/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
deleted file mode 100644
index 120674671a..0000000000
--- a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181128100659_AddSkinInfoHash")]
-    partial class AddSkinInfoHash
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs b/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
deleted file mode 100644
index ee825a1e9c..0000000000
--- a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkinInfoHash : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Hash",
-                table: "SkinInfo",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinInfo_DeletePending",
-                table: "SkinInfo",
-                column: "DeletePending");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinInfo_Hash",
-                table: "SkinInfo",
-                column: "Hash",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_SkinInfo_DeletePending",
-                table: "SkinInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_SkinInfo_Hash",
-                table: "SkinInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Hash",
-                table: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs b/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
deleted file mode 100644
index eee53182ce..0000000000
--- a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
+++ /dev/null
@@ -1,484 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181130113755_AddScoreInfoTables")]
-    partial class AddScoreInfoTables
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<int>("TotalScore");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany()
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs b/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
deleted file mode 100644
index 58980132f3..0000000000
--- a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddScoreInfoTables : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "ScoreInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Rank = table.Column<int>(nullable: false),
-                    TotalScore = table.Column<int>(nullable: false),
-                    Accuracy = table.Column<double>(type: "DECIMAL(1,4)", nullable: false),
-                    PP = table.Column<double>(nullable: true),
-                    MaxCombo = table.Column<int>(nullable: false),
-                    Combo = table.Column<int>(nullable: false),
-                    RulesetID = table.Column<int>(nullable: false),
-                    Mods = table.Column<string>(nullable: true),
-                    User = table.Column<string>(nullable: true),
-                    BeatmapInfoID = table.Column<int>(nullable: false),
-                    OnlineScoreID = table.Column<long>(nullable: true),
-                    Date = table.Column<DateTimeOffset>(nullable: false),
-                    Statistics = table.Column<string>(nullable: true),
-                    Hash = table.Column<string>(nullable: true),
-                    DeletePending = table.Column<bool>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScoreInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_ScoreInfo_BeatmapInfo_BeatmapInfoID",
-                        column: x => x.BeatmapInfoID,
-                        principalTable: "BeatmapInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ScoreInfo_RulesetInfo_RulesetID",
-                        column: x => x.RulesetID,
-                        principalTable: "RulesetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ScoreFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    FileInfoID = table.Column<int>(nullable: false),
-                    Filename = table.Column<string>(nullable: false),
-                    ScoreInfoID = table.Column<int>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScoreFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_ScoreFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ScoreFileInfo_ScoreInfo_ScoreInfoID",
-                        column: x => x.ScoreInfoID,
-                        principalTable: "ScoreInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreFileInfo_FileInfoID",
-                table: "ScoreFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreFileInfo_ScoreInfoID",
-                table: "ScoreFileInfo",
-                column: "ScoreInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_BeatmapInfoID",
-                table: "ScoreInfo",
-                column: "BeatmapInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_OnlineScoreID",
-                table: "ScoreInfo",
-                column: "OnlineScoreID",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_RulesetID",
-                table: "ScoreInfo",
-                column: "RulesetID");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ScoreFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "ScoreInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs b/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
deleted file mode 100644
index 8e1e3a59f3..0000000000
--- a/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190225062029_AddUserIDColumn")]
-    partial class AddUserIDColumn
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<int>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs b/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
deleted file mode 100644
index f2eef600dc..0000000000
--- a/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddUserIDColumn : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<long>(
-                name: "UserID",
-                table: "ScoreInfo",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "UserID",
-                table: "ScoreInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs b/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
deleted file mode 100644
index 348c42adb9..0000000000
--- a/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
+++ /dev/null
@@ -1,498 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190525060824_SkinSettings")]
-    partial class SkinSettings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190525060824_SkinSettings.cs b/osu.Game/Migrations/20190525060824_SkinSettings.cs
deleted file mode 100644
index 7779b55bb7..0000000000
--- a/osu.Game/Migrations/20190525060824_SkinSettings.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class SkinSettings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(@"create table Settings_dg_tmp
-            (
-	            ID INTEGER not null
-		            constraint PK_Settings
-			            primary key autoincrement,
-	            Key TEXT not null,
-	            RulesetID INTEGER,
-	            Value TEXT,
-	            Variant INTEGER,
-	            SkinInfoID int
-		            constraint Settings_SkinInfo_ID_fk
-			            references SkinInfo
-				            on delete restrict
-            );
-
-            insert into Settings_dg_tmp(ID, Key, RulesetID, Value, Variant) select ID, Key, RulesetID, Value, Variant from Settings;
-
-            drop table Settings;
-
-            alter table Settings_dg_tmp rename to Settings;
-
-            create index IX_Settings_RulesetID_Variant
-	            on Settings (RulesetID, Variant);
-
-            create index Settings_SkinInfoID_index
-	            on Settings (SkinInfoID);
-
-            ");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Settings_SkinInfo_SkinInfoID",
-                table: "Settings");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Settings_SkinInfoID",
-                table: "Settings");
-
-            migrationBuilder.DropColumn(
-                name: "SkinInfoID",
-                table: "Settings");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs b/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
deleted file mode 100644
index 9477369aa0..0000000000
--- a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190605091246_AddDateAddedColumnToBeatmapSet")]
-    partial class AddDateAddedColumnToBeatmapSet
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs b/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
deleted file mode 100644
index 0620a0624f..0000000000
--- a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddDateAddedColumnToBeatmapSet : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<DateTimeOffset>(
-                name: "DateAdded",
-                table: "BeatmapSetInfo",
-                nullable: false,
-                defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DateAdded",
-                table: "BeatmapSetInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs b/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
deleted file mode 100644
index c5fcc16f84..0000000000
--- a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
+++ /dev/null
@@ -1,504 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190708070844_AddBPMAndLengthColumns")]
-    partial class AddBPMAndLengthColumns
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs b/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
deleted file mode 100644
index f8ce354aa1..0000000000
--- a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBPMAndLengthColumns : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<double>(
-                name: "BPM",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0.0);
-
-            migrationBuilder.AddColumn<double>(
-                name: "Length",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0.0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "BPM",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Length",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs b/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
deleted file mode 100644
index 826233a2b0..0000000000
--- a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190913104727_AddBeatmapVideo")]
-    partial class AddBeatmapVideo
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs b/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
deleted file mode 100644
index af82b4db20..0000000000
--- a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBeatmapVideo : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "VideoFile",
-                table: "BeatmapMetadata",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "VideoFile",
-                table: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
deleted file mode 100644
index 22316b0380..0000000000
--- a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20200302094919_RefreshVolumeBindings")]
-    partial class RefreshVolumeBindings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
deleted file mode 100644
index 3d2ddbf6fc..0000000000
--- a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RefreshVolumeBindings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
deleted file mode 100644
index 1c05de832e..0000000000
--- a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20201019224408_AddEpilepsyWarning")]
-    partial class AddEpilepsyWarning
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
deleted file mode 100644
index 58a35a7bf3..0000000000
--- a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddEpilepsyWarning : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "EpilepsyWarning",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "EpilepsyWarning",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
deleted file mode 100644
index 2c100d39b9..0000000000
--- a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210412045700_RefreshVolumeBindingsAgain")]
-    partial class RefreshVolumeBindingsAgain
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
deleted file mode 100644
index 4d3941dd20..0000000000
--- a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RefreshVolumeBindingsAgain : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
deleted file mode 100644
index b808c648da..0000000000
--- a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210511060743_AddSkinInstantiationInfo")]
-    partial class AddSkinInstantiationInfo
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
deleted file mode 100644
index 887635fa85..0000000000
--- a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkinInstantiationInfo : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "InstantiationInfo",
-                table: "SkinInfo",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "InstantiationInfo",
-                table: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
deleted file mode 100644
index 89bab3a0fa..0000000000
--- a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210514062639_AddAuthorIdToBeatmapMetadata")]
-    partial class AddAuthorIdToBeatmapMetadata
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
deleted file mode 100644
index 7b579e27b9..0000000000
--- a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddAuthorIdToBeatmapMetadata : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "AuthorID",
-                table: "BeatmapMetadata",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "AuthorID",
-                table: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs b/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
deleted file mode 100644
index afeb42130d..0000000000
--- a/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210824185035_AddCountdownSettings")]
-    partial class AddCountdownSettings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs b/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
deleted file mode 100644
index d1b09e2c1d..0000000000
--- a/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddCountdownSettings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "CountdownOffset",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "CountdownOffset",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs b/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
deleted file mode 100644
index 6e53d7fae0..0000000000
--- a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210912144011_AddSamplesMatchPlaybackRate")]
-    partial class AddSamplesMatchPlaybackRate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SamplesMatchPlaybackRate");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs b/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
deleted file mode 100644
index f6fc1f4420..0000000000
--- a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSamplesMatchPlaybackRate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "SamplesMatchPlaybackRate",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SamplesMatchPlaybackRate",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs b/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
deleted file mode 100644
index 6d53c019ec..0000000000
--- a/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20211020081609_ResetSkinHashes")]
-    public partial class ResetSkinHashes : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"UPDATE SkinInfo SET Hash = null");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
deleted file mode 100644
index 036c26cb0a..0000000000
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    partial class OsuDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SamplesMatchPlaybackRate");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 97142d5472..b30a065371 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -199,11 +199,6 @@ namespace osu.Game
 
         private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(global_track_volume_adjust);
 
-        /// <summary>
-        /// A legacy EF context factory if migration has not been performed to realm yet.
-        /// </summary>
-        protected DatabaseContextFactory EFContextFactory { get; private set; }
-
         /// <summary>
         /// Number of unhandled exceptions to allow before aborting execution.
         /// </summary>
@@ -242,10 +237,7 @@ namespace osu.Game
 
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 
-            if (Storage.Exists(DatabaseContextFactory.DATABASE_NAME))
-                dependencies.Cache(EFContextFactory = new DatabaseContextFactory(Storage));
-
-            dependencies.Cache(realm = new RealmAccess(Storage, CLIENT_DATABASE_FILENAME, Host.UpdateThread, EFContextFactory));
+            dependencies.Cache(realm = new RealmAccess(Storage, CLIENT_DATABASE_FILENAME, Host.UpdateThread));
 
             dependencies.CacheAs<RulesetStore>(RulesetStore = new RealmRulesetStore(realm, Storage));
             dependencies.CacheAs<IRulesetStore>(RulesetStore);
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index dbb1278d76..afba00274c 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -14,7 +14,6 @@ using osu.Game.Screens.Menu;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using IntroSequence = osu.Game.Configuration.IntroSequence;
 
@@ -66,32 +65,13 @@ namespace osu.Game.Screens
 
         protected virtual ShaderPrecompiler CreateShaderPrecompiler() => new ShaderPrecompiler();
 
-        [Resolved(canBeNull: true)]
-        private DatabaseContextFactory efContextFactory { get; set; }
-
-        private EFToRealmMigrator realmMigrator;
-
         public override void OnEntering(ScreenTransitionEvent e)
         {
             base.OnEntering(e);
 
             LoadComponentAsync(precompiler = CreateShaderPrecompiler(), AddInternal);
 
-            // A non-null context factory means there's still content to migrate.
-            if (efContextFactory != null)
-            {
-                LoadComponentAsync(realmMigrator = new EFToRealmMigrator(), AddInternal);
-                realmMigrator.MigrationCompleted.ContinueWith(_ => Schedule(() =>
-                {
-                    // Delay initial screen loading to ensure that the migration is in a complete and sane state
-                    // before the intro screen may import the game intro beatmap.
-                    LoadComponentAsync(loadableScreen = CreateLoadableScreen());
-                }));
-            }
-            else
-            {
-                LoadComponentAsync(loadableScreen = CreateLoadableScreen());
-            }
+            LoadComponentAsync(loadableScreen = CreateLoadableScreen());
 
             LoadComponentAsync(spinner = new LoadingSpinner(true, true)
             {
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 3ad29ea6db..44df495929 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -807,7 +807,6 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Microsoft_002EExtensions_002ELogging_002E_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Microsoft_002EToolkit_002EHighPerformance_002EBox_002A/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=NUnit_002EFramework_002EInternal_002ELogger/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=OpenTabletDriver_002EPlugin_002EDependencyInjection_002E_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Realms_002ELogging_002ELogger/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=System_002EComponentModel_002EComponent/@EntryIndexedValue">True</s:Boolean>

From 0aa92c78ec0ae000f8f241db3b5a65a6ea28b7bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:34:35 +0900
Subject: [PATCH 55/65] Add local sqlite initialisation to
 `BeatmapUpdaterMetadataLookup` for now

---
 osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index aa773da6d3..007bec46bb 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -19,6 +19,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.BZip2;
+using SQLitePCL;
 
 namespace osu.Game.Beatmaps
 {
@@ -41,6 +42,10 @@ namespace osu.Game.Beatmaps
 
         public BeatmapUpdaterMetadataLookup(IAPIProvider api, Storage storage)
         {
+            // required to initialise native SQLite libraries on some platforms.
+            Batteries_V2.Init();
+            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+
             this.api = api;
             this.storage = storage;
 

From 581a4d2d6d033069af55d972e345f0d63b29a2fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:39:59 +0900
Subject: [PATCH 56/65] Use `APIBeatmap` for realm migration requiring
 `ShortName` mapping

---
 osu.Game/Database/RealmAccess.cs              | 20 ++++++++++++-------
 .../API/Requests/Responses/APIBeatmap.cs      |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index e23fc912df..cefc7da503 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -24,6 +24,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -45,8 +46,6 @@ namespace osu.Game.Database
         /// </summary>
         public readonly string Filename;
 
-        private readonly IDatabaseContextFactory? efContextFactory;
-
         private readonly SynchronizationContext? updateThreadSyncContext;
 
         /// <summary>
@@ -162,11 +161,9 @@ namespace osu.Game.Database
         /// <param name="storage">The game storage which will be used to create the realm backing file.</param>
         /// <param name="filename">The filename to use for the realm backing file. A ".realm" extension will be added automatically if not specified.</param>
         /// <param name="updateThread">The game update thread, used to post realm operations into a thread-safe context.</param>
-        /// <param name="efContextFactory">An EF factory used only for migration purposes.</param>
-        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null, IDatabaseContextFactory? efContextFactory = null)
+        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null)
         {
             this.storage = storage;
-            this.efContextFactory = efContextFactory;
 
             updateThreadSyncContext = updateThread?.SynchronizationContext ?? SynchronizationContext.Current;
 
@@ -876,8 +873,17 @@ namespace osu.Game.Database
             }
         }
 
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory?.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
+        private string? getRulesetShortNameFromLegacyID(long rulesetId)
+        {
+            try
+            {
+                return new APIBeatmap.APIRuleset { OnlineID = (int)rulesetId }.ShortName;
+            }
+            catch
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// Create a full realm backup.
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 3fee81cf33..8a77801c3a 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool Equals(IBeatmapInfo? other) => other is APIBeatmap b && this.MatchesOnlineID(b);
 
-        private class APIRuleset : IRulesetInfo
+        public class APIRuleset : IRulesetInfo
         {
             public int OnlineID { get; set; } = -1;
 

From 65d1c40dd54ec556ca28e30f01bfb16a56a5e048 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:47:26 +0900
Subject: [PATCH 57/65] Remove remaining package references and replace with
 `SQLitePCLRaw` direct reference

This may require further consideration for test and iOS projects.
---
 .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj              | 1 -
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                   | 1 -
 .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj             | 1 -
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                   | 1 -
 osu.Desktop/osu.Desktop.csproj                                | 1 -
 .../osu.Game.Rulesets.Catch.Tests.csproj                      | 1 -
 .../osu.Game.Rulesets.Mania.Tests.csproj                      | 1 -
 .../osu.Game.Rulesets.Osu.Tests.csproj                        | 1 -
 .../osu.Game.Rulesets.Taiko.Tests.csproj                      | 1 -
 osu.Game.Tests/osu.Game.Tests.csproj                          | 1 -
 osu.Game/osu.Game.csproj                                      | 4 ++--
 osu.iOS.props                                                 | 2 --
 12 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
index 011a37cbdc..b8604169aa 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index c04f6132f3..4117452579 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
index 529054fd4f..0b119c8680 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index c04f6132f3..4117452579 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 8ef480d4e3..3f926ed45a 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,7 +27,6 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 3ac1491946..d45f8a9692 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index d07df75864..2951076591 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 36c40c0fe2..c2973644cf 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -5,7 +5,6 @@
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index 51d4bbc630..e8eaff4368 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 65679deb01..2572864e09 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,6 @@
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fabef87c28..953087f9c8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,8 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -41,6 +40,7 @@
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 89166f924c..496bfbb85c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -81,8 +81,6 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />

From 28b15e232df3d8b6b9cc38b14d22819510e7b2f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:59:03 +0900
Subject: [PATCH 58/65] Remove all EF models

---
 osu.Game/Beatmaps/BeatmapSetFileInfo.cs  |  31 ---
 osu.Game/Beatmaps/EFBeatmapDifficulty.cs |  80 -------
 osu.Game/Beatmaps/EFBeatmapInfo.cs       | 183 ---------------
 osu.Game/Beatmaps/EFBeatmapMetadata.cs   |  89 --------
 osu.Game/Beatmaps/EFBeatmapSetInfo.cs    | 108 ---------
 osu.Game/Rulesets/EFRulesetInfo.cs       |  87 --------
 osu.Game/Scoring/EFScoreInfo.cs          | 272 -----------------------
 osu.Game/Scoring/ScoreFileInfo.cs        |  31 ---
 osu.Game/Skinning/EFSkinInfo.cs          |  65 ------
 osu.Game/Skinning/SkinFileInfo.cs        |  31 ---
 10 files changed, 977 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/BeatmapSetFileInfo.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapDifficulty.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapInfo.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapMetadata.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapSetInfo.cs
 delete mode 100644 osu.Game/Rulesets/EFRulesetInfo.cs
 delete mode 100644 osu.Game/Scoring/EFScoreInfo.cs
 delete mode 100644 osu.Game/Scoring/ScoreFileInfo.cs
 delete mode 100644 osu.Game/Skinning/EFSkinInfo.cs
 delete mode 100644 osu.Game/Skinning/SkinFileInfo.cs

diff --git a/osu.Game/Beatmaps/BeatmapSetFileInfo.cs b/osu.Game/Beatmaps/BeatmapSetFileInfo.cs
deleted file mode 100644
index 051366fb99..0000000000
--- a/osu.Game/Beatmaps/BeatmapSetFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapSetFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapSetInfoID { get; set; }
-
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapDifficulty.cs b/osu.Game/Beatmaps/EFBeatmapDifficulty.cs
deleted file mode 100644
index 8bcac24ca1..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapDifficulty.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using osu.Game.Database;
-
-namespace osu.Game.Beatmaps
-{
-    [Table(@"BeatmapDifficulty")]
-    public class EFBeatmapDifficulty : IHasPrimaryKey, IBeatmapDifficultyInfo
-    {
-        /// <summary>
-        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
-        /// </summary>
-        public const float DEFAULT_DIFFICULTY = 5;
-
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
-        public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
-        public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
-
-        private float? approachRate;
-
-        public EFBeatmapDifficulty()
-        {
-        }
-
-        public EFBeatmapDifficulty(IBeatmapDifficultyInfo source)
-        {
-            CopyFrom(source);
-        }
-
-        public float ApproachRate
-        {
-            get => approachRate ?? OverallDifficulty;
-            set => approachRate = value;
-        }
-
-        public double SliderMultiplier { get; set; } = 1;
-        public double SliderTickRate { get; set; } = 1;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapDifficulty"/>.
-        /// </summary>
-        public EFBeatmapDifficulty Clone()
-        {
-            var diff = (EFBeatmapDifficulty)Activator.CreateInstance(GetType());
-            CopyTo(diff);
-            return diff;
-        }
-
-        public virtual void CopyFrom(IBeatmapDifficultyInfo other)
-        {
-            ApproachRate = other.ApproachRate;
-            DrainRate = other.DrainRate;
-            CircleSize = other.CircleSize;
-            OverallDifficulty = other.OverallDifficulty;
-
-            SliderMultiplier = other.SliderMultiplier;
-            SliderTickRate = other.SliderTickRate;
-        }
-
-        public virtual void CopyTo(EFBeatmapDifficulty other)
-        {
-            other.ApproachRate = ApproachRate;
-            other.DrainRate = DrainRate;
-            other.CircleSize = CircleSize;
-            other.OverallDifficulty = OverallDifficulty;
-
-            other.SliderMultiplier = SliderMultiplier;
-            other.SliderTickRate = SliderTickRate;
-        }
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapInfo.cs b/osu.Game/Beatmaps/EFBeatmapInfo.cs
deleted file mode 100644
index 20abdc686a..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapInfo.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapInfo")]
-    public class EFBeatmapInfo : IEquatable<EFBeatmapInfo>, IHasPrimaryKey, IBeatmapInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapVersion;
-
-        private int? onlineID;
-
-        [JsonProperty("id")]
-        [Column("OnlineBeatmapID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        [JsonIgnore]
-        public int BeatmapSetInfoID { get; set; }
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        [Required]
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [JsonIgnore]
-        public int BaseDifficultyID { get; set; }
-
-        public EFBeatmapDifficulty BaseDifficulty { get; set; }
-
-        [NotMapped]
-        public APIBeatmap OnlineInfo { get; set; }
-
-        /// <summary>
-        /// The playable length in milliseconds of this beatmap.
-        /// </summary>
-        public double Length { get; set; }
-
-        /// <summary>
-        /// The most common BPM of this beatmap.
-        /// </summary>
-        public double BPM { get; set; }
-
-        public string Path { get; set; }
-
-        [JsonProperty("file_sha2")]
-        public string Hash { get; set; }
-
-        [JsonIgnore]
-        public bool Hidden { get; set; }
-
-        /// <summary>
-        /// MD5 is kept for legacy support (matching against replays, osu-web-10 etc.).
-        /// </summary>
-        [JsonProperty("file_md5")]
-        public string MD5Hash { get; set; }
-
-        // General
-        public double AudioLeadIn { get; set; }
-        public float StackLeniency { get; set; } = 0.7f;
-        public bool SpecialStyle { get; set; }
-
-        [Column("RulesetID")]
-        public int RulesetInfoID { get; set; }
-
-        public EFRulesetInfo RulesetInfo { get; set; }
-
-        public bool LetterboxInBreaks { get; set; }
-        public bool WidescreenStoryboard { get; set; }
-        public bool EpilepsyWarning { get; set; }
-
-        /// <summary>
-        /// Whether or not sound samples should change rate when playing with speed-changing mods.
-        /// TODO: only read/write supported for now, requires implementation in gameplay.
-        /// </summary>
-        public bool SamplesMatchPlaybackRate { get; set; }
-
-        public CountdownType Countdown { get; set; } = CountdownType.Normal;
-
-        /// <summary>
-        /// The number of beats to move the countdown backwards (compared to its default location).
-        /// </summary>
-        public int CountdownOffset { get; set; }
-
-        [NotMapped]
-        public int[] Bookmarks { get; set; } = Array.Empty<int>();
-
-        public double DistanceSpacing { get; set; }
-        public int BeatDivisor { get; set; }
-        public int GridSize { get; set; }
-        public double TimelineZoom { get; set; }
-
-        // Metadata
-        [Column("Version")]
-        public string DifficultyName { get; set; }
-
-        [JsonProperty("difficulty_rating")]
-        [Column("StarDifficulty")]
-        public double StarRating { get; set; }
-
-        /// <summary>
-        /// Currently only populated for beatmap deletion. Use <see cref="ScoreManager"/> to query scores.
-        /// </summary>
-        public List<EFScoreInfo> Scores { get; set; }
-
-        [JsonIgnore]
-        public DifficultyRating DifficultyRating => StarDifficulty.GetDifficultyRating(StarRating);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        public bool Equals(EFBeatmapInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapInfo other) => other is EFBeatmapInfo b && Equals(b);
-
-        public bool AudioEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                        BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                        (Metadata ?? BeatmapSetInfo.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).AudioFile;
-
-        public bool BackgroundEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                             BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                             (Metadata ?? BeatmapSetInfo.Metadata).BackgroundFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).BackgroundFile;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapInfo"/>.
-        /// </summary>
-        public EFBeatmapInfo Clone() => (EFBeatmapInfo)MemberwiseClone();
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapInfo
-
-        [JsonIgnore]
-        IBeatmapMetadataInfo IBeatmapInfo.Metadata => Metadata ?? BeatmapSetInfo?.Metadata ?? new EFBeatmapMetadata();
-
-        [JsonIgnore]
-        IBeatmapDifficultyInfo IBeatmapInfo.Difficulty => BaseDifficulty;
-
-        [JsonIgnore]
-        IBeatmapSetInfo IBeatmapInfo.BeatmapSet => BeatmapSetInfo;
-
-        [JsonIgnore]
-        IRulesetInfo IBeatmapInfo.Ruleset => RulesetInfo;
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapMetadata.cs b/osu.Game/Beatmaps/EFBeatmapMetadata.cs
deleted file mode 100644
index c0588f128c..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapMetadata.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Users;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapMetadata")]
-    public class EFBeatmapMetadata : IEquatable<EFBeatmapMetadata>, IHasPrimaryKey, IBeatmapMetadataInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public string Title { get; set; } = string.Empty;
-
-        [JsonProperty("title_unicode")]
-        public string TitleUnicode { get; set; } = string.Empty;
-
-        public string Artist { get; set; } = string.Empty;
-
-        [JsonProperty("artist_unicode")]
-        public string ArtistUnicode { get; set; } = string.Empty;
-
-        [JsonIgnore]
-        public List<EFBeatmapInfo> Beatmaps { get; set; } = new List<EFBeatmapInfo>();
-
-        [JsonIgnore]
-        public List<EFBeatmapSetInfo> BeatmapSets { get; set; } = new List<EFBeatmapSetInfo>();
-
-        /// <summary>
-        /// The author of the beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public APIUser Author = new APIUser();
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"user_id")]
-        [Column("AuthorID")]
-        public int AuthorID
-        {
-            get => Author.Id; // This should not be used, but is required to make EF work correctly.
-            set => Author.Id = value;
-        }
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"creator")]
-        [Column("Author")]
-        public string AuthorString
-        {
-            get => Author.Username; // This should not be used, but is required to make EF work correctly.
-            set => Author.Username = value;
-        }
-
-        public string Source { get; set; } = string.Empty;
-
-        [JsonProperty(@"tags")]
-        public string Tags { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The time in milliseconds to begin playing the track for preview purposes.
-        /// If -1, the track should begin playing at 40% of its length.
-        /// </summary>
-        public int PreviewTime { get; set; } = -1;
-
-        public string AudioFile { get; set; } = string.Empty;
-
-        public string BackgroundFile { get; set; } = string.Empty;
-
-        public bool Equals(EFBeatmapMetadata other) => ((IBeatmapMetadataInfo)this).Equals(other);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        IUser IBeatmapMetadataInfo.Author => Author;
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapSetInfo.cs b/osu.Game/Beatmaps/EFBeatmapSetInfo.cs
deleted file mode 100644
index 1f41d3727c..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapSetInfo.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Extensions;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapSetInfo")]
-    public class EFBeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<EFBeatmapSetInfo>, IBeatmapSetInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        private int? onlineID;
-
-        [Column("OnlineBeatmapSetID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        public DateTimeOffset DateAdded { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [NotNull]
-        public List<EFBeatmapInfo> Beatmaps { get; } = new List<EFBeatmapInfo>();
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        public List<BeatmapSetFileInfo> Files { get; } = new List<BeatmapSetFileInfo>();
-
-        /// <summary>
-        /// The maximum star difficulty of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxStarDifficulty => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.StarRating);
-
-        /// <summary>
-        /// The maximum playable length in milliseconds of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxLength => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.Length);
-
-        /// <summary>
-        /// The maximum BPM of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxBPM => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.BPM);
-
-        [NotMapped]
-        public bool DeletePending { get; set; }
-
-        public string Hash { get; set; }
-
-        /// <summary>
-        /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
-        /// The path returned is relative to the user file storage.
-        /// </summary>
-        /// <param name="filename">The name of the file to get the storage path of.</param>
-        public string GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.GetStoragePath();
-
-        public override string ToString() => Metadata?.ToString() ?? base.ToString();
-
-        public bool Protected { get; set; }
-
-        public bool Equals(EFBeatmapSetInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapSetInfo other) => other is EFBeatmapSetInfo b && Equals(b);
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapSetInfo
-
-        IBeatmapMetadataInfo IBeatmapSetInfo.Metadata => Metadata ?? Beatmaps.FirstOrDefault()?.Metadata ?? new EFBeatmapMetadata();
-        IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Rulesets/EFRulesetInfo.cs b/osu.Game/Rulesets/EFRulesetInfo.cs
deleted file mode 100644
index bd67bdb93c..0000000000
--- a/osu.Game/Rulesets/EFRulesetInfo.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics.CodeAnalysis;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-
-namespace osu.Game.Rulesets
-{
-    [ExcludeFromDynamicCompile]
-    [Table(@"RulesetInfo")]
-    public sealed class EFRulesetInfo : IEquatable<EFRulesetInfo>, IComparable<EFRulesetInfo>, IRulesetInfo
-    {
-        public int? ID { get; set; }
-
-        public string Name { get; set; }
-
-        public string ShortName { get; set; }
-
-        public string InstantiationInfo { get; set; }
-
-        [JsonIgnore]
-        public bool Available { get; set; }
-
-        // TODO: this should probably be moved to RulesetStore.
-        public Ruleset CreateInstance()
-        {
-            if (!Available)
-                return null;
-
-            var type = Type.GetType(InstantiationInfo);
-
-            if (type == null)
-                return null;
-
-            var ruleset = Activator.CreateInstance(type) as Ruleset;
-
-            return ruleset;
-        }
-
-        public bool Equals(EFRulesetInfo other) => other != null && ID == other.ID && Available == other.Available && Name == other.Name && InstantiationInfo == other.InstantiationInfo;
-
-        public int CompareTo(EFRulesetInfo other) => OnlineID.CompareTo(other.OnlineID);
-
-        public int CompareTo(IRulesetInfo other)
-        {
-            if (!(other is EFRulesetInfo ruleset))
-                throw new ArgumentException($@"Object is not of type {nameof(EFRulesetInfo)}.", nameof(other));
-
-            return CompareTo(ruleset);
-        }
-
-        public override bool Equals(object obj) => obj is EFRulesetInfo rulesetInfo && Equals(rulesetInfo);
-
-        public bool Equals(IRulesetInfo other) => other is RulesetInfo b && Equals(b);
-
-        [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = ID.HasValue ? ID.GetHashCode() : 0;
-                hashCode = (hashCode * 397) ^ (InstantiationInfo != null ? InstantiationInfo.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (Name != null ? Name.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ Available.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        public override string ToString() => Name ?? $"{Name} ({ShortName}) ID: {ID}";
-
-        #region Implementation of IHasOnlineID
-
-        [NotMapped]
-        public int OnlineID
-        {
-            get => ID ?? -1;
-            set => ID = value >= 0 ? value : null;
-        }
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Scoring/EFScoreInfo.cs b/osu.Game/Scoring/EFScoreInfo.cs
deleted file mode 100644
index 8a5bbbf0da..0000000000
--- a/osu.Game/Scoring/EFScoreInfo.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using Newtonsoft.Json;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Users;
-using osu.Game.Utils;
-
-namespace osu.Game.Scoring
-{
-    [Table(@"ScoreInfo")]
-    public class EFScoreInfo : IScoreInfo, IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<EFScoreInfo>, IDeepCloneable<EFScoreInfo>
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public ScoreRank Rank { get; set; }
-
-        public long TotalScore { get; set; }
-
-        [Column(TypeName = "DECIMAL(1,4)")] // TODO: This data type is wrong (should contain more precision). But at the same time, we probably don't need to be storing this in the database.
-        public double Accuracy { get; set; }
-
-        public LocalisableString DisplayAccuracy => Accuracy.FormatAccuracy();
-
-        public double? PP { get; set; }
-
-        public int MaxCombo { get; set; }
-
-        public int Combo { get; set; } // Todo: Shouldn't exist in here
-
-        public int RulesetID { get; set; }
-
-        [NotMapped]
-        public bool Passed { get; set; } = true;
-
-        public EFRulesetInfo Ruleset { get; set; }
-
-        private APIMod[] localAPIMods;
-
-        private Mod[] mods;
-
-        [NotMapped]
-        public Mod[] Mods
-        {
-            get
-            {
-                var rulesetInstance = Ruleset?.CreateInstance();
-                if (rulesetInstance == null)
-                    return mods ?? Array.Empty<Mod>();
-
-                Mod[] scoreMods = Array.Empty<Mod>();
-
-                if (mods != null)
-                    scoreMods = mods;
-                else if (localAPIMods != null)
-                    scoreMods = APIMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
-
-                return scoreMods;
-            }
-            set
-            {
-                localAPIMods = null;
-                mods = value;
-            }
-        }
-
-        // Used for API serialisation/deserialisation.
-        [NotMapped]
-        public APIMod[] APIMods
-        {
-            get
-            {
-                if (localAPIMods != null)
-                    return localAPIMods;
-
-                if (mods == null)
-                    return Array.Empty<APIMod>();
-
-                return localAPIMods = mods.Select(m => new APIMod(m)).ToArray();
-            }
-            set
-            {
-                localAPIMods = value;
-
-                // We potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
-                mods = null;
-            }
-        }
-
-        // Used for database serialisation/deserialisation.
-        [Column("Mods")]
-        public string ModsJson
-        {
-            get => JsonConvert.SerializeObject(APIMods);
-            set => APIMods = !string.IsNullOrEmpty(value) ? JsonConvert.DeserializeObject<APIMod[]>(value) : Array.Empty<APIMod>();
-        }
-
-        [NotMapped]
-        public APIUser User { get; set; }
-
-        [Column("User")]
-        public string UserString
-        {
-            get => User?.Username;
-            set
-            {
-                User ??= new APIUser();
-                User.Username = value;
-            }
-        }
-
-        [Column("UserID")]
-        public int? UserID
-        {
-            get => User?.Id ?? 1;
-            set
-            {
-                User ??= new APIUser();
-                User.Id = value ?? 1;
-            }
-        }
-
-        public int BeatmapInfoID { get; set; }
-
-        [Column("Beatmap")]
-        public EFBeatmapInfo BeatmapInfo { get; set; }
-
-        private long? onlineID;
-
-        [JsonProperty("id")]
-        [Column("OnlineScoreID")]
-        public long? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        public DateTimeOffset Date { get; set; }
-
-        [NotMapped]
-        public Dictionary<HitResult, int> Statistics { get; set; } = new Dictionary<HitResult, int>();
-
-        [Column("Statistics")]
-        public string StatisticsJson
-        {
-            get => JsonConvert.SerializeObject(Statistics);
-            set
-            {
-                if (value == null)
-                {
-                    Statistics.Clear();
-                    return;
-                }
-
-                Statistics = JsonConvert.DeserializeObject<Dictionary<HitResult, int>>(value);
-            }
-        }
-
-        [NotMapped]
-        public List<HitEvent> HitEvents { get; set; }
-
-        public List<ScoreFileInfo> Files { get; } = new List<ScoreFileInfo>();
-
-        public string Hash { get; set; }
-
-        public bool DeletePending { get; set; }
-
-        /// <summary>
-        /// The position of this score, starting at 1.
-        /// </summary>
-        [NotMapped]
-        public int? Position { get; set; } // TODO: remove after all calls to `CreateScoreInfo` are gone.
-
-        /// <summary>
-        /// Whether this <see cref="EFScoreInfo"/> represents a legacy (osu!stable) score.
-        /// </summary>
-        [NotMapped]
-        public bool IsLegacyScore => Mods.OfType<ModClassic>().Any();
-
-        public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
-        {
-            foreach (var r in Ruleset.CreateInstance().GetHitResults())
-            {
-                int value = Statistics.GetValueOrDefault(r.result);
-
-                switch (r.result)
-                {
-                    case HitResult.SmallTickHit:
-                    {
-                        int total = value + Statistics.GetValueOrDefault(HitResult.SmallTickMiss);
-                        if (total > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
-
-                        break;
-                    }
-
-                    case HitResult.LargeTickHit:
-                    {
-                        int total = value + Statistics.GetValueOrDefault(HitResult.LargeTickMiss);
-                        if (total > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
-
-                        break;
-                    }
-
-                    case HitResult.SmallTickMiss:
-                    case HitResult.LargeTickMiss:
-                        break;
-
-                    default:
-                        yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
-
-                        break;
-                }
-            }
-        }
-
-        public EFScoreInfo DeepClone()
-        {
-            var clone = (EFScoreInfo)MemberwiseClone();
-
-            clone.Statistics = new Dictionary<HitResult, int>(clone.Statistics);
-
-            return clone;
-        }
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        public bool Equals(EFScoreInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        #region Implementation of IHasOnlineID
-
-        long IHasOnlineID<long>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IScoreInfo
-
-        IBeatmapInfo IScoreInfo.Beatmap => BeatmapInfo;
-        IRulesetInfo IScoreInfo.Ruleset => Ruleset;
-        IUser IScoreInfo.User => User;
-        bool IScoreInfo.HasReplay => Files.Any();
-
-        #endregion
-
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-    }
-}
diff --git a/osu.Game/Scoring/ScoreFileInfo.cs b/osu.Game/Scoring/ScoreFileInfo.cs
deleted file mode 100644
index 6c3509bccd..0000000000
--- a/osu.Game/Scoring/ScoreFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Scoring
-{
-    public class ScoreFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int ScoreInfoID { get; set; }
-
-        public EFScoreInfo ScoreInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}
diff --git a/osu.Game/Skinning/EFSkinInfo.cs b/osu.Game/Skinning/EFSkinInfo.cs
deleted file mode 100644
index 4204364c50..0000000000
--- a/osu.Game/Skinning/EFSkinInfo.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Game.Database;
-using osu.Game.Extensions;
-using osu.Game.IO;
-
-namespace osu.Game.Skinning
-{
-    [Table(@"SkinInfo")]
-    public class EFSkinInfo : IHasFiles<SkinFileInfo>, IEquatable<EFSkinInfo>, IHasPrimaryKey, ISoftDelete
-    {
-        internal const int DEFAULT_SKIN = 0;
-        internal const int CLASSIC_SKIN = -1;
-        internal const int RANDOM_SKIN = -2;
-
-        public int ID { get; set; }
-
-        public string Name { get; set; } = string.Empty;
-
-        public string Creator { get; set; } = string.Empty;
-
-        public string Hash { get; set; }
-
-        public string InstantiationInfo { get; set; }
-
-        public virtual Skin CreateInstance(IStorageResourceProvider resources)
-        {
-            var type = string.IsNullOrEmpty(InstantiationInfo)
-                // handle the case of skins imported before InstantiationInfo was added.
-                ? typeof(LegacySkin)
-                : Type.GetType(InstantiationInfo).AsNonNull();
-
-            return (Skin)Activator.CreateInstance(type, this, resources);
-        }
-
-        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
-
-        public bool DeletePending { get; set; }
-
-        public static EFSkinInfo Default { get; } = new EFSkinInfo
-        {
-            ID = DEFAULT_SKIN,
-            Name = "osu! (triangles)",
-            Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultSkin).GetInvariantInstantiationInfo()
-        };
-
-        public bool Equals(EFSkinInfo other) => other != null && ID == other.ID;
-
-        public override string ToString()
-        {
-            string author = Creator == null ? string.Empty : $"({Creator})";
-            return $"{Name} {author}".Trim();
-        }
-
-        public bool IsManaged => ID > 0;
-    }
-}
diff --git a/osu.Game/Skinning/SkinFileInfo.cs b/osu.Game/Skinning/SkinFileInfo.cs
deleted file mode 100644
index f3243d3f24..0000000000
--- a/osu.Game/Skinning/SkinFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Skinning
-{
-    public class SkinFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int SkinInfoID { get; set; }
-
-        public EFSkinInfo SkinInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}

From 4af76b9f48fd1d4602319af4552bee120b89f2ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 19:55:18 +0900
Subject: [PATCH 59/65] Apply the same change to `HandleFlip`

---
 .../Edit/OsuSelectionHandler.cs               | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 280a35500a..eddc1390f0 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -127,16 +127,13 @@ namespace osu.Game.Rulesets.Osu.Edit
                 {
                     didFlip = true;
 
-                    var controlPoints = slider.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(new Vector2(
-                            (direction == Direction.Horizontal ? -1 : 1) * p.Position.X,
-                            (direction == Direction.Vertical ? -1 : 1) * p.Position.Y
-                        ), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    slider.Path.ControlPoints.Clear();
-                    slider.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (var cp in slider.Path.ControlPoints)
+                    {
+                        cp.Position = new Vector2(
+                            (direction == Direction.Horizontal ? -1 : 1) * cp.Position.X,
+                            (direction == Direction.Vertical ? -1 : 1) * cp.Position.Y
+                        );
+                    }
                 }
             }
 
@@ -186,8 +183,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 if (h is IHasPath path)
                 {
-                    foreach (PathControlPoint t in path.Path.ControlPoints)
-                        t.Position = RotatePointAroundOrigin(t.Position, Vector2.Zero, delta);
+                    foreach (PathControlPoint cp in path.Path.ControlPoints)
+                        cp.Position = RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
                 }
             }
 

From c7f8f948b928c9a240e6fc5f791ad07c7dd26746 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 17:36:14 +0900
Subject: [PATCH 60/65] Rename `CreateLegacySkinProvider` to
 `CreateSkinTransformer` and apply to all skins

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 11 +++++++++-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 11 +++++++++-
 .../TestSceneSliderApplication.cs             |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 11 +++++++++-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 11 +++++++++-
 .../Gameplay/TestSceneBeatmapSkinFallbacks.cs |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  8 +++++++-
 .../Skinning/RulesetSkinProvidingContainer.cs | 20 +++++++++----------
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  2 +-
 9 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 999b9f6e2c..5c9c95827a 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -182,7 +182,16 @@ namespace osu.Game.Rulesets.Catch
 
         public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new CatchDifficultyCalculator(RulesetInfo, beatmap);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new CatchLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new CatchLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public override PerformanceCalculator CreatePerformanceCalculator() => new CatchPerformanceCalculator();
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c6a5e8bdaa..061dedb07a 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -62,7 +62,16 @@ namespace osu.Game.Rulesets.Mania
 
         public override HitObjectComposer CreateHitObjectComposer() => new ManiaHitObjectComposer(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new ManiaLegacySkinTransformer(skin, beatmap);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new ManiaLegacySkinTransformer(skin, beatmap);
+            }
+
+            return null;
+        }
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index 08a62fe3ae..0169627867 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var tintingSkin = skinManager.GetSkin(DefaultLegacySkin.CreateInfo());
                 tintingSkin.Configuration.ConfigDictionary["AllowSliderBallTint"] = "1";
 
-                var provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(tintingSkin, Beatmap.Value.Beatmap);
+                var provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(tintingSkin, Beatmap.Value.Beatmap);
 
                 Child = new SkinProvidingContainer(provider)
                 {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 6af765361d..0a5b3139fc 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -231,7 +231,16 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSettingsSubsection CreateSettings() => new OsuSettingsSubsection(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new OsuLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new OsuLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public int LegacyID => 0;
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 6beb83575d..dc36bc0320 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -43,7 +43,16 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new TaikoBeatmapConverter(beatmap, this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TaikoLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new TaikoLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public const string SHORT_NAME = "taiko";
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 5c7321fb24..e12be6d3b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestOsuRuleset : OsuRuleset
         {
-            public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
+            public override ISkin CreateSkinTransformer(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
 
             private class TestOsuLegacySkinTransformer : OsuLegacySkinTransformer
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 4bc82a5f7e..a446210c8a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -200,7 +200,13 @@ namespace osu.Game.Rulesets
 
         public ModAutoplay? GetAutoplayMod() => CreateMod<ModAutoplay>();
 
-        public virtual ISkin? CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => null;
+        /// <summary>
+        /// Create a transformer which adds lookups specific to a ruleset to skin sources.
+        /// </summary>
+        /// <param name="skin">The source skin.</param>
+        /// <param name="beatmap">The current beatmap.</param>
+        /// <returns>A skin with a transformer applied, or null if no transformation is provided by this ruleset.</returns>
+        public virtual ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap) => null;
 
         protected Ruleset()
         {
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index 937cf20bc6..d5690710bb 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Skinning
             Ruleset = ruleset;
             Beatmap = beatmap;
 
-            InternalChild = new BeatmapSkinProvidingContainer(beatmapSkin is LegacySkin ? GetLegacyRulesetTransformedSkin(beatmapSkin) : beatmapSkin)
+            InternalChild = new BeatmapSkinProvidingContainer(beatmapSkin is LegacySkin ? GetRulesetTransformedSkin(beatmapSkin) : beatmapSkin)
             {
                 Child = Content = new Container
                 {
@@ -67,16 +67,16 @@ namespace osu.Game.Skinning
 
             Debug.Assert(ParentSource != null);
 
-            foreach (var skin in ParentSource.AllSources)
+            foreach (var source in ParentSource.AllSources)
             {
-                switch (skin)
+                switch (source)
                 {
-                    case LegacySkin legacySkin:
-                        sources.Add(GetLegacyRulesetTransformedSkin(legacySkin));
+                    case Skin skin:
+                        sources.Add(GetRulesetTransformedSkin(skin));
                         break;
 
                     default:
-                        sources.Add(skin);
+                        sources.Add(source);
                         break;
                 }
             }
@@ -94,16 +94,16 @@ namespace osu.Game.Skinning
             SetSources(sources);
         }
 
-        protected ISkin GetLegacyRulesetTransformedSkin(ISkin legacySkin)
+        protected ISkin GetRulesetTransformedSkin(ISkin skin)
         {
-            if (legacySkin == null)
+            if (skin == null)
                 return null;
 
-            var rulesetTransformed = Ruleset.CreateLegacySkinProvider(legacySkin, Beatmap);
+            var rulesetTransformed = Ruleset.CreateSkinTransformer(skin, Beatmap);
             if (rulesetTransformed != null)
                 return rulesetTransformed;
 
-            return legacySkin;
+            return skin;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index ffdde782a5..7278e1e93f 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual
             ISkin provider = skin;
 
             if (provider is LegacySkin legacyProvider)
-                provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(legacyProvider, beatmap);
+                provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(legacyProvider, beatmap);
 
             var children = new Container
             {

From 5ce67345ae129f4d0fd80ca15bbb7130af15f8b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 01:02:38 +0900
Subject: [PATCH 61/65] Catch against sqlite initialisation failures

---
 osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index 007bec46bb..2fd1d06b7b 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -42,9 +42,16 @@ namespace osu.Game.Beatmaps
 
         public BeatmapUpdaterMetadataLookup(IAPIProvider api, Storage storage)
         {
-            // required to initialise native SQLite libraries on some platforms.
-            Batteries_V2.Init();
-            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+            try
+            {
+                // required to initialise native SQLite libraries on some platforms.
+                Batteries_V2.Init();
+                raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+            }
+            catch
+            {
+                // may fail if platform not supported.
+            }
 
             this.api = api;
             this.storage = storage;

From db822696eda362206817b1881c17e7613f79f4d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 01:02:46 +0900
Subject: [PATCH 62/65] Use latest version of sqlite3 bundle

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 953087f9c8..fed7c27f07 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>

From 4f208416bedfd8cb3cd11474d7de2dca5aa40c8d Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Fri, 16 Sep 2022 13:50:18 +1400
Subject: [PATCH 63/65] Fixed irresponsiveness of score panel timestamp to time
 format

---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index b496f4242d..e212dad65f 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -7,12 +7,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -34,6 +36,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
+        private Bindable<bool> bindableUse24HourDisplay;
         private readonly bool withFlair;
 
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
@@ -61,8 +64,9 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache beatmapDifficultyCache)
+        private void load(BeatmapDifficultyCache beatmapDifficultyCache, OsuConfigManager config)
         {
+            bindableUse24HourDisplay = config.GetBindable<bool>(OsuSetting.Prefer24HourTime);
             var beatmap = score.BeatmapInfo;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             string creator = metadata.Author.Username;
@@ -224,7 +228,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             });
 
             if (score.Date != default)
-                AddInternal(new PlayedOnText(score.Date));
+                AddInternal(new PlayedOnText(score.Date, bindableUse24HourDisplay));
 
             var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
 
@@ -280,12 +284,25 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         public class PlayedOnText : OsuSpriteText
         {
-            public PlayedOnText(DateTimeOffset time)
+            private bool use24HourDisplay;
+
+            public PlayedOnText(DateTimeOffset time, Bindable<bool> bindableUse24HourDisplay)
             {
+                use24HourDisplay = bindableUse24HourDisplay.Value;
+                bindableUse24HourDisplay.BindValueChanged(prefer24H =>
+                {
+                    use24HourDisplay = prefer24H.NewValue;
+                    UpdateHourDisplay(time);
+                }, true);
                 Anchor = Anchor.BottomCentre;
                 Origin = Anchor.BottomCentre;
                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold);
-                Text = $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}";
+                UpdateHourDisplay(time);
+            }
+
+            public void UpdateHourDisplay(DateTimeOffset time)
+            {
+                Text = use24HourDisplay ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
             }
         }
     }

From d9499abc3387367b4922abda985c2ee90ff76c07 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 16 Sep 2022 13:14:25 +0900
Subject: [PATCH 64/65] Refactor to avoid passing around bindables

---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index e212dad65f..829ba83696 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
-        private Bindable<bool> bindableUse24HourDisplay;
         private readonly bool withFlair;
 
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
@@ -64,9 +63,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache beatmapDifficultyCache, OsuConfigManager config)
+        private void load(BeatmapDifficultyCache beatmapDifficultyCache)
         {
-            bindableUse24HourDisplay = config.GetBindable<bool>(OsuSetting.Prefer24HourTime);
             var beatmap = score.BeatmapInfo;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             string creator = metadata.Author.Username;
@@ -228,7 +226,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             });
 
             if (score.Date != default)
-                AddInternal(new PlayedOnText(score.Date, bindableUse24HourDisplay));
+                AddInternal(new PlayedOnText(score.Date));
 
             var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
 
@@ -284,25 +282,34 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         public class PlayedOnText : OsuSpriteText
         {
-            private bool use24HourDisplay;
+            private readonly DateTimeOffset time;
+            private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
 
-            public PlayedOnText(DateTimeOffset time, Bindable<bool> bindableUse24HourDisplay)
+            public PlayedOnText(DateTimeOffset time)
             {
-                use24HourDisplay = bindableUse24HourDisplay.Value;
-                bindableUse24HourDisplay.BindValueChanged(prefer24H =>
-                {
-                    use24HourDisplay = prefer24H.NewValue;
-                    UpdateHourDisplay(time);
-                }, true);
+                this.time = time;
+
                 Anchor = Anchor.BottomCentre;
                 Origin = Anchor.BottomCentre;
                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold);
-                UpdateHourDisplay(time);
             }
 
-            public void UpdateHourDisplay(DateTimeOffset time)
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager configManager)
             {
-                Text = use24HourDisplay ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
+                configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                prefer24HourTime.BindValueChanged(_ => updateDisplay(), true);
+            }
+
+            private void updateDisplay()
+            {
+                Text = prefer24HourTime.Value ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
             }
         }
     }

From 21ac3fd88be99c7b057e420b2d3d75dd5b592dff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 14:00:05 +0900
Subject: [PATCH 65/65] Catch any unobserved exceptions during beatmap metadata
 harvesting

The process will retry when a connection is successful, so this doesn't
need to be as loud as it was.

Addresses https://github.com/ppy/osu/discussions/20331.
---
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 95228c380f..06d24a82f3 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -80,6 +81,10 @@ namespace osu.Game.Online.Metadata
                             await ProcessChanges(catchUpChanges.BeatmapSetIDs);
                         }
                     }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"Error while processing catch-up of metadata ({e.Message})");
+                    }
                     finally
                     {
                         catchingUp = false;