Merge remote-tracking branch 'origin/update-framework' into letterboxing

# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs

osu.Game.Tests/Visual/TestCaseChatLink.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual
             linkColour = colours.Blue;
 
             var chatManager = new ChannelManager();
-            BindableCollection<Channel> availableChannels = (BindableCollection<Channel>)chatManager.AvailableChannels;
+            BindableList<Channel> availableChannels = (BindableList<Channel>)chatManager.AvailableChannels;
             availableChannels.Add(new Channel { Name = "#english"});
             availableChannels.Add(new Channel { Name = "#japanese" });
             Dependencies.Cache(chatManager);

osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs

@@ -73,8 +73,8 @@ namespace osu.Game.Tests.Visual
         {
             public event Action RoomsUpdated;
 
-            public readonly BindableCollection<Room> Rooms = new BindableCollection<Room>();
-            IBindableCollection<Room> IRoomManager.Rooms => Rooms;
+            public readonly BindableList<Room> Rooms = new BindableList<Room>();
+            IBindableList<Room> IRoomManager.Rooms => Rooms;
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
 

osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs

@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual
 
             public event Action RoomsUpdated;
 
-            public IBindableCollection<Room> Rooms { get; } = null;
+            public IBindableList<Room> Rooms { get; } = null;
 
             public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             {

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -151,7 +151,7 @@ namespace osu.Game.Beatmaps
 
         public bool WaveformLoaded => waveform.IsResultAvailable;
         public Waveform Waveform => waveform.Value;
-        protected virtual Waveform GetWaveform() => new Waveform();
+        protected virtual Waveform GetWaveform() => new Waveform(null);
         private readonly RecyclableLazy<Waveform> waveform;
 
         public bool StoryboardLoaded => storyboard.IsResultAvailable;

osu.Game/Online/Chat/ChannelManager.cs

@@ -29,8 +29,8 @@ namespace osu.Game.Online.Chat
             @"#lobby"
         };
 
-        private readonly BindableCollection<Channel> availableChannels = new BindableCollection<Channel>();
-        private readonly BindableCollection<Channel> joinedChannels = new BindableCollection<Channel>();
+        private readonly BindableList<Channel> availableChannels = new BindableList<Channel>();
+        private readonly BindableList<Channel> joinedChannels = new BindableList<Channel>();
 
         /// <summary>
         /// The currently opened channel
@@ -40,12 +40,12 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// The Channels the player has joined
         /// </summary>
-        public IBindableCollection<Channel> JoinedChannels => joinedChannels;
+        public IBindableList<Channel> JoinedChannels => joinedChannels;
 
         /// <summary>
         /// The channels available for the player to join
         /// </summary>
-        public IBindableCollection<Channel> AvailableChannels => availableChannels;
+        public IBindableList<Channel> AvailableChannels => availableChannels;
 
         private IAPIProvider api;
 

osu.Game/Online/Multiplayer/PlaylistItem.cs

@@ -37,10 +37,10 @@ namespace osu.Game.Online.Multiplayer
         public RulesetInfo Ruleset { get; set; }
 
         [JsonIgnore]
-        public readonly BindableCollection<Mod> AllowedMods = new BindableCollection<Mod>();
+        public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>();
 
         [JsonIgnore]
-        public readonly BindableCollection<Mod> RequiredMods = new BindableCollection<Mod>();
+        public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>();
 
         [JsonProperty("beatmap")]
         private APIBeatmap apiBeatmap { get; set; }

osu.Game/Online/Multiplayer/Room.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Online.Multiplayer
         public Bindable<User> Host { get; private set; } = new Bindable<User>();
 
         [JsonProperty("playlist")]
-        public BindableCollection<PlaylistItem> Playlist { get; set; } = new BindableCollection<PlaylistItem>();
+        public BindableList<PlaylistItem> Playlist { get; set; } = new BindableList<PlaylistItem>();
 
         [JsonProperty("channel_id")]
         public Bindable<int> ChannelId { get; private set; } = new Bindable<int>();

osu.Game/Screens/Multi/IRoomManager.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Multi
         /// <summary>
         /// All the active <see cref="Room"/>s.
         /// </summary>
-        IBindableCollection<Room> Rooms { get; }
+        IBindableList<Room> Rooms { get; }
 
         /// <summary>
         /// Creates a new <see cref="Room"/>.

osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
         public IBindable<Room> SelectedRoom => selectedRoom;
 
-        private readonly IBindableCollection<Room> rooms = new BindableCollection<Room>();
+        private readonly IBindableList<Room> rooms = new BindableList<Room>();
 
         private readonly FillFlowContainer<DrawableRoom> roomFlow;
         public IReadOnlyList<DrawableRoom> Rooms => roomFlow;

osu.Game/Screens/Multi/RoomBindings.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi
         public readonly Bindable<User> Host = new Bindable<User>();
         public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>();
         public readonly Bindable<GameType> Type = new Bindable<GameType>();
-        public readonly BindableCollection<PlaylistItem> Playlist = new BindableCollection<PlaylistItem>();
+        public readonly BindableList<PlaylistItem> Playlist = new BindableList<PlaylistItem>();
         public readonly Bindable<IEnumerable<User>> Participants = new Bindable<IEnumerable<User>>();
         public readonly Bindable<int> ParticipantCount = new Bindable<int>();
         public readonly Bindable<int?> MaxParticipants = new Bindable<int?>();

osu.Game/Screens/Multi/RoomManager.cs

@@ -21,8 +21,8 @@ namespace osu.Game.Screens.Multi
     {
         public event Action RoomsUpdated;
 
-        private readonly BindableCollection<Room> rooms = new BindableCollection<Room>();
-        public IBindableCollection<Room> Rooms => rooms;
+        private readonly BindableList<Room> rooms = new BindableList<Room>();
+        public IBindableList<Room> Rooms => rooms;
 
         private Room currentRoom;
 

osu.Game/osu.Game.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.1226.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.107.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />