Merge branch 'master' into fix-songselect-exit-notimplemented

osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs

@@ -26,6 +26,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public DateTimeOffset? LastUpdated { get; set; }
 
+        /// <summary>
+        /// The status of this beatmap set.
+        /// </summary>
+        public BeatmapSetOnlineStatus Status { get; set; }
+
         /// <summary>
         /// Whether or not this beatmap set has a background video.
         /// </summary>

osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs

@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps
+{
+    public enum BeatmapSetOnlineStatus
+    {
+        None = -3,
+        Graveyard = -2,
+        WIP = -1,
+        Pending = 0,
+        Ranked = 1,
+        Approved = 2,
+        Qualified = 3,
+        Loved = 4,
+    }
+}

osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs

@@ -0,0 +1,54 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using OpenTK.Graphics;
+
+namespace osu.Game.Beatmaps.Drawables
+{
+    public class BeatmapSetOnlineStatusPill : CircularContainer
+    {
+        private readonly OsuSpriteText statusText;
+
+        private BeatmapSetOnlineStatus status = BeatmapSetOnlineStatus.None;
+        public BeatmapSetOnlineStatus Status
+        {
+            get { return status; }
+            set
+            {
+                if (value == status) return;
+                status = value;
+
+                statusText.Text = Enum.GetName(typeof(BeatmapSetOnlineStatus), Status)?.ToUpper();
+            }
+        }
+
+        public BeatmapSetOnlineStatusPill(float textSize, MarginPadding textPadding)
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.5f,
+                },
+                statusText = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = @"Exo2.0-Bold",
+                    TextSize = textSize,
+                    Padding = textPadding,
+                },
+            };
+        }
+    }
+}

osu.Game/Beatmaps/IBeatmapConverter.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Converts a Beatmap using this Beatmap Converter.
         /// </summary>
-        /// <param name="original">The un-converted Beatmap.</param>
+        /// <param name="beatmap">The un-converted Beatmap.</param>
         void Convert(Beatmap beatmap);
     }
 }

osu.Game/Database/ArchiveModelManager.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Ionic.Zip;
 using Microsoft.EntityFrameworkCore;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -13,6 +12,7 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Utils;
 using SharpCompress.Common;
 using FileInfo = osu.Game.IO.FileInfo;
 
@@ -336,7 +336,7 @@ namespace osu.Game.Database
         /// <returns>A reader giving access to the archive's content.</returns>
         private ArchiveReader getReaderFrom(string path)
         {
-            if (ZipFile.IsZipFile(path))
+            if (ZipUtils.IsZipArchive(path))
                 return new ZipArchiveReader(Files.Storage.GetStream(path), Path.GetFileName(path));
             if (Directory.Exists(path))
                 return new LegacyFilesystemReader(path);

osu.Game/Database/DatabaseBackedStore.cs

@@ -11,9 +11,6 @@ namespace osu.Game.Database
     {
         protected readonly Storage Storage;
 
-        /// <summary>
-        /// Create a new <see cref="OsuDbContext"/> instance (separate from the shared context via <see cref="GetContext"/> for performing isolated operations.
-        /// </summary>
         protected readonly IDatabaseContextFactory ContextFactory;
 
         /// <summary>

osu.Game/Database/DatabaseContextFactory.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Database
         private readonly object writeLock = new object();
 
         private bool currentWriteDidWrite;
-        private volatile int currentWriteUsages;
+        private int currentWriteUsages;
 
         public DatabaseContextFactory(GameHost host)
         {

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -33,6 +33,7 @@ namespace osu.Game.Graphics.Cursor
 
                 // don't start rotating until we're moved a minimum distance away from the mouse down location,
                 // else it can have an annoying effect.
+                // ReSharper disable once PossibleInvalidOperationException
                 startRotation |= Vector2Extensions.Distance(state.Mouse.Position, state.Mouse.PositionMouseDown.Value) > 30;
 
                 if (startRotation)

osu.Game/Graphics/DrawableDate.cs

@@ -6,7 +6,6 @@ using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics
@@ -14,7 +13,6 @@ namespace osu.Game.Graphics
     public class DrawableDate : OsuSpriteText, IHasTooltip
     {
         private readonly DateTimeOffset date;
-        private ScheduledDelegate updateTask;
 
         public DrawableDate(DateTimeOffset date)
         {
@@ -61,6 +59,7 @@ namespace osu.Game.Graphics
         public override bool HandleMouseInput => true;
 
         private void updateTime() => Text = date.Humanize();
+
         public string TooltipText => date.ToString();
     }
 }

osu.Game/Graphics/SpriteIcon.cs

@@ -988,7 +988,7 @@ namespace osu.Game.Graphics
         fa_osu_expert_mania = 0xe028,
 
         // mod icons
-        fa_osu_mod_perfect = 0xe02d,
+        fa_osu_mod_perfect = 0xe049,
         fa_osu_mod_autopilot = 0xe03a,
         fa_osu_mod_auto = 0xe03b,
         fa_osu_mod_cinema = 0xe03c,

osu.Game/IO/Archives/ZipArchiveReader.cs

@@ -4,32 +4,32 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Ionic.Zip;
+using SharpCompress.Archives.Zip;
 
 namespace osu.Game.IO.Archives
 {
     public sealed class ZipArchiveReader : ArchiveReader
     {
         private readonly Stream archiveStream;
-        private readonly ZipFile archive;
+        private readonly ZipArchive archive;
 
         public ZipArchiveReader(Stream archiveStream, string name = null)
             : base(name)
         {
             this.archiveStream = archiveStream;
-            archive = ZipFile.Read(archiveStream);
+            archive = ZipArchive.Open(archiveStream);
         }
 
         public override Stream GetStream(string name)
         {
-            ZipEntry entry = archive.Entries.SingleOrDefault(e => e.FileName == name);
+            ZipArchiveEntry entry = archive.Entries.SingleOrDefault(e => e.Key == name);
             if (entry == null)
                 throw new FileNotFoundException();
 
             // allow seeking
             MemoryStream copy = new MemoryStream();
 
-            using (Stream s = entry.OpenReader())
+            using (Stream s = entry.OpenEntryStream())
                 s.CopyTo(copy);
 
             copy.Position = 0;
@@ -43,7 +43,7 @@ namespace osu.Game.IO.Archives
             archiveStream.Dispose();
         }
 
-        public override IEnumerable<string> Filenames => archive.Entries.Select(e => e.FileName).ToArray();
+        public override IEnumerable<string> Filenames => archive.Entries.Select(e => e.Key).ToArray();
 
         public override Stream GetUnderlyingStream() => archiveStream;
     }

osu.Game/IO/Legacy/SerializationReader.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 
@@ -175,7 +174,7 @@ namespace osu.Game.IO.Legacy
                 versionBinder = new VersionConfigToNamespaceAssemblyObjectBinder();
                 formatter = new BinaryFormatter
                 {
-                    AssemblyFormat = FormatterAssemblyStyle.Simple,
+//                    AssemblyFormat = FormatterAssemblyStyle.Simple,
                     Binder = versionBinder
                 };
             }
@@ -187,6 +186,7 @@ namespace osu.Game.IO.Legacy
 
                 Debug.Assert(formatter != null, "formatter != null");
 
+                // ReSharper disable once PossibleNullReferenceException
                 return formatter.Deserialize(stream);
             }
 

osu.Game/IO/Legacy/SerializationWriter.cs

@@ -219,7 +219,7 @@ namespace osu.Game.IO.Legacy
                         Write((byte)ObjType.otherType);
                         BinaryFormatter b = new BinaryFormatter
                         {
-                            AssemblyFormat = FormatterAssemblyStyle.Simple,
+//                            AssemblyFormat = FormatterAssemblyStyle.Simple,
                             TypeFormat = FormatterTypeStyle.TypesWhenNeeded
                         };
                         b.Serialize(BaseStream, obj);

osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs

@@ -45,6 +45,11 @@ namespace osu.Game.Input.Bindings
         private void load(KeyBindingStore keyBindings)
         {
             store = keyBindings;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             store.KeyBindingChanged += ReloadMappings;
         }
 

osu.Game/Migrations/20171019041408_InitialCreate.cs

@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace osu.Game.Migrations
 {

osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs

@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace osu.Game.Migrations
 {

osu.Game/Migrations/OsuDbContextModelSnapshot.cs

@@ -1,11 +1,7 @@
 // <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
 {

osu.Game/Online/API/APIAccess.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
@@ -44,8 +45,7 @@ namespace osu.Game.Online.API
 
         protected bool HasLogin => Token != null || !string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password);
 
-        // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable (should dispose of this or at very least keep a reference).
-        private readonly Thread thread;
+        private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
 
         private readonly Logger log;
 
@@ -59,13 +59,12 @@ namespace osu.Game.Online.API
             ProvidedUsername = config.Get<string>(OsuSetting.Username);
             Token = config.Get<string>(OsuSetting.Token);
 
-            thread = new Thread(run) { IsBackground = true };
-            thread.Start();
+            Task.Factory.StartNew(run, cancellationToken.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
         }
 
         private readonly List<IOnlineComponent> components = new List<IOnlineComponent>();
 
-        internal void Schedule(Action action) => base.Schedule(action);
+        internal new void Schedule(Action action) => base.Schedule(action);
 
         public void Register(IOnlineComponent component)
         {
@@ -93,7 +92,7 @@ namespace osu.Game.Online.API
 
         private void run()
         {
-            while (thread.IsAlive)
+            while (!cancellationToken.IsCancellationRequested)
             {
                 switch (State)
                 {
@@ -267,10 +266,7 @@ namespace osu.Game.Online.API
 
         public bool IsLoggedIn => LocalUser.Value.Id > 1;
 
-        public void Queue(APIRequest request)
-        {
-            queue.Enqueue(request);
-        }
+        public void Queue(APIRequest request) => queue.Enqueue(request);
 
         public event StateChangeDelegate OnStateChange;
 
@@ -312,6 +308,9 @@ namespace osu.Game.Online.API
 
             config.Set(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? Token : string.Empty);
             config.Save();
+
+            flushQueue();
+            cancellationToken.Cancel();
         }
     }
 

osu.Game/Online/API/OAuth.cs

@@ -96,6 +96,7 @@ namespace osu.Game.Online.API
 
                 // if not, let's try using our refresh token to request a new access token.
                 if (!string.IsNullOrEmpty(Token?.RefreshToken))
+                    // ReSharper disable once PossibleNullReferenceException
                     AuthenticateWithRefresh(Token.RefreshToken);
 
                 return accessTokenValid;

osu.Game/Online/API/Requests/APIResponseBeatmapSet.cs

@@ -30,6 +30,9 @@ namespace osu.Game.Online.API.Requests
         [JsonProperty(@"video")]
         private bool hasVideo { get; set; }
 
+        [JsonProperty(@"status")]
+        private BeatmapSetOnlineStatus status { get; set; }
+
         [JsonProperty(@"submitted_date")]
         private DateTimeOffset submitted { get; set; }
 
@@ -60,6 +63,7 @@ namespace osu.Game.Online.API.Requests
                     PlayCount = playCount,
                     FavouriteCount = favouriteCount,
                     BPM = bpm,
+                    Status = status,
                     HasVideo = hasVideo,
                     Submitted = submitted,
                     Ranked = ranked,

osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs

@@ -19,6 +19,7 @@ namespace osu.Game.Online.API.Requests
             this.type = type;
         }
 
+        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         protected override string Target => $@"users/{userId}/beatmapsets/{type.ToString().Underscore()}?offset={offset}";
     }
 

osu.Game/Online/API/Requests/GetUserScoresRequest.cs

@@ -18,6 +18,7 @@ namespace osu.Game.Online.API.Requests
             this.offset = offset;
         }
 
+        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLower()}?offset={offset}";
     }
 

osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs

@@ -27,6 +27,7 @@ namespace osu.Game.Online.API.Requests
             this.direction = direction;
         }
 
+        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)rankStatus}&sort={sortCriteria.ToString().ToLower()}_{directionString}";
     }
 }

osu.Game/Online/Chat/Message.cs

@@ -69,6 +69,7 @@ namespace osu.Game.Online.Chat
 
         public virtual bool Equals(Message other) => Id == other?.Id;
 
+        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         public override int GetHashCode() => Id.GetHashCode();
     }
 

osu.Game/OpenTK.dll.config

@@ -1,25 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
-  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
-  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
-  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
-  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
-  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
-  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
-  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
-  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
-  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
-  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
-  <!-- XQuartz compatibility (X11 on Mac) -->
-  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
-  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
-  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
-  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
-  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
-  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
-</configuration>

osu.Game/Overlays/BeatmapSet/Header.cs

@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly FillFlowContainer videoButtons;
         private readonly AuthorInfo author;
         private readonly Container downloadButtonsContainer;
+        private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
         public Details Details;
 
         private BeatmapManager beatmaps;
@@ -50,6 +51,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = BeatmapSet;
                 title.Text = BeatmapSet.Metadata.Title;
                 artist.Text = BeatmapSet.Metadata.Artist;
+                onlineStatusPill.Status = BeatmapSet.OnlineInfo.Status;
 
                 downloadButtonsContainer.FadeIn();
                 noVideoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 0 : 1, transition_duration);
@@ -204,11 +206,23 @@ namespace osu.Game.Overlays.BeatmapSet
                                 },
                             },
                         },
-                        Details = new Details
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
+                            AutoSizeAxes = Axes.Both,
                             Margin = new MarginPadding { Right = BeatmapSetOverlay.X_PADDING },
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(10),
+                            Children = new Drawable[]
+                            {
+                                onlineStatusPill = new BeatmapSetOnlineStatusPill(14, new MarginPadding { Horizontal = 25, Vertical = 8 })
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                },
+                                Details = new Details(),
+                            },
                         },
                     },
                 },

osu.Game/Overlays/ChatOverlay.cs

@@ -210,6 +210,7 @@ namespace osu.Game.Overlays
             {
                 Trace.Assert(state.Mouse.PositionMouseDown != null);
 
+                // ReSharper disable once PossibleInvalidOperationException
                 double targetChatHeight = startDragChatHeight - (state.Mouse.Position.Y - state.Mouse.PositionMouseDown.Value.Y) / Parent.DrawSize.Y;
 
                 // If the channel selection screen is shown, mind its minimum height
@@ -383,6 +384,7 @@ namespace osu.Game.Overlays
         {
             if (channel == null) return;
 
+            // ReSharper disable once AccessToModifiedClosure
             var existing = careChannels.Find(c => c.Id == channel.Id);
 
             if (existing != null)

osu.Game/Overlays/Direct/DirectGridPanel.cs

@@ -11,7 +11,9 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 
 namespace osu.Game.Overlays.Direct
 {
@@ -20,7 +22,7 @@ namespace osu.Game.Overlays.Direct
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
 
-        private FillFlowContainer bottomPanel;
+        private FillFlowContainer bottomPanel, statusContainer;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -199,7 +201,37 @@ namespace osu.Game.Overlays.Direct
                     Size = new Vector2(30),
                     Alpha = 0,
                 },
+                statusContainer = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding { Top = 5, Left = 5 },
+                    Spacing = new Vector2(5),
+                },
             });
+
+            if (SetInfo.OnlineInfo?.HasVideo ?? false)
+            {
+                statusContainer.Add(new IconPill(FontAwesome.fa_film));
+            }
+
+            statusContainer.Add(new BeatmapSetOnlineStatusPill(12, new MarginPadding { Horizontal = 10, Vertical = 5 })
+            {
+                Status = SetInfo.OnlineInfo?.Status ?? BeatmapSetOnlineStatus.None,
+            });
+        }
+
+        protected override bool OnHover(InputState state)
+        {
+            statusContainer.FadeOut(120, Easing.InOutQuint);
+
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            base.OnHoverLost(state);
+
+            statusContainer.FadeIn(120, Easing.InOutQuint);
         }
     }
 }

osu.Game/Overlays/Direct/IconPill.cs

@@ -0,0 +1,43 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Overlays.Direct
+{
+    public class IconPill : CircularContainer
+    {
+        public IconPill(FontAwesome icon)
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                    Alpha = 0.5f,
+                },
+                new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding(5),
+                    Child = new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Icon = icon,
+                        Size = new Vector2(12),
+                    },
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Mods/ModButton.cs

@@ -4,9 +4,6 @@
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -30,7 +27,6 @@ namespace osu.Game.Overlays.Mods
         private ModIcon backgroundIcon;
         private readonly SpriteText text;
         private readonly Container<ModIcon> iconsContainer;
-        private SampleChannel sampleOn, sampleOff;
 
         /// <summary>
         /// Fired when the selection changes.
@@ -100,7 +96,6 @@ namespace osu.Game.Overlays.Mods
 
             foregroundIcon.Highlighted = Selected;
 
-            (selectedIndex == -1 ? sampleOff : sampleOn).Play();
             SelectionChanged?.Invoke(SelectedMod);
             return true;
         }
@@ -152,13 +147,6 @@ namespace osu.Game.Overlays.Mods
 
         public virtual Mod SelectedMod => Mods.ElementAtOrDefault(selectedIndex);
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleOn = audio.Sample.Get(@"UI/check-on");
-            sampleOff = audio.Sample.Get(@"UI/check-off");
-        }
-
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             switch (args.Button)

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -15,6 +15,8 @@ using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets;
 using osu.Game.Graphics.UserInterface;
@@ -49,7 +51,7 @@ namespace osu.Game.Overlays.Mods
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, OsuGame osu, RulesetStore rulesets)
+        private void load(OsuColour colours, OsuGame osu, RulesetStore rulesets, AudioManager audio)
         {
             SelectedMods.ValueChanged += selectedModsChanged;
 
@@ -63,6 +65,9 @@ namespace osu.Game.Overlays.Mods
 
             Ruleset.ValueChanged += rulesetChanged;
             Ruleset.TriggerChange();
+
+            sampleOn = audio.Sample.Get(@"UI/check-on");
+            sampleOff = audio.Sample.Get(@"UI/check-off");
         }
 
         protected override void Dispose(bool isDisposing)
@@ -154,10 +159,21 @@ namespace osu.Game.Overlays.Mods
                 section.DeselectTypes(modTypes, immediate);
         }
 
+
+        private SampleChannel sampleOn, sampleOff;
+
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
+            {
+                if (State == Visibility.Visible) sampleOn?.Play();
                 DeselectTypes(selectedMod.IncompatibleMods, true);
+            }
+            else
+            {
+                if (State == Visibility.Visible) sampleOff?.Play();
+            }
+
             refreshSelectedMods();
         }
 

osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs

@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         {
             private readonly OsuSpriteText valueText;
 
-            public int Count
+            public new int Count
             {
                 set { valueText.Text = value.ToString(); }
             }

osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs

@@ -18,14 +18,19 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
             {
                 new SettingsCheckbox
                 {
-                    LabelText = "Bypass caching",
-                    Bindable = config.GetBindable<bool>(DebugSetting.BypassCaching)
+                    LabelText = "Show log overlay",
+                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Debug logs",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
-                }
+                    LabelText = "Performance logging",
+                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.PerformanceLogging)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Bypass caching (slow)",
+                    Bindable = config.GetBindable<bool>(DebugSetting.BypassCaching)
+                },
             };
         }
     }

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
@@ -18,7 +17,7 @@ using System.ComponentModel;
 using osu.Game.Graphics;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
-
+using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Overlays.Settings.Sections.General

osu.Game/Overlays/Settings/SidebarButton.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings
         private readonly SpriteText headerText;
         private readonly Box selectionIndicator;
         private readonly Container text;
-        public Action<SettingsSection> Action;
+        public new Action<SettingsSection> Action;
 
         private SettingsSection section;
         public SettingsSection Section

osu.Game/Overlays/Toolbar/ToolbarUserArea.cs

@@ -4,8 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using OpenTK;
+using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 
 namespace osu.Game.Overlays.Toolbar
 {

osu.Game/Overlays/Volume/VolumeMeter.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
+using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
@@ -93,19 +94,25 @@ namespace osu.Game.Overlays.Volume
                         Colour = colours.Gray2,
                         Size = new Vector2(0.8f)
                     },
-                    (volumeCircle = new CircularProgress
+                    new Container
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        InnerRadius = 0.05f,
-                        Rotation = 180,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Size = new Vector2(0.8f)
-                    }).WithEffect(new GlowEffect
-                    {
-                        Colour = meterColour,
-                        Strength = 2
-                    }),
+                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(0.8f),
+                        Padding = new MarginPadding(-Blur.KernelSize(5)),
+                        Rotation = 180,
+                        Child = (volumeCircle = new CircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            InnerRadius = 0.05f,
+                        }).WithEffect(new GlowEffect
+                        {
+                            Colour = meterColour,
+                            Strength = 2,
+                            PadExtent = true
+                        }),
+                    },
                     maxGlow = (text = new OsuSpriteText
                     {
                         Anchor = Anchor.Centre,

osu.Game/Properties/AssemblyInfo.cs

@@ -1,28 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("osu.Game")]
-[assembly: AssemblyDescription("click the circles. to the beat.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ppy Pty Ltd")]
-[assembly: AssemblyProduct("osu.Game")]
-[assembly: AssemblyCopyright("ppy Pty Ltd 2007-2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

osu.Game/Rulesets/Judgements/DrawableJudgement.cs

@@ -33,6 +33,7 @@ namespace osu.Game.Rulesets.Judgements
         /// Creates a drawable which visualises a <see cref="Judgements.Judgement"/>.
         /// </summary>
         /// <param name="judgement">The judgement to visualise.</param>
+        /// <param name="judgedObject">The object which was judged.</param>
         public DrawableJudgement(Judgement judgement, DrawableHitObject judgedObject)
         {
             Judgement = judgement;

osu.Game/Rulesets/Mods/ModHardRock.cs

@@ -14,7 +14,6 @@ namespace osu.Game.Rulesets.Mods
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_hardrock;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Everything just got a bit harder...";
-        public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)

osu.Game/Rulesets/Mods/ModPerfect.cs

@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Perfect";
         public override string ShortenedName => "PF";
-        public override FontAwesome Icon => FontAwesome.fa_question;
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_perfect;
         public override string Description => "SS or quit.";
 
         protected override bool FailCondition(ScoreProcessor scoreProcessor) => scoreProcessor.Accuracy.Value != 1;

osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs

@@ -15,7 +15,6 @@ namespace osu.Game.Rulesets.Replays.Types
         /// Populates this <see cref="ReplayFrame"/> using values from a <see cref="LegacyReplayFrame"/>.
         /// </summary>
         /// <param name="legacyFrame">The <see cref="LegacyReplayFrame"/> to extract values from.</param>
-        /// <param name="score">The score.</param>
         /// <param name="beatmap">The beatmap.</param>
         void ConvertFrom(LegacyReplayFrame legacyFrame, Beatmap beatmap);
     }

osu.Game/Rulesets/Timing/MultiplierControlPoint.cs

@@ -60,6 +60,7 @@ namespace osu.Game.Rulesets.Timing
             DifficultyPoint = other.DifficultyPoint;
         }
 
+        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         public int CompareTo(MultiplierControlPoint other) => StartTime.CompareTo(other?.StartTime);
     }
 }

osu.Game/Rulesets/UI/HitObjectContainer.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 
@@ -15,5 +16,15 @@ namespace osu.Game.Rulesets.UI
 
         public virtual void Add(DrawableHitObject hitObject) => AddInternal(hitObject);
         public virtual bool Remove(DrawableHitObject hitObject) => RemoveInternal(hitObject);
+
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
+                return base.Compare(x, y);
+
+            // Put earlier hitobjects towards the end of the list, so they handle input first
+            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            return i == 0 ? CompareReverseChildID(x, y) : i;
+        }
     }
 }

osu.Game/Rulesets/UI/RulesetContainer.cs

@@ -214,6 +214,7 @@ namespace osu.Game.Rulesets.UI
 
             WorkingBeatmap = workingBeatmap;
             IsForCurrentRuleset = isForCurrentRuleset;
+            // ReSharper disable once PossibleNullReferenceException
             Mods = workingBeatmap.Mods.Value;
 
             RelativeSizeAxes = Axes.Both;

osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs

@@ -24,7 +24,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
     public class BeatDivisorControl : CompositeDrawable
     {
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
-        private int currentDivisorIndex;
 
         public BeatDivisorControl(BindableBeatDivisor beatDivisor)
         {

osu.Game/Screens/Edit/Screens/Compose/Layers/SelectionLayer.cs

@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using OpenTK;
 using OpenTK.Graphics;
+using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 
 namespace osu.Game.Screens.Edit.Screens.Compose.Layers
 {

osu.Game/Screens/Play/PlayerLoader.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -27,6 +28,8 @@ namespace osu.Game.Screens.Play
         private bool showOverlays = true;
         public override bool ShowOverlaysOnEnter => showOverlays;
 
+        private Task loadTask;
+
         public PlayerLoader(Player player)
         {
             this.player = player;
@@ -55,7 +58,7 @@ namespace osu.Game.Screens.Play
                 Margin = new MarginPadding(25)
             });
 
-            LoadComponentAsync(player);
+            loadTask = LoadComponentAsync(player);
         }
 
         protected override void OnResuming(Screen last)
@@ -65,7 +68,7 @@ namespace osu.Game.Screens.Play
             contentIn();
 
             //we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
-            LoadComponentAsync(player = new Player
+            loadTask = LoadComponentAsync(player = new Player
             {
                 RestartCount = player.RestartCount + 1,
                 RestartRequested = player.RestartRequested,
@@ -154,6 +157,8 @@ namespace osu.Game.Screens.Play
                     {
                         if (!IsCurrentScreen) return;
 
+                        loadTask = null;
+
                         if (!Push(player))
                             Exit();
                         else
@@ -192,6 +197,14 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // if the player never got pushed, we should explicitly dispose it.
+            loadTask?.ContinueWith(_ => player.Dispose());
+        }
+
         private class BeatmapMetadataDisplay : Container
         {
             private class MetadataLine : Container

osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs

@@ -46,6 +46,12 @@ namespace osu.Game.Screens.Play
             UpdateBackgroundElements();
         }
 
+        protected override void OnResuming(Screen last)
+        {
+            base.OnResuming(last);
+            UpdateBackgroundElements();
+        }
+
         protected virtual void UpdateBackgroundElements()
         {
             if (!IsCurrentScreen) return;

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -328,7 +328,10 @@ namespace osu.Game.Screens.Select
         public void FlushPendingFilterOperations()
         {
             if (FilterTask?.Completed == false)
+            {
                 applyActiveCriteria(false, false);
+                Update();
+            }
         }
 
         public void Filter(FilterCriteria newCriteria, bool debounce = true)
@@ -544,6 +547,7 @@ namespace osu.Game.Screens.Select
 
                             float? setY = null;
                             if (!d.IsLoaded || beatmap.Alpha == 0) // can't use IsPresent due to DrawableCarouselItem override.
+                                // ReSharper disable once PossibleNullReferenceException (resharper broken?)
                                 setY = lastSet.Y + lastSet.DrawHeight + 5;
 
                             if (d.IsLoaded)

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -268,6 +268,7 @@ namespace osu.Game.Screens.Select
                     new OsuSpriteText
                     {
                         Font = @"Exo2.0-Bold",
+                        // ReSharper disable once PossibleNullReferenceException (resharper broken?)
                         Text = metadata.Author.Username,
                         TextSize = 15,
                     }

osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs

@@ -68,6 +68,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Origin = Anchor.CentreLeft,
                             Font = @"Exo2.0-MediumItalic",
                             TextSize = 22,
+                            // ReSharper disable once ImpureMethodCallOnReadonlyValueField
                             Text = RankPosition.ToString(),
                         },
                     },

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -75,7 +76,8 @@ namespace osu.Game.Screens.Select
                 {
                     // if we have no beatmaps but osu-stable is found, let's prompt the user to import.
                     if (!beatmaps.GetAllUsableBeatmapSets().Any() && beatmaps.StableInstallationAvailable)
-                        dialogOverlay.Push(new ImportFromStablePopup(() => beatmaps.ImportFromStable()));
+                        dialogOverlay.Push(new ImportFromStablePopup(() =>
+                            Task.Factory.StartNew(beatmaps.ImportFromStable, TaskCreationOptions.LongRunning)));
                 });
             }
         }

osu.Game/Screens/Tournament/Drawings.cs

@@ -326,6 +326,7 @@ namespace osu.Game.Screens.Tournament
                             if (line.ToUpper().StartsWith("GROUP"))
                                 continue;
 
+                            // ReSharper disable once AccessToModifiedClosure
                             DrawingsTeam teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
 
                             if (teamToAdd == null)

osu.Game/Screens/Tournament/ScrollingTeamContainer.cs

@@ -13,9 +13,9 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Threading;
+using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Screens.Tournament.Teams;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -118,16 +118,18 @@ namespace osu.Game.Screens.Tournament
                         if (!Children.Any())
                             break;
 
-                        Drawable closest = null;
+                        ScrollingTeam closest = null;
 
                         foreach (var c in Children)
                         {
-                            if (!(c is ScrollingTeam))
+                            var stc = c as ScrollingTeam;
+
+                            if (stc == null)
                                 continue;
 
                             if (closest == null)
                             {
-                                closest = c;
+                                closest = stc;
                                 continue;
                             }
 
@@ -135,14 +137,15 @@ namespace osu.Game.Screens.Tournament
                             float lastOffset = Math.Abs(closest.Position.X + closest.DrawWidth / 2f - DrawWidth / 2f);
 
                             if (o < lastOffset)
-                                closest = c;
+                                closest = stc;
                         }
 
                         Trace.Assert(closest != null, "closest != null");
 
+                        // ReSharper disable once PossibleNullReferenceException
                         offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
 
-                        ScrollingTeam st = closest as ScrollingTeam;
+                        ScrollingTeam st = closest;
 
                         availableTeams.RemoveAll(at => at == st.Team);
 

osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs

@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             if (string.IsNullOrEmpty(line))
                                 continue;
 
+                            // ReSharper disable once PossibleNullReferenceException
                             string[] split = line.Split(':');
 
                             if (split.Length < 2)

osu.Game/Skinning/LegacySkin.cs

@@ -63,7 +63,7 @@ namespace osu.Game.Skinning
             if (texture == null)
             {
                 ratio *= 2;
-                GetTexture(componentName);
+                texture = GetTexture(componentName);
             }
 
             if (texture == null) return null;

osu.Game/Skinning/LocalSkinOverrideContainer.cs

@@ -48,25 +48,32 @@ namespace osu.Game.Skinning
             this.source = source;
         }
 
+        private void onSourceChanged() => SourceChanged?.Invoke();
+
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
 
             fallbackSource = dependencies.Get<ISkinSource>();
-            if (fallbackSource != null)
-                fallbackSource.SourceChanged += () => SourceChanged?.Invoke();
-
             dependencies.CacheAs<ISkinSource>(this);
 
             return dependencies;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (fallbackSource != null)
+                fallbackSource.SourceChanged += onSourceChanged;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
             if (fallbackSource != null)
-                fallbackSource.SourceChanged -= SourceChanged;
+                fallbackSource.SourceChanged -= onSourceChanged;
         }
     }
 }

osu.Game/Skinning/SkinManager.cs

@@ -80,8 +80,6 @@ namespace osu.Game.Skinning
             return new LegacySkin(skinInfo, Files.Store, audio);
         }
 
-        private SkinStore store;
-
         public SkinManager(Storage storage, DatabaseContextFactory contextFactory, IIpcHost importHost, AudioManager audio)
             : base(storage, contextFactory, new SkinStore(contextFactory, storage), importHost)
         {

osu.Game/Skinning/SkinReloadableDrawable.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Create a new <see cref="SkinReloadableDrawable"/>
         /// </summary>
-        /// <param name="fallback">Whether fallback to default skin should be allowed if the custom skin is missing this resource.</param>
+        /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         protected SkinReloadableDrawable(Func<ISkinSource, bool> allowFallback = null)
         {
             this.allowFallback = allowFallback;

osu.Game/Skinning/SkinnableDrawable.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="name">The namespace-complete resource name for this skinnable element.</param>
         /// <param name="defaultImplementation">A function to create the default skin implementation of this element.</param>
-        /// <param name="fallback">Whther to fallback to the default implementation when a custom skin is specified but not implementation is present.</param>
+        /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         /// <param name="restrictSize">Whether a user-skin drawable should be limited to the size of our parent.</param>
         public SkinnableDrawable(string name, Func<string, T> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, bool restrictSize = true) : base(allowFallback)
         {

osu.Game/Tests/OsuTestBrowser.cs

@@ -0,0 +1,29 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Screens.Backgrounds;
+
+namespace osu.Game.Tests
+{
+    public class OsuTestBrowser : OsuGameBase
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
+
+            // Have to construct this here, rather than in the constructor, because
+            // we depend on some dependencies to be loaded within OsuGameBase.load().
+            Add(new TestBrowser());
+        }
+
+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState |= CursorState.Hidden;
+        }
+    }
+}

osu.Game/Tests/VisualTestRunner.cs

@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework;
+using osu.Framework.Platform;
+
+namespace osu.Game.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}

osu.Game/Utils/ZipUtils.cs

@@ -0,0 +1,33 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using SharpCompress.Archives.Zip;
+
+namespace osu.Game.Utils
+{
+    public static class ZipUtils
+    {
+        public static bool IsZipArchive(string path)
+        {
+            try
+            {
+                using (var arc = ZipArchive.Open(path))
+                {
+                    foreach (var entry in arc.Entries)
+                    {
+                        using (entry.OpenEntryStream())
+                        {
+                        }
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+    }
+}

osu.Game/app.config

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.18.1.0" newVersion="0.18.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

osu.Game/osu.Game.csproj

@@ -1,970 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <Import Project="..\osu.Game.props" />
-  <PropertyGroup>
-    <ProjectGuid>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>osu.Game</RootNamespace>
-    <AssemblyName>osu.Game</AssemblyName>
-    <ManifestCertificateThumbprint>3CF060CD28877D0E3112948951A64B2A7CEEC909</ManifestCertificateThumbprint>
-    <ManifestKeyFile>codesigning.pfx</ManifestKeyFile>
-    <GenerateManifests>false</GenerateManifests>
-    <SignManifests>false</SignManifests>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
-    <SignAssembly>false</SignAssembly>
-    <TargetZone>LocalIntranet</TargetZone>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>0</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <Prefer32Bit>false</Prefer32Bit>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <Commandlineparameters>
-    </Commandlineparameters>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Win32Resource>
-    </Win32Resource>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Humanizer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll</HintPath>
-    </Reference>
-    <Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Data.Sqlite.Core.2.0.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.EntityFrameworkCore.2.0.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Design">
-      <HintPath>$(SolutionDir)\packages\Microsoft.EntityFrameworkCore.Design.2.0.0\lib\net461\Microsoft.EntityFrameworkCore.Design.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.EntityFrameworkCore.Relational.2.0.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.0.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Caching.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Caching.Memory.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Options.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0.13\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="SharpCompress, Version=0.18.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.8\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Interactive.Async, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
-      <HintPath>$(SolutionDir)\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="OpenTK.dll.config" />
-    <None Include="osu!.res" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
-      <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
-      <Name>osu.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
-      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
-      <Name>osu.Game.Resources</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Audio\SampleInfo.cs" />
-    <Compile Include="Beatmaps\Beatmap.cs" />
-    <Compile Include="Beatmaps\BeatmapConverter.cs" />
-    <Compile Include="Beatmaps\BeatmapDifficulty.cs" />
-    <Compile Include="Beatmaps\BeatmapInfo.cs" />
-    <Compile Include="Beatmaps\BeatmapManager.cs" />
-    <Compile Include="Beatmaps\BeatmapManager_WorkingBeatmap.cs" />
-    <Compile Include="Beatmaps\BeatmapMetadata.cs" />
-    <Compile Include="Beatmaps\BeatmapMetrics.cs" />
-    <Compile Include="Beatmaps\BeatmapOnlineInfo.cs" />
-    <Compile Include="Beatmaps\BeatmapProcessor.cs" />
-    <Compile Include="Beatmaps\BeatmapSetFileInfo.cs" />
-    <Compile Include="Beatmaps\BeatmapSetInfo.cs" />
-    <Compile Include="Beatmaps\BeatmapSetOnlineInfo.cs" />
-    <Compile Include="Beatmaps\BeatmapStatistic.cs" />
-    <Compile Include="Beatmaps\BeatmapStore.cs" />
-    <Compile Include="Beatmaps\ControlPoints\ControlPoint.cs" />
-    <Compile Include="Beatmaps\ControlPoints\ControlPointInfo.cs" />
-    <Compile Include="Beatmaps\ControlPoints\DifficultyControlPoint.cs" />
-    <Compile Include="Beatmaps\ControlPoints\EffectControlPoint.cs" />
-    <Compile Include="Beatmaps\ControlPoints\SampleControlPoint.cs" />
-    <Compile Include="Beatmaps\ControlPoints\TimingControlPoint.cs" />
-    <Compile Include="Beatmaps\DifficultyCalculator.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapSetCover.cs" />
-    <Compile Include="Beatmaps\Formats\IHasComboColours.cs" />
-    <Compile Include="Beatmaps\Formats\IHasCustomColours.cs" />
-    <Compile Include="Beatmaps\Formats\JsonBeatmapDecoder.cs" />
-    <Compile Include="Beatmaps\Formats\LegacyDecoder.cs" />
-    <Compile Include="Beatmaps\Formats\LegacyStoryboardDecoder.cs" />
-    <Compile Include="Beatmaps\IBeatmapConverter.cs" />
-    <Compile Include="Configuration\DatabasedSetting.cs" />
-    <Compile Include="Configuration\SettingsStore.cs" />
-    <Compile Include="Configuration\DatabasedConfigManager.cs" />
-    <Compile Include="Configuration\SpeedChangeVisualisationMethod.cs" />
-    <Compile Include="Database\ArchiveModelManager.cs" />
-    <Compile Include="Database\DatabaseContextFactory.cs" />
-    <Compile Include="Database\DatabaseWriteUsage.cs" />
-    <Compile Include="Database\ICanAcceptFiles.cs" />
-    <Compile Include="Database\IDatabaseContextFactory.cs" />
-    <Compile Include="Database\IHasFiles.cs" />
-    <Compile Include="Database\IHasPrimaryKey.cs" />
-    <Compile Include="Database\INamedFileInfo.cs" />
-    <Compile Include="Database\ISoftDelete.cs" />
-    <Compile Include="Database\MutableDatabaseBackedStore.cs" />
-    <Compile Include="Database\SingletonContextFactory.cs" />
-    <Compile Include="Graphics\Containers\LinkFlowContainer.cs" />
-    <Compile Include="Graphics\DrawableDate.cs" />
-    <Compile Include="Graphics\ScreenshotManager.cs" />
-    <Compile Include="Graphics\Textures\LargeTextureStore.cs" />
-    <Compile Include="IO\Archives\ArchiveReader.cs" />
-    <Compile Include="IO\Archives\LegacyFilesystemReader.cs" />
-    <Compile Include="IO\Archives\ZipArchiveReader.cs" />
-    <Compile Include="Online\API\DummyAPIAccess.cs" />
-    <Compile Include="Online\API\IAPIProvider.cs" />
-    <Compile Include="Online\API\APIDownloadRequest.cs" />
-    <Compile Include="Online\API\Requests\GetUserRecentActivitiesRequest.cs" />
-    <Compile Include="Online\API\Requests\GetUserRequest.cs" />
-    <Compile Include="Migrations\20180125143340_Settings.cs" />
-    <Compile Include="Migrations\20180125143340_Settings.Designer.cs">
-      <DependentUpon>20180125143340_Settings.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\20180131154205_AddMuteBinding.cs" />
-    <Compile Include="Overlays\Profile\Sections\Recent\DrawableRecentActivity.cs" />
-    <Compile Include="Overlays\Profile\Sections\Recent\MedalIcon.cs" />
-    <Compile Include="Overlays\Profile\Sections\Recent\PaginatedRecentActivityContainer.cs" />
-    <Compile Include="Overlays\Profile\SupporterIcon.cs" />
-    <Compile Include="Online\API\Requests\GetFriendsRequest.cs" />
-    <Compile Include="Overlays\Settings\DangerousSettingsButton.cs" />
-    <Compile Include="Graphics\UserInterface\HoverClickSounds.cs" />
-    <Compile Include="Graphics\UserInterface\HoverSounds.cs" />
-    <Compile Include="Graphics\UserInterface\OsuButton.cs" />
-    <Compile Include="IO\Serialization\KeyContractResolver.cs" />
-    <Compile Include="Migrations\20171019041408_InitialCreate.cs" />
-    <Compile Include="Migrations\20171019041408_InitialCreate.Designer.cs">
-      <DependentUpon>20171019041408_InitialCreate.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\20171025071459_AddMissingIndexRules.cs" />
-    <Compile Include="Migrations\20171025071459_AddMissingIndexRules.Designer.cs">
-      <DependentUpon>20171025071459_AddMissingIndexRules.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs" />
-    <Compile Include="Migrations\20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs">
-      <DependentUpon>20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\20171209034410_AddRulesetInfoShortName.cs" />
-    <Compile Include="Migrations\20171209034410_AddRulesetInfoShortName.Designer.cs">
-      <DependentUpon>20171209034410_AddRulesetInfoShortName.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\20180219060912_AddSkins.cs" />
-    <Compile Include="Migrations\20180219060912_AddSkins.Designer.cs">
-      <DependentUpon>20180219060912_AddSkins.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\OsuDbContextModelSnapshot.cs" />
-    <Compile Include="Online\API\Requests\GetBeatmapSetRequest.cs" />
-    <Compile Include="Online\Chat\DrawableLinkCompiler.cs" />
-    <Compile Include="Online\Chat\MessageFormatter.cs" />
-    <Compile Include="Online\API\Requests\APIResponseBeatmapSet.cs" />
-    <Compile Include="Online\API\Requests\GetUserMostPlayedBeatmapsRequest.cs" />
-    <Compile Include="Overlays\BeatmapSet\Scores\ClickableUsername.cs" />
-    <Compile Include="Overlays\BeatmapSet\Scores\DrawableScore.cs" />
-    <Compile Include="Overlays\BeatmapSet\Scores\DrawableTopScore.cs" />
-    <Compile Include="Overlays\BeatmapSet\Scores\ScoresContainer.cs" />
-    <Compile Include="Online\API\Requests\GetUserBeatmapsRequest.cs" />
-    <Compile Include="Overlays\Profile\Sections\BeatmapMetadataContainer.cs" />
-    <Compile Include="Overlays\Profile\Sections\Beatmaps\PaginatedBeatmapContainer.cs" />
-    <Compile Include="Overlays\Profile\Sections\DrawableProfileRow.cs" />
-    <Compile Include="Overlays\Profile\Sections\Historical\DrawableMostPlayedRow.cs" />
-    <Compile Include="Overlays\Profile\Sections\Historical\PaginatedMostPlayedBeatmapContainer.cs" />
-    <Compile Include="Overlays\Profile\Sections\Kudosu\KudosuInfo.cs" />
-    <Compile Include="Overlays\Profile\Sections\PaginatedContainer.cs" />
-    <Compile Include="Overlays\Profile\Sections\Ranks\DrawablePerformanceScore.cs" />
-    <Compile Include="Overlays\Profile\Sections\Ranks\PaginatedScoreContainer.cs" />
-    <Compile Include="Overlays\Profile\Sections\Ranks\DrawableTotalScore.cs" />
-    <Compile Include="Overlays\Profile\Sections\Ranks\ScoreModsContainer.cs" />
-    <Compile Include="Overlays\Settings\Sections\Gameplay\ScrollingSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Maintenance\DeleteAllBeatmapsDialog.cs" />
-    <Compile Include="Overlays\VolumeOverlay.cs" />
-    <Compile Include="Overlays\Volume\MuteButton.cs" />
-    <Compile Include="Overlays\Volume\VolumeControlReceptor.cs" />
-    <Compile Include="Overlays\Volume\VolumeMeter.cs" />
-    <Compile Include="Rulesets\Configuration\IRulesetConfigManager.cs" />
-    <Compile Include="Rulesets\Configuration\RulesetConfigManager.cs" />
-    <Compile Include="Rulesets\Edit\HitObjectMask.cs" />
-    <Compile Include="Rulesets\Edit\Types\IHasEditablePosition.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableFailOverride.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableMod.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToBeatmapConverter.cs" />
-    <Compile Include="Overlays\Social\SocialGridPanel.cs" />
-    <Compile Include="Overlays\Social\SocialListPanel.cs" />
-    <Compile Include="Overlays\Social\SocialPanel.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToDrawableHitObject.cs" />
-    <Compile Include="Rulesets\Objects\HitWindows.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasComboInformation.cs" />
-    <Compile Include="Rulesets\Replays\Legacy\LegacyReplayFrame.cs" />
-    <Compile Include="Rulesets\Replays\Legacy\ReplayButtonState.cs" />
-    <Compile Include="Rulesets\Replays\ReplayFrame.cs" />
-    <Compile Include="Rulesets\Replays\Types\IConvertibleReplayFrame.cs" />
-    <Compile Include="Rulesets\Scoring\Legacy\LegacyScoreParser.cs" />
-    <Compile Include="Rulesets\UI\JudgementContainer.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\BindableBeatDivisor.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\BeatDivisorControl.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Layers\BorderLayer.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Layers\HitObjectMaskLayer.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Layers\SelectionBox.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Layers\SelectionLayer.cs" />
-    <Compile Include="Screens\Play\ScreenWithBeatmapBackground.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\VisualSettings.cs" />
-    <Compile Include="Rulesets\Objects\CatmullApproximator.cs" />
-    <Compile Include="Rulesets\UI\HitObjectContainer.cs" />
-    <Compile Include="Rulesets\UI\ScalableContainer.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\Visualisers\SequentialSpeedChangeVisualiser.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\Visualisers\ISpeedChangeVisualiser.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\Visualisers\OverlappingSpeedChangeVisualiser.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\ScrollingDirection.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\ScrollingHitObjectContainer.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\ScrollingPlayfield.cs" />
-    <Compile Include="Rulesets\UI\Scrolling\ScrollingRulesetContainer.cs" />
-    <Compile Include="Screens\Select\ImportFromStablePopup.cs" />
-    <Compile Include="Overlays\Settings\SettingsButton.cs" />
-    <Compile Include="Screens\Edit\Components\BottomBarContainer.cs" />
-    <Compile Include="Screens\Edit\Components\PlaybackControl.cs" />
-    <Compile Include="Screens\Edit\Components\TimeInfoContainer.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToScoreProcessor.cs" />
-    <Compile Include="Beatmaps\Drawables\DifficultyColouredContainer.cs" />
-    <Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />
-    <Compile Include="Beatmaps\DummyWorkingBeatmap.cs" />
-    <Compile Include="Beatmaps\Formats\Decoder.cs" />
-    <Compile Include="Beatmaps\Formats\LegacyBeatmapDecoder.cs" />
-    <Compile Include="Online\API\Requests\GetUserScoresRequest.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\RadioButtons\DrawableRadioButton.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\RadioButtons\RadioButton.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\RadioButtons\RadioButtonCollection.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Timeline\TimelineButton.cs" />
-    <Compile Include="Screens\Play\Break\BreakArrows.cs" />
-    <Compile Include="Screens\Play\Break\BlurredIcon.cs" />
-    <Compile Include="Screens\Play\BreakOverlay.cs" />
-    <Compile Include="Screens\Play\Break\GlowIcon.cs" />
-    <Compile Include="Screens\Play\Break\BreakInfo.cs" />
-    <Compile Include="Screens\Play\Break\BreakInfoLine.cs" />
-    <Compile Include="Screens\Play\Break\LetterboxOverlay.cs" />
-    <Compile Include="Screens\Play\Break\RemainingTimeCounter.cs" />
-    <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
-    <Compile Include="Beatmaps\RankStatus.cs" />
-    <Compile Include="Beatmaps\Timing\BreakPeriod.cs" />
-    <Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
-    <Compile Include="Beatmaps\WorkingBeatmap.cs" />
-    <Compile Include="Configuration\OsuConfigManager.cs" />
-    <Compile Include="Configuration\RankingType.cs" />
-    <Compile Include="Configuration\ReleaseStream.cs" />
-    <Compile Include="Configuration\ScoreMeterType.cs" />
-    <Compile Include="Configuration\ScreenshotFormat.cs" />
-    <Compile Include="Configuration\RandomSelectAlgorithm.cs" />
-    <Compile Include="Database\DatabaseBackedStore.cs" />
-    <Compile Include="Database\OsuDbContext.cs" />
-    <Compile Include="Graphics\Backgrounds\Background.cs" />
-    <Compile Include="Graphics\Backgrounds\Triangles.cs" />
-    <Compile Include="Graphics\Containers\BeatSyncedContainer.cs" />
-    <Compile Include="Graphics\Containers\ConstrainedIconContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuClickableContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuFocusedOverlayContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuHoverContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuScrollContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuTextFlowContainer.cs" />
-    <Compile Include="Graphics\Containers\ParallaxContainer.cs" />
-    <Compile Include="Graphics\Containers\ReverseChildIDFillFlowContainer.cs" />
-    <Compile Include="Graphics\Containers\SectionsContainer.cs" />
-    <Compile Include="Graphics\Cursor\IProvideCursor.cs" />
-    <Compile Include="Graphics\Cursor\MenuCursor.cs" />
-    <Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
-    <Compile Include="Graphics\Cursor\CursorOverrideContainer.cs" />
-    <Compile Include="Graphics\Cursor\OsuTooltipContainer.cs" />
-    <Compile Include="Graphics\IHasAccentColour.cs" />
-    <Compile Include="Graphics\OsuColour.cs" />
-    <Compile Include="Graphics\SpriteIcon.cs" />
-    <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
-    <Compile Include="Graphics\UserInterface\BackButton.cs" />
-    <Compile Include="Graphics\UserInterface\Bar.cs" />
-    <Compile Include="Graphics\UserInterface\BarGraph.cs" />
-    <Compile Include="Graphics\UserInterface\BreadcrumbControl.cs" />
-    <Compile Include="Graphics\UserInterface\DialogButton.cs" />
-    <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\IconButton.cs" />
-    <Compile Include="Graphics\UserInterface\LineGraph.cs" />
-    <Compile Include="Graphics\UserInterface\LoadingAnimation.cs" />
-    <Compile Include="Graphics\UserInterface\MenuItemType.cs" />
-    <Compile Include="Graphics\UserInterface\Nub.cs" />
-    <Compile Include="Graphics\UserInterface\TriangleButton.cs" />
-    <Compile Include="Graphics\UserInterface\OsuCheckbox.cs" />
-    <Compile Include="Graphics\UserInterface\OsuContextMenu.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
-    <Compile Include="Graphics\UserInterface\OsuEnumDropdown.cs" />
-    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
-    <Compile Include="Graphics\UserInterface\OsuMenuItem.cs" />
-    <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabControlCheckbox.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\PageTabControl.cs" />
-    <Compile Include="Graphics\UserInterface\PercentageCounter.cs" />
-    <Compile Include="Graphics\UserInterface\ProgressBar.cs" />
-    <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
-    <Compile Include="Graphics\UserInterface\ScoreCounter.cs" />
-    <Compile Include="Graphics\UserInterface\SearchTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\SimpleComboCounter.cs" />
-    <Compile Include="Graphics\UserInterface\StarCounter.cs" />
-    <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
-    <Compile Include="Input\Bindings\DatabasedKeyBinding.cs" />
-    <Compile Include="Input\Bindings\DatabasedKeyBindingContainer.cs" />
-    <Compile Include="Input\Bindings\GlobalActionContainer.cs" />
-    <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
-    <Compile Include="Input\KeyBindingStore.cs" />
-    <Compile Include="IO\FileInfo.cs" />
-    <Compile Include="IO\FileStore.cs" />
-    <Compile Include="IO\Legacy\ILegacySerializable.cs" />
-    <Compile Include="IO\Legacy\SerializationReader.cs" />
-    <Compile Include="IO\Legacy\SerializationWriter.cs" />
-    <Compile Include="IO\Serialization\Converters\TypedListConverter.cs" />
-    <Compile Include="IO\Serialization\Converters\Vector2Converter.cs" />
-    <Compile Include="IO\Serialization\IJsonSerializable.cs" />
-    <Compile Include="IPC\ArchiveImportIPCChannel.cs" />
-    <Compile Include="IPC\ScoreIPCChannel.cs" />
-    <Compile Include="Online\API\APIAccess.cs" />
-    <Compile Include="Online\API\APIRequest.cs" />
-    <Compile Include="Online\API\IOnlineComponent.cs" />
-    <Compile Include="Online\API\OAuth.cs" />
-    <Compile Include="Online\API\OAuthToken.cs" />
-    <Compile Include="Online\API\Requests\DownloadBeatmapSetRequest.cs" />
-    <Compile Include="Online\API\Requests\GetBeatmapDetailsRequest.cs" />
-    <Compile Include="Online\API\Requests\SearchBeatmapSetsRequest.cs" />
-    <Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
-    <Compile Include="Online\API\Requests\GetScoresRequest.cs" />
-    <Compile Include="Online\API\Requests\GetUsersRequest.cs" />
-    <Compile Include="Online\API\Requests\ListChannelsRequest.cs" />
-    <Compile Include="Online\API\Requests\PostMessageRequest.cs" />
-    <Compile Include="Online\Chat\Channel.cs" />
-    <Compile Include="Online\Chat\ErrorMessage.cs" />
-    <Compile Include="Online\Chat\InfoMessage.cs" />
-    <Compile Include="Online\Chat\LocalEchoMessage.cs" />
-    <Compile Include="Online\Chat\Message.cs" />
-    <Compile Include="Online\Multiplayer\GameType.cs" />
-    <Compile Include="Online\Multiplayer\Room.cs" />
-    <Compile Include="Online\Multiplayer\RoomStatus.cs" />
-    <Compile Include="OsuGame.cs" />
-    <Compile Include="OsuGameBase.cs" />
-    <Compile Include="Overlays\ChatOverlay.cs" />
-    <Compile Include="Overlays\Chat\ChannelListItem.cs" />
-    <Compile Include="Overlays\Chat\ChannelSection.cs" />
-    <Compile Include="Overlays\Chat\ChannelSelectionOverlay.cs" />
-    <Compile Include="Overlays\Chat\ChatLine.cs" />
-    <Compile Include="Overlays\Chat\ChatTabControl.cs" />
-    <Compile Include="Overlays\Direct\PlayButton.cs" />
-    <Compile Include="Overlays\Chat\DrawableChannel.cs" />
-    <Compile Include="Overlays\DialogOverlay.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialog.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogButton.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogCancelButton.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogOkButton.cs" />
-    <Compile Include="Overlays\DirectOverlay.cs" />
-    <Compile Include="Overlays\Direct\DirectGridPanel.cs" />
-    <Compile Include="Overlays\Direct\DirectListPanel.cs" />
-    <Compile Include="Overlays\Direct\DirectPanel.cs" />
-    <Compile Include="Overlays\Direct\DownloadButton.cs" />
-    <Compile Include="Overlays\Direct\FilterControl.cs" />
-    <Compile Include="Overlays\Direct\Header.cs" />
-    <Compile Include="Overlays\KeyBindingOverlay.cs" />
-    <Compile Include="Overlays\KeyBinding\GlobalKeyBindingsSection.cs" />
-    <Compile Include="Overlays\KeyBinding\KeyBindingRow.cs" />
-    <Compile Include="Overlays\KeyBinding\KeyBindingsSubsection.cs" />
-    <Compile Include="Overlays\KeyBinding\RulesetBindingsSection.cs" />
-    <Compile Include="Overlays\KeyBinding\VariantBindingsSubsection.cs" />
-    <Compile Include="Overlays\LoginOverlay.cs" />
-    <Compile Include="Overlays\MainSettings.cs" />
-    <Compile Include="Overlays\MedalOverlay.cs" />
-    <Compile Include="Overlays\MedalSplash\DrawableMedal.cs" />
-    <Compile Include="Overlays\Mods\SpecialSection.cs" />
-    <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
-    <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
-    <Compile Include="Overlays\Mods\ModButton.cs" />
-    <Compile Include="Overlays\Mods\ModButtonEmpty.cs" />
-    <Compile Include="Overlays\Mods\ModSection.cs" />
-    <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
-    <Compile Include="Overlays\MusicController.cs" />
-    <Compile Include="Overlays\Music\CollectionsDropdown.cs" />
-    <Compile Include="Overlays\Music\FilterControl.cs" />
-    <Compile Include="Overlays\Music\PlaylistItem.cs" />
-    <Compile Include="Overlays\Music\PlaylistList.cs" />
-    <Compile Include="Overlays\Music\PlaylistOverlay.cs" />
-    <Compile Include="Overlays\NotificationOverlay.cs" />
-    <Compile Include="Overlays\Notifications\IHasCompletionTarget.cs" />
-    <Compile Include="Overlays\Notifications\Notification.cs" />
-    <Compile Include="Overlays\Notifications\NotificationSection.cs" />
-    <Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" />
-    <Compile Include="Overlays\Notifications\ProgressNotification.cs" />
-    <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
-    <Compile Include="Overlays\OnScreenDisplay.cs" />
-    <Compile Include="Overlays\Profile\Sections\Ranks\DrawableProfileScore.cs" />
-    <Compile Include="Overlays\Profile\ProfileHeader.cs" />
-    <Compile Include="Overlays\Profile\ProfileSection.cs" />
-    <Compile Include="Overlays\Profile\RankGraph.cs" />
-    <Compile Include="Overlays\Profile\Sections\AboutSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\BeatmapsSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\HistoricalSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\KudosuSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\MedalsSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\RanksSection.cs" />
-    <Compile Include="Overlays\Profile\Sections\RecentSection.cs" />
-    <Compile Include="Overlays\SearchableList\DisplayStyleControl.cs" />
-    <Compile Include="Overlays\SearchableList\HeaderTabControl.cs" />
-    <Compile Include="Overlays\SearchableList\SearchableListFilterControl.cs" />
-    <Compile Include="Overlays\SearchableList\SearchableListHeader.cs" />
-    <Compile Include="Overlays\SearchableList\SearchableListOverlay.cs" />
-    <Compile Include="Overlays\SearchableList\SlimEnumDropdown.cs" />
-    <Compile Include="Overlays\SettingsOverlay.cs" />
-    <Compile Include="Overlays\Settings\Sections\AudioSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Audio\AudioDevicesSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Audio\MainMenuSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Audio\OffsetSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Audio\VolumeSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\DebugSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Debug\GCSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Debug\GeneralSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\GameplaySection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Gameplay\GeneralSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Gameplay\SongSelectSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\GeneralSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\General\LanguageSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\General\LoginSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\General\UpdateSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\GraphicsSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Graphics\DetailSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Graphics\LayoutSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Graphics\MainMenuSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Graphics\RendererSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\InputSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Input\KeyboardSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\Input\MouseSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\MaintenanceSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\Maintenance\GeneralSettings.cs" />
-    <Compile Include="Overlays\Settings\Sections\OnlineSection.cs" />
-    <Compile Include="Overlays\Settings\Sections\SkinSection.cs" />
-    <Compile Include="Overlays\Settings\SettingsCheckbox.cs" />
-    <Compile Include="Overlays\Settings\SettingsDropdown.cs" />
-    <Compile Include="Overlays\Settings\SettingsEnumDropdown.cs" />
-    <Compile Include="Overlays\Settings\SettingsFooter.cs" />
-    <Compile Include="Overlays\Settings\SettingsHeader.cs" />
-    <Compile Include="Overlays\Settings\SettingsItem.cs" />
-    <Compile Include="Overlays\Settings\SettingsLabel.cs" />
-    <Compile Include="Overlays\Settings\SettingsSection.cs" />
-    <Compile Include="Overlays\Settings\SettingsSlider.cs" />
-    <Compile Include="Overlays\Settings\SettingsSubsection.cs" />
-    <Compile Include="Overlays\Settings\SettingsTextBox.cs" />
-    <Compile Include="Overlays\Settings\Sidebar.cs" />
-    <Compile Include="Overlays\Settings\SidebarButton.cs" />
-    <Compile Include="Overlays\SocialOverlay.cs" />
-    <Compile Include="Overlays\Social\FilterControl.cs" />
-    <Compile Include="Overlays\Social\Header.cs" />
-    <Compile Include="Overlays\Toolbar\Toolbar.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarDirectButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarModeButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarModeSelector.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarNotificationButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarOverlayToggleButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarSettingsButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarSocialButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarUserArea.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarUserButton.cs" />
-    <Compile Include="Overlays\UserProfileOverlay.cs" />
-    <Compile Include="Overlays\WaveOverlayContainer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Rulesets\Edit\Tools\HitObjectCompositionTool.cs" />
-    <Compile Include="Rulesets\Edit\Tools\ICompositionTool.cs" />
-    <Compile Include="Rulesets\Edit\HitObjectComposer.cs" />
-    <Compile Include="Rulesets\Edit\ToolboxGroup.cs" />
-    <Compile Include="Rulesets\Judgements\DrawableJudgement.cs" />
-    <Compile Include="Rulesets\Judgements\Judgement.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToClock.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToDifficulty.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToHitObject.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableToRulesetContainer.cs" />
-    <Compile Include="Rulesets\Mods\Mod.cs" />
-    <Compile Include="Rulesets\Mods\ModAutoplay.cs" />
-    <Compile Include="Rulesets\Mods\ModCinema.cs" />
-    <Compile Include="Rulesets\Mods\ModDaycore.cs" />
-    <Compile Include="Rulesets\Mods\ModDoubleTime.cs" />
-    <Compile Include="Rulesets\Mods\ModEasy.cs" />
-    <Compile Include="Rulesets\Mods\ModFlashlight.cs" />
-    <Compile Include="Rulesets\Mods\ModHalfTime.cs" />
-    <Compile Include="Rulesets\Mods\ModHardRock.cs" />
-    <Compile Include="Rulesets\Mods\ModHidden.cs" />
-    <Compile Include="Rulesets\Mods\ModNightcore.cs" />
-    <Compile Include="Rulesets\Mods\ModNoFail.cs" />
-    <Compile Include="Rulesets\Mods\ModPerfect.cs" />
-    <Compile Include="Rulesets\Mods\ModRelax.cs" />
-    <Compile Include="Rulesets\Mods\ModSuddenDeath.cs" />
-    <Compile Include="Rulesets\Mods\ModType.cs" />
-    <Compile Include="Rulesets\Mods\MultiMod.cs" />
-    <Compile Include="Rulesets\Objects\BezierApproximator.cs" />
-    <Compile Include="Rulesets\Objects\CircularArcApproximator.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\ArmedState.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\DrawableHitObject.cs" />
-    <Compile Include="Rulesets\Scoring\HitResult.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\IScrollingHitObject.cs" />
-    <Compile Include="Rulesets\Objects\HitObject.cs" />
-    <Compile Include="Rulesets\Objects\HitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectType.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHold.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\SliderCurve.cs" />
-    <Compile Include="Rulesets\Objects\Types\CurveType.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasCombo.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasCurve.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasDistance.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasEndTime.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasHold.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasPosition.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasRepeats.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasXPosition.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasYPosition.cs" />
-    <Compile Include="Rulesets\Replays\AutoGenerator.cs" />
-    <Compile Include="Rulesets\Replays\FramedReplayInputHandler.cs" />
-    <Compile Include="Rulesets\Replays\IAutoGenerator.cs" />
-    <Compile Include="Rulesets\Replays\Replay.cs" />
-    <Compile Include="Rulesets\Ruleset.cs" />
-    <Compile Include="Rulesets\RulesetInfo.cs" />
-    <Compile Include="Rulesets\RulesetStore.cs" />
-    <Compile Include="Rulesets\Scoring\PerformanceCalculator.cs" />
-    <Compile Include="Rulesets\Scoring\Score.cs" />
-    <Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
-    <Compile Include="Rulesets\Scoring\ScoreRank.cs" />
-    <Compile Include="Rulesets\Scoring\ScoreStore.cs" />
-    <Compile Include="Rulesets\Timing\MultiplierControlPoint.cs" />
-    <Compile Include="Rulesets\UI\ModIcon.cs" />
-    <Compile Include="Rulesets\UI\Playfield.cs" />
-    <Compile Include="Rulesets\UI\RulesetContainer.cs" />
-    <Compile Include="Rulesets\UI\RulesetInputManager.cs" />
-    <Compile Include="Screens\BackgroundScreen.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenBeatmap.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenCustom.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenDefault.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
-    <Compile Include="Screens\Charts\ChartInfo.cs" />
-    <Compile Include="Screens\Charts\ChartListing.cs" />
-    <Compile Include="Screens\Direct\OnlineListing.cs" />
-    <Compile Include="Screens\Edit\Editor.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Parts\BreakPart.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Parts\BookmarkPart.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Parts\ControlPointPart.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Parts\MarkerPart.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Parts\TimelinePart.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Visualisations\DurationVisualisation.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\Visualisations\PointVisualisation.cs" />
-    <Compile Include="Screens\Edit\Components\Timelines\Summary\SummaryTimeline.cs" />
-    <Compile Include="Screens\Edit\Screens\EditorScreenMode.cs" />
-    <Compile Include="Screens\Edit\Menus\EditorMenuBar.cs" />
-    <Compile Include="Screens\Edit\Menus\EditorMenuItem.cs" />
-    <Compile Include="Screens\Edit\Menus\EditorMenuItemSpacer.cs" />
-    <Compile Include="Screens\Edit\Menus\ScreenSelectionTabControl.cs" />
-    <Compile Include="Screens\Edit\Screens\Design\Design.cs" />
-    <Compile Include="Screens\Edit\Screens\EditorScreen.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Compose.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Timeline\ScrollableTimeline.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\Timeline\ScrollingTimelineContainer.cs" />
-    <Compile Include="Screens\Loader.cs" />
-    <Compile Include="Screens\Menu\Button.cs" />
-    <Compile Include="Screens\Menu\ButtonSystem.cs" />
-    <Compile Include="Screens\Menu\Disclaimer.cs" />
-    <Compile Include="Screens\Menu\FlowContainerWithOrigin.cs" />
-    <Compile Include="Screens\Menu\Intro.cs" />
-    <Compile Include="Screens\Menu\IntroSequence.cs" />
-    <Compile Include="Screens\Menu\LogoVisualisation.cs" />
-    <Compile Include="Screens\Menu\MainMenu.cs" />
-    <Compile Include="Screens\Menu\MenuSideFlashes.cs" />
-    <Compile Include="Screens\Menu\OsuLogo.cs" />
-    <Compile Include="Screens\Multiplayer\DrawableGameType.cs" />
-    <Compile Include="Screens\Multiplayer\DrawableRoom.cs" />
-    <Compile Include="Screens\Multiplayer\Lobby.cs" />
-    <Compile Include="Screens\Multiplayer\Match.cs" />
-    <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
-    <Compile Include="Screens\Multiplayer\ModeTypeInfo.cs" />
-    <Compile Include="Screens\Multiplayer\ParticipantInfo.cs" />
-    <Compile Include="Screens\Multiplayer\RoomInspector.cs" />
-    <Compile Include="Screens\OsuScreen.cs" />
-    <Compile Include="Screens\Play\FailOverlay.cs" />
-    <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
-    <Compile Include="Screens\Play\HUDOverlay.cs" />
-    <Compile Include="Screens\Play\HUD\ComboCounter.cs" />
-    <Compile Include="Screens\Play\HUD\ComboResultCounter.cs" />
-    <Compile Include="Screens\Play\HUD\HealthDisplay.cs" />
-    <Compile Include="Screens\Play\HUD\ModDisplay.cs" />
-    <Compile Include="Screens\Play\HUD\StandardComboCounter.cs" />
-    <Compile Include="Screens\Play\HUD\StandardHealthDisplay.cs" />
-    <Compile Include="Screens\Play\KeyCounter.cs" />
-    <Compile Include="Screens\Play\KeyCounterAction.cs" />
-    <Compile Include="Screens\Play\KeyCounterCollection.cs" />
-    <Compile Include="Screens\Play\KeyCounterKeyboard.cs" />
-    <Compile Include="Screens\Play\KeyCounterMouse.cs" />
-    <Compile Include="Screens\Play\GameplayMenuOverlay.cs" />
-    <Compile Include="Screens\Play\PauseContainer.cs" />
-    <Compile Include="Screens\Play\Player.cs" />
-    <Compile Include="Screens\Play\PlayerLoader.cs" />
-    <Compile Include="Screens\Play\ReplayPlayer.cs" />
-    <Compile Include="Screens\Play\HUD\PlayerSettingsOverlay.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\CollectionSettings.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\DiscussionSettings.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\PlaybackSettings.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\PlayerCheckbox.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\PlayerSettingsGroup.cs" />
-    <Compile Include="Screens\Play\PlayerSettings\PlayerSliderBar.cs" />
-    <Compile Include="Screens\Play\SkipOverlay.cs" />
-    <Compile Include="Screens\Play\SongProgress.cs" />
-    <Compile Include="Screens\Play\SongProgressBar.cs" />
-    <Compile Include="Screens\Play\SongProgressGraph.cs" />
-    <Compile Include="Screens\Play\SongProgressInfo.cs" />
-    <Compile Include="Screens\Play\SquareGraph.cs" />
-    <Compile Include="Screens\Ranking\AspectContainer.cs" />
-    <Compile Include="Screens\Ranking\ResultMode.cs" />
-    <Compile Include="Screens\Ranking\ResultModeButton.cs" />
-    <Compile Include="Screens\Ranking\ResultModeTabControl.cs" />
-    <Compile Include="Screens\Ranking\Results.cs" />
-    <Compile Include="Screens\Ranking\ResultsPage.cs" />
-    <Compile Include="Screens\Ranking\ResultsPageRanking.cs" />
-    <Compile Include="Screens\Ranking\ResultsPageScore.cs" />
-    <Compile Include="Screens\ScreenWhiteBox.cs" />
-    <Compile Include="Screens\Select\BeatmapCarousel.cs" />
-    <Compile Include="Screens\Select\BeatmapDeleteDialog.cs" />
-    <Compile Include="Screens\Select\BeatmapDetailArea.cs" />
-    <Compile Include="Screens\Select\BeatmapDetailAreaTabControl.cs" />
-    <Compile Include="Screens\Select\BeatmapDetails.cs" />
-    <Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
-    <Compile Include="Screens\Select\Carousel\CarouselBeatmap.cs" />
-    <Compile Include="Screens\Select\Carousel\CarouselBeatmapSet.cs" />
-    <Compile Include="Screens\Select\Carousel\CarouselGroup.cs" />
-    <Compile Include="Screens\Select\Carousel\CarouselGroupEagerSelect.cs" />
-    <Compile Include="Screens\Select\Carousel\CarouselItem.cs" />
-    <Compile Include="Screens\Select\Carousel\DrawableCarouselBeatmap.cs" />
-    <Compile Include="Screens\Select\Carousel\DrawableCarouselBeatmapSet.cs" />
-    <Compile Include="Screens\Select\Carousel\DrawableCarouselItem.cs" />
-    <Compile Include="Screens\Select\Details\AdvancedStats.cs" />
-    <Compile Include="Screens\Select\Details\FailRetryGraph.cs" />
-    <Compile Include="Screens\Select\Details\UserRatings.cs" />
-    <Compile Include="Screens\Select\EditSongSelect.cs" />
-    <Compile Include="Screens\Select\FilterControl.cs" />
-    <Compile Include="Screens\Select\FilterCriteria.cs" />
-    <Compile Include="Screens\Select\Filter\GroupMode.cs" />
-    <Compile Include="Screens\Select\Filter\SortMode.cs" />
-    <Compile Include="Screens\Select\Footer.cs" />
-    <Compile Include="Screens\Select\FooterButton.cs" />
-    <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
-    <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
-    <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
-    <Compile Include="Screens\Select\Leaderboards\MessagePlaceholder.cs" />
-    <Compile Include="Screens\Select\Leaderboards\Placeholder.cs" />
-    <Compile Include="Screens\Select\Leaderboards\RetrievalFailurePlaceholder.cs" />
-    <Compile Include="Screens\Select\MatchSongSelect.cs" />
-    <Compile Include="Screens\Select\Options\BeatmapOptionsButton.cs" />
-    <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
-    <Compile Include="Screens\Select\PlaySongSelect.cs" />
-    <Compile Include="Screens\Select\SongSelect.cs" />
-    <Compile Include="Screens\Select\WedgeBackground.cs" />
-    <Compile Include="Screens\Tournament\Components\DrawingsConfigManager.cs" />
-    <Compile Include="Screens\Tournament\Components\VisualiserContainer.cs" />
-    <Compile Include="Screens\Tournament\Drawings.cs" />
-    <Compile Include="Screens\Tournament\Group.cs" />
-    <Compile Include="Screens\Tournament\GroupContainer.cs" />
-    <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
-    <Compile Include="Screens\Tournament\Teams\DrawingsTeam.cs" />
-    <Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
-    <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
-    <Compile Include="Skinning\LegacyBeatmapSkin.cs" />
-    <Compile Include="Skinning\DefaultSkin.cs" />
-    <Compile Include="Skinning\ISkinSource.cs" />
-    <Compile Include="Skinning\LegacySkin.cs" />
-    <Compile Include="Skinning\LegacySkinDecoder.cs" />
-    <Compile Include="Skinning\LocalSkinOverrideContainer.cs" />
-    <Compile Include="Skinning\Skin.cs" />
-    <Compile Include="Skinning\SkinConfiguration.cs" />
-    <Compile Include="Skinning\SkinFileInfo.cs" />
-    <Compile Include="Skinning\SkinInfo.cs" />
-    <Compile Include="Skinning\SkinManager.cs" />
-    <Compile Include="Skinning\SkinnableDrawable.cs" />
-    <Compile Include="Skinning\SkinnableSound.cs" />
-    <Compile Include="Skinning\SkinReloadableDrawable.cs" />
-    <Compile Include="Skinning\SkinStore.cs" />
-    <Compile Include="Storyboards\CommandLoop.cs" />
-    <Compile Include="Storyboards\CommandTimeline.cs" />
-    <Compile Include="Storyboards\CommandTimelineGroup.cs" />
-    <Compile Include="Storyboards\CommandTrigger.cs" />
-    <Compile Include="Storyboards\Drawables\DrawablesExtensions.cs" />
-    <Compile Include="Storyboards\Drawables\DrawableStoryboard.cs" />
-    <Compile Include="Storyboards\Drawables\DrawableStoryboardAnimation.cs" />
-    <Compile Include="Storyboards\Drawables\DrawableStoryboardLayer.cs" />
-    <Compile Include="Storyboards\Drawables\DrawableStoryboardSprite.cs" />
-    <Compile Include="Storyboards\Drawables\IFlippable.cs" />
-    <Compile Include="Storyboards\IStoryboardElement.cs" />
-    <Compile Include="Storyboards\Storyboard.cs" />
-    <Compile Include="Storyboards\StoryboardAnimation.cs" />
-    <Compile Include="Storyboards\StoryboardLayer.cs" />
-    <Compile Include="Storyboards\StoryboardSample.cs" />
-    <Compile Include="Storyboards\StoryboardSprite.cs" />
-    <Compile Include="Tests\Beatmaps\BeatmapConversionTest.cs" />
-    <Compile Include="Tests\Beatmaps\TestBeatmap.cs" />
-    <Compile Include="Tests\Beatmaps\TestWorkingBeatmap.cs" />
-    <Compile Include="Tests\CleanRunHeadlessGameHost.cs" />
-    <Compile Include="Tests\Platform\TestStorage.cs" />
-    <Compile Include="Tests\TestTestCase.cs" />
-    <Compile Include="Tests\Visual\OsuTestCase.cs" />
-    <Compile Include="Tests\Visual\EditorTestCase.cs" />
-    <Compile Include="Tests\Visual\TestCasePerformancePoints.cs" />
-    <Compile Include="Tests\Visual\ScreenTestCase.cs" />
-    <Compile Include="Tests\Visual\TestCasePlayer.cs" />
-    <Compile Include="Users\Avatar.cs" />
-    <Compile Include="Users\Country.cs" />
-    <Compile Include="Users\Medal.cs" />
-    <Compile Include="Users\Team.cs" />
-    <Compile Include="Users\UpdateableAvatar.cs" />
-    <Compile Include="Users\User.cs" />
-    <Compile Include="Users\UserCoverBackground.cs" />
-    <Compile Include="Users\UserPanel.cs" />
-    <Compile Include="Users\UserStatistics.cs" />
-    <Compile Include="Users\UserStatus.cs" />
-    <Compile Include="Overlays\BeatmapSetOverlay.cs" />
-    <Compile Include="Overlays\BeatmapSet\Info.cs" />
-    <Compile Include="Overlays\BeatmapSet\Header.cs" />
-    <Compile Include="Overlays\BeatmapSet\AuthorInfo.cs" />
-    <Compile Include="Overlays\BeatmapSet\BeatmapPicker.cs" />
-    <Compile Include="Overlays\BeatmapSet\HeaderButton.cs" />
-    <Compile Include="Overlays\BeatmapSet\Details.cs" />
-    <Compile Include="Overlays\BeatmapSet\FavouriteButton.cs" />
-    <Compile Include="Overlays\BeatmapSet\DownloadButton.cs" />
-    <Compile Include="Overlays\BeatmapSet\BasicStats.cs" />
-    <Compile Include="Overlays\BeatmapSet\SuccessRate.cs" />
-    <Compile Include="Overlays\BeatmapSet\PreviewButton.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
-  <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
-  <Import Project="$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('$(SolutionDir)\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.8\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\osu.Game.props" />
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
+    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
+  </ItemGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Humanizer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="SharpCompress" Version="0.18.1" />
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
+  </ItemGroup>
 </Project>

osu.Game/packages.config

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
--->
-<packages>
-  <package id="DotNetZip" version="1.10.1" targetFramework="net461" />
-  <package id="Humanizer" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.af" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ar" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.bg" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.bn-BD" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.cs" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.da" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.de" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.el" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.es" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fa" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fi-FI" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.fr-BE" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.he" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.hr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.hu" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.id" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.it" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ja" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.lv" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nb" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nb-NO" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.nl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.pl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.pt" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ro" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.ru" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sk" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sl" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sr-Latn" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.sv" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.tr" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uk" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uz-Cyrl-UZ" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.uz-Latn-UZ" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.vi" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-CN" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-Hans" version="2.2.0" targetFramework="net461" />
-  <package id="Humanizer.Core.zh-Hant" version="2.2.0" targetFramework="net461" />
-  <package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
-  <package id="Microsoft.CSharp" version="4.4.0" targetFramework="net461" />
-  <package id="Microsoft.Data.Sqlite.Core" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Design" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Sqlite" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Sqlite.Core" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.EntityFrameworkCore.Tools" version="2.0.0" targetFramework="net461" developmentDependency="true" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="NUnit" version="3.8.1" targetFramework="net461" />
-  <package id="ppy.OpenTK" version="3.0.13" targetFramework="net461" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
-  <package id="SharpCompress" version="0.18.1" targetFramework="net461" />
-  <package id="SQLitePCLRaw.bundle_green" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.8" targetFramework="net461" />
-  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.8" targetFramework="net461" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
-  <package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
-  <package id="System.Interactive.Async" version="3.1.1" targetFramework="net461" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
-</packages>