Merge branch 'master' into update-placement-more-often

osu.Android.props

@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.213.0" />
   </ItemGroup>
 </Project>

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs

@@ -121,11 +121,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         room.Playlist.Add(new PlaylistItem
                         {
-                            Ruleset = ruleset,
+                            Ruleset = { Value = ruleset },
-                            Beatmap = new BeatmapInfo
+                            Beatmap =
+                            {
+                                Value = new BeatmapInfo
                                 {
                                     Metadata = new BeatmapMetadata()
                                 }
+                            }
                         });
                     }
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs

@@ -7,7 +7,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Framework.Allocation;
 
@@ -32,22 +31,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Origin = Anchor.Centre,
             });
 
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1763072 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1763072 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 2101557 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2101557 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1973466 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1973466 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 2109801 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2109801 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1922035 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1922035 } } });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AddStep("Select random beatmap", () =>
-            {
-                Room.CurrentItem.Value = Room.Playlist[RNG.Next(Room.Playlist.Count)];
-                previewTrackManager.StopAnyPlaying(this);
-            });
         }
     }
 }

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs

@@ -23,7 +23,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Room.Playlist.Add(new PlaylistItem
             {
-                Beatmap = new BeatmapInfo
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
                     {
                         Metadata = new BeatmapMetadata
                         {
@@ -33,6 +35,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         },
                         Version = "Version",
                         Ruleset = new OsuRuleset().RulesetInfo
+                    }
                 },
                 RequiredMods =
                 {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs

@@ -37,7 +37,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.Playlist.Clear();
                 Room.Playlist.Add(new PlaylistItem
                 {
-                    Beatmap = new BeatmapInfo
+                    Beatmap =
+                    {
+                        Value = new BeatmapInfo
                         {
                             StarDifficulty = 2.4,
                             Ruleset = rulesets.GetRuleset(0),
@@ -48,6 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                 AuthorString = @"osu!lazer",
                             },
                         }
+                    }
                 });
             });
 
@@ -60,7 +63,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.Playlist.Clear();
                 Room.Playlist.Add(new PlaylistItem
                 {
-                    Beatmap = new BeatmapInfo
+                    Beatmap =
+                    {
+                        Value = new BeatmapInfo
                         {
                             StarDifficulty = 4.2,
                             Ruleset = rulesets.GetRuleset(3),
@@ -71,6 +76,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                 AuthorString = @"Someone",
                             },
                         }
+                    }
                 });
             });
         }

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Add(new Participants { RelativeSizeAxes = Axes.Both });
 
             AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
-            AddStep(@"set users", () => Room.Participants.Value = new[]
+            AddStep(@"set users", () => Room.Participants.AddRange(new[]
             {
                 new User
                 {
@@ -42,10 +42,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     CoverUrl = @"https://assets.ppy.sh/user-profile-covers/5287410/5cfeaa9dd41cbce038ecdc9d781396ed4b0108089170bf7f50492ef8eadeb368.jpeg",
                     IsSupporter = true,
                 },
-            });
+            }));
 
             AddStep(@"set max", () => Room.MaxParticipants.Value = 10);
-            AddStep(@"clear users", () => Room.Participants.Value = System.Array.Empty<User>());
+            AddStep(@"clear users", () => Room.Participants.Clear());
             AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
         }
     }

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set name", () => Room.Name.Value = "Room name");
             AddAssert("button disabled", () => !settings.ApplyButton.Enabled.Value);
 
-            AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = CreateBeatmap(Ruleset.Value).BeatmapInfo }));
+            AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = CreateBeatmap(Ruleset.Value).BeatmapInfo } }));
             AddAssert("button enabled", () => settings.ApplyButton.Enabled.Value);
 
             AddStep("clear name", () => Room.Name.Value = "");

osu.Game.Tests/WaveformTestBeatmap.cs

@@ -37,9 +37,9 @@ namespace osu.Game.Tests
             trackStore = audioManager.GetTrackStore(getZipReader());
         }
 
-        protected override void Dispose(bool isDisposing)
+        ~WaveformTestBeatmap()
         {
-            base.Dispose(isDisposing);
+            // Remove the track store from the audio manager
             trackStore?.Dispose();
         }
 

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -36,8 +36,9 @@ namespace osu.Game.Beatmaps
                     using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Beatmap failed to load");
                     return null;
                 }
             }
@@ -59,8 +60,9 @@ namespace osu.Game.Beatmaps
                 {
                     return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Background failed to load");
                     return null;
                 }
             }
@@ -74,8 +76,9 @@ namespace osu.Game.Beatmaps
                 {
                     return new VideoSprite(textureStore.GetStream(getPathForFile(Metadata.VideoFile)));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Video failed to load");
                     return null;
                 }
             }
@@ -86,8 +89,9 @@ namespace osu.Game.Beatmaps
                 {
                     return (trackStore ??= AudioManager.GetTrackStore(store)).Get(getPathForFile(Metadata.AudioFile));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Track failed to load");
                     return null;
                 }
             }
@@ -115,8 +119,9 @@ namespace osu.Game.Beatmaps
                     var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Waveform failed to load");
                     return null;
                 }
             }

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -17,10 +17,11 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osu.Framework.Graphics.Video;
+using osu.Framework.Logging;
 
 namespace osu.Game.Beatmaps
 {
-    public abstract class WorkingBeatmap : IWorkingBeatmap, IDisposable
+    public abstract class WorkingBeatmap : IWorkingBeatmap
     {
         public readonly BeatmapInfo BeatmapInfo;
 
@@ -133,11 +134,29 @@ namespace osu.Game.Beatmaps
             return converted;
         }
 
-        public override string ToString() => BeatmapInfo.ToString();
+        private CancellationTokenSource loadCancellation = new CancellationTokenSource();
 
-        public bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
+        /// <summary>
+        /// Beings loading the contents of this <see cref="WorkingBeatmap"/> asynchronously.
+        /// </summary>
+        public void BeginAsyncLoad()
+        {
+            loadBeatmapAsync();
+        }
 
-        public Task<IBeatmap> LoadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() =>
+        /// <summary>
+        /// Cancels the asynchronous loading of the contents of this <see cref="WorkingBeatmap"/>.
+        /// </summary>
+        public void CancelAsyncLoad()
+        {
+            loadCancellation?.Cancel();
+            loadCancellation = new CancellationTokenSource();
+
+            if (beatmapLoadTask?.IsCompleted != true)
+                beatmapLoadTask = null;
+        }
+
+        private Task<IBeatmap> loadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() =>
         {
             // Todo: Handle cancellation during beatmap parsing
             var b = GetBeatmap() ?? new Beatmap();
@@ -149,7 +168,11 @@ namespace osu.Game.Beatmaps
             b.BeatmapInfo = BeatmapInfo;
 
             return b;
-        }, beatmapCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+        }, loadCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+        public override string ToString() => BeatmapInfo.ToString();
+
+        public bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
 
         public IBeatmap Beatmap
         {
@@ -157,16 +180,25 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return LoadBeatmapAsync().Result;
+                    return loadBeatmapAsync().Result;
                 }
-                catch (TaskCanceledException)
+                catch (AggregateException ae)
                 {
+                    // This is the exception that is generally expected here, which occurs via natural cancellation of the asynchronous load
+                    if (ae.InnerExceptions.FirstOrDefault() is TaskCanceledException)
+                        return null;
+
+                    Logger.Error(ae, "Beatmap failed to load");
+                    return null;
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Beatmap failed to load");
                     return null;
                 }
             }
         }
 
-        private readonly CancellationTokenSource beatmapCancellation = new CancellationTokenSource();
         protected abstract IBeatmap GetBeatmap();
         private Task<IBeatmap> beatmapLoadTask;
 
@@ -217,40 +249,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public virtual void RecycleTrack() => track.Recycle();
 
-        #region Disposal
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool isDisposing)
-        {
-            if (isDisposed)
-                return;
-
-            isDisposed = true;
-
-            // recycling logic is not here for the time being, as components which use
-            // retrieved objects from WorkingBeatmap may not hold a reference to the WorkingBeatmap itself.
-            // this should be fine as each retrieved component do have their own finalizers.
-
-            // cancelling the beatmap load is safe for now since the retrieval is a synchronous
-            // operation. if we add an async retrieval method this may need to be reconsidered.
-            beatmapCancellation?.Cancel();
-            total_count.Value--;
-        }
-
         ~WorkingBeatmap()
         {
-            Dispose(false);
+            total_count.Value--;
         }
 
-        #endregion
-
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Online.Leaderboards
 
         private List<ScoreComponentLabel> statisticsLabels;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)

osu.Game/Online/Multiplayer/PlaylistItem.cs

@@ -1,9 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -12,7 +13,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class PlaylistItem
+    public class PlaylistItem : IEquatable<PlaylistItem>
     {
         [JsonProperty("id")]
         public int ID { get; set; }
@@ -24,24 +25,16 @@ namespace osu.Game.Online.Multiplayer
         public int RulesetID { get; set; }
 
         [JsonIgnore]
-        public BeatmapInfo Beatmap
+        public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
-        {
-            get => beatmap;
-            set
-            {
-                beatmap = value;
-                BeatmapID = value?.OnlineBeatmapID ?? 0;
-            }
-        }
 
         [JsonIgnore]
-        public RulesetInfo Ruleset { get; set; }
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         [JsonIgnore]
-        public readonly List<Mod> AllowedMods = new List<Mod>();
+        public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>();
 
         [JsonIgnore]
-        public readonly List<Mod> RequiredMods = new List<Mod>();
+        public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>();
 
         [JsonProperty("beatmap")]
         private APIBeatmap apiBeatmap { get; set; }
@@ -64,16 +57,20 @@ namespace osu.Game.Online.Multiplayer
             set => requiredModsBacking = value;
         }
 
-        private BeatmapInfo beatmap;
+        public PlaylistItem()
+        {
+            Beatmap.BindValueChanged(beatmap => BeatmapID = beatmap.NewValue?.OnlineBeatmapID ?? 0);
+            Ruleset.BindValueChanged(ruleset => RulesetID = ruleset.NewValue?.ID ?? 0);
+        }
 
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
             // If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
             // Todo: Is this a bug? Room creation only returns the beatmap ID
-            Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
+            Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
-            Ruleset = rulesets.GetRuleset(RulesetID);
+            Ruleset.Value = rulesets.GetRuleset(RulesetID);
 
-            Ruleset rulesetInstance = Ruleset.CreateInstance();
+            Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
 
             if (allowedModsBacking != null)
             {
@@ -94,5 +91,14 @@ namespace osu.Game.Online.Multiplayer
 
         public bool ShouldSerializeID() => false;
         public bool ShouldSerializeapiBeatmap() => false;
+
+        public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID;
+
+        public override int GetHashCode()
+        {
+            // ReSharper disable NonReadonlyMemberInGetHashCode
+            return HashCode.Combine(ID, BeatmapID, RulesetID);
+            // ReSharper restore NonReadonlyMemberInGetHashCode
+        }
     }
 }

osu.Game/Online/Multiplayer/Room.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -31,10 +30,6 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("playlist")]
         public BindableList<PlaylistItem> Playlist { get; private set; } = new BindableList<PlaylistItem>();
 
-        [Cached]
-        [JsonIgnore]
-        public Bindable<PlaylistItem> CurrentItem { get; private set; } = new Bindable<PlaylistItem>();
-
         [Cached]
         [JsonProperty("channel_id")]
         public Bindable<int> ChannelId { get; private set; } = new Bindable<int>();
@@ -65,23 +60,11 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public Bindable<IEnumerable<User>> Participants { get; private set; } = new Bindable<IEnumerable<User>>(Enumerable.Empty<User>());
+        public BindableList<User> Participants { get; private set; } = new BindableList<User>();
 
         [Cached]
         public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
 
-        public Room()
-        {
-            Playlist.ItemsAdded += updateCurrent;
-            Playlist.ItemsRemoved += updateCurrent;
-            updateCurrent(Playlist);
-        }
-
-        private void updateCurrent(IEnumerable<PlaylistItem> playlist)
-        {
-            CurrentItem.Value = playlist.FirstOrDefault();
-        }
-
         // todo: TEMPORARY
         [JsonProperty("participant_count")]
         private int? participantCount
@@ -130,17 +113,18 @@ namespace osu.Game.Online.Multiplayer
             Type.Value = other.Type.Value;
             MaxParticipants.Value = other.MaxParticipants.Value;
             ParticipantCount.Value = other.ParticipantCount.Value;
-            Participants.Value = other.Participants.Value.ToArray();
             EndDate.Value = other.EndDate.Value;
 
             if (DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
-            // Todo: Temporary, should only remove/add new items (requires framework changes)
+            foreach (var removedItem in Playlist.Except(other.Playlist).ToArray())
-            if (Playlist.Count == 0)
+                Playlist.Remove(removedItem);
-                Playlist.AddRange(other.Playlist);
+            Playlist.AddRange(other.Playlist.Except(Playlist).ToArray());
-            else if (other.Playlist.Count > 0)
+
-                Playlist.First().ID = other.Playlist.First().ID;
+            foreach (var removedItem in Participants.Except(other.Participants).ToArray())
+                Participants.Remove(removedItem);
+            Participants.AddRange(other.Participants.Except(Participants).ToArray());
 
             Position = other.Position;
         }

osu.Game/OsuGame.cs

@@ -401,15 +401,14 @@ namespace osu.Game
             if (nextBeatmap?.Track != null)
                 nextBeatmap.Track.Completed += currentTrackCompleted;
 
-            using (var oldBeatmap = beatmap.OldValue)
+            var oldBeatmap = beatmap.OldValue;
-            {
             if (oldBeatmap?.Track != null)
                 oldBeatmap.Track.Completed -= currentTrackCompleted;
-            }
 
             updateModDefaults();
 
-            nextBeatmap?.LoadBeatmapAsync();
+            oldBeatmap?.CancelAsyncLoad();
+            nextBeatmap?.BeginAsyncLoad();
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Menu
         private void updateAmplitudes()
         {
             var track = beatmap.Value.TrackLoaded ? beatmap.Value.Track : null;
-            var effect = beatmap.Value.BeatmapLoaded ? beatmap.Value.Beatmap.ControlPointInfo.EffectPointAt(track?.CurrentTime ?? Time.Current) : null;
+            var effect = beatmap.Value.BeatmapLoaded ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(track?.CurrentTime ?? Time.Current) : null;
 
             float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
 

osu.Game/Screens/Multi/Components/BeatmapTitle.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -25,7 +26,10 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            CurrentItem.BindValueChanged(_ => updateText(), true);
+            Playlist.ItemsAdded += _ => updateText();
+            Playlist.ItemsRemoved += _ => updateText();
+
+            updateText();
         }
 
         private float textSize = OsuFont.DEFAULT_FONT_SIZE;
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Multi.Components
 
             textFlow.Clear();
 
-            var beatmap = CurrentItem.Value?.Beatmap;
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap;
 
             if (beatmap == null)
             {
@@ -70,7 +74,7 @@ namespace osu.Game.Screens.Multi.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                        Text = new LocalisedString((beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist)),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -80,10 +84,10 @@ namespace osu.Game.Screens.Multi.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title)),
+                        Text = new LocalisedString((beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title)),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
-                }, LinkAction.OpenBeatmap, beatmap.OnlineBeatmapID.ToString(), "Open beatmap");
+                }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
             }
         }
     }

osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,6 +13,8 @@ namespace osu.Game.Screens.Multi.Components
 {
     public class BeatmapTypeInfo : MultiplayerComposite
     {
+        private LinkFlowContainer beatmapAuthor;
+
         public BeatmapTypeInfo()
         {
             AutoSizeAxes = Axes.Both;
@@ -20,8 +23,6 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            LinkFlowContainer beatmapAuthor;
-
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -50,18 +51,23 @@ namespace osu.Game.Screens.Multi.Components
                 }
             };
 
-            CurrentItem.BindValueChanged(item =>
+            Playlist.ItemsAdded += _ => updateInfo();
+            Playlist.ItemsRemoved += _ => updateInfo();
+
+            updateInfo();
+        }
+
+        private void updateInfo()
         {
             beatmapAuthor.Clear();
 
-                var beatmap = item.NewValue?.Beatmap;
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap;
 
             if (beatmap != null)
             {
                 beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
-                    beatmapAuthor.AddUserLink(beatmap.Metadata.Author);
+                beatmapAuthor.AddUserLink(beatmap.Value.Metadata.Author);
-                }
+            }
-            }, true);
         }
     }
 }

osu.Game/Screens/Multi/Components/ModeTypeInfo.cs

@@ -1,11 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Components
@@ -46,17 +46,22 @@ namespace osu.Game.Screens.Multi.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => updateBeatmap(item.NewValue), true);
-
             Type.BindValueChanged(type => gameTypeContainer.Child = new DrawableGameType(type.NewValue) { Size = new Vector2(height) }, true);
+
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
         }
 
-        private void updateBeatmap(PlaylistItem item)
+        private void updateBeatmap()
         {
+            var item = Playlist.FirstOrDefault();
+
             if (item?.Beatmap != null)
             {
                 drawableRuleset.FadeIn(transition_duration);
-                drawableRuleset.Child = new DifficultyIcon(item.Beatmap, item.Ruleset) { Size = new Vector2(height) };
+                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, item.Ruleset.Value) { Size = new Vector2(height) };
             }
             else
                 drawableRuleset.FadeOut(transition_duration);

osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Drawables;
@@ -10,6 +11,7 @@ namespace osu.Game.Screens.Multi.Components
     public class MultiplayerBackgroundSprite : MultiplayerComposite
     {
         private readonly BeatmapSetCoverType beatmapSetCoverType;
+        private UpdateableBeatmapBackgroundSprite sprite;
 
         public MultiplayerBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
         {
@@ -19,11 +21,17 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            UpdateableBeatmapBackgroundSprite sprite;
-
             InternalChild = sprite = CreateBackgroundSprite();
 
-            CurrentItem.BindValueChanged(item => sprite.Beatmap.Value = item.NewValue?.Beatmap, true);
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
+        }
+
+        private void updateBeatmap()
+        {
+            sprite.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
         }
 
         protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite(beatmapSetCoverType) { RelativeSizeAxes = Axes.Both };

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

@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 {
                     bool matchingFilter = true;
 
-                    matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
+                    matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Value.Equals(criteria.Ruleset));
 
                     if (!string.IsNullOrEmpty(criteria.SearchString))
                         matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);

osu.Game/Screens/Multi/Match/Components/Header.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -32,6 +33,7 @@ namespace osu.Game.Screens.Multi.Match.Components
         public Action RequestBeatmapSelection;
 
         private MatchBeatmapPanel beatmapPanel;
+        private ModDisplay modDisplay;
 
         public Header()
         {
@@ -43,7 +45,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         private void load(OsuColour colours)
         {
             BeatmapSelectButton beatmapButton;
-            ModDisplay modDisplay;
 
             InternalChildren = new Drawable[]
             {
@@ -119,9 +120,12 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => modDisplay.Current.Value = item.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>(), true);
-
             beatmapButton.Action = () => RequestBeatmapSelection?.Invoke();
+
+            Playlist.ItemsAdded += _ => updateMods();
+            Playlist.ItemsRemoved += _ => updateMods();
+
+            updateMods();
         }
 
         protected override void LoadComplete()
@@ -130,6 +134,13 @@ namespace osu.Game.Screens.Multi.Match.Components
             ShowBeatmapPanel.BindValueChanged(value => beatmapPanel.FadeTo(value.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
         }
 
+        private void updateMods()
+        {
+            var item = Playlist.FirstOrDefault();
+
+            modDisplay.Current.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+        }
+
         private class BeatmapSelectButton : HeaderButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]

osu.Game/Screens/Multi/Match/Components/Info.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,6 +19,8 @@ namespace osu.Game.Screens.Multi.Match.Components
     {
         public Action OnStart;
 
+        private ReadyButton readyButton;
+
         public Info()
         {
             RelativeSizeAxes = Axes.X;
@@ -27,7 +30,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            ReadyButton readyButton;
             HostInfo hostInfo;
 
             InternalChildren = new Drawable[]
@@ -89,9 +91,17 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => readyButton.Beatmap.Value = item.NewValue?.Beatmap, true);
-
             hostInfo.Host.BindTo(Host);
+
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
+        }
+
+        private void updateBeatmap()
+        {
+            readyButton.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
         }
     }
 }

osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs

@@ -1,10 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Direct;
@@ -32,10 +32,13 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            CurrentItem.BindValueChanged(item => loadNewPanel(item.NewValue?.Beatmap), true);
+            Playlist.ItemsAdded += _ => loadNewPanel();
+            Playlist.ItemsRemoved += _ => loadNewPanel();
+
+            loadNewPanel();
         }
 
-        private void loadNewPanel(BeatmapInfo beatmap)
+        private void loadNewPanel()
         {
             loadCancellation?.Cancel();
             request?.Cancel();
@@ -44,6 +47,8 @@ namespace osu.Game.Screens.Multi.Match.Components
             panel?.Expire();
             panel = null;
 
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap.Value;
+
             if (beatmap?.OnlineBeatmapID == null)
                 return;
 

osu.Game/Screens/Multi/Match/Components/Participants.cs

@@ -51,9 +51,9 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            Participants.BindValueChanged(participants =>
+            Participants.ItemsAdded += users =>
             {
-                usersFlow.Children = participants.NewValue.Select(u =>
+                usersFlow.AddRange(users.Select(u =>
                 {
                     var panel = new UserPanel(u)
                     {
@@ -65,8 +65,13 @@ namespace osu.Game.Screens.Multi.Match.Components
                     panel.OnLoadComplete += d => d.FadeInFromZero(60);
 
                     return panel;
-                }).ToList();
+                }).ToList());
-            }, true);
+            };
+
+            Participants.ItemsRemoved += users =>
+            {
+                usersFlow.RemoveAll(p => users.Contains(p.User));
+            };
         }
     }
 }

osu.Game/Screens/Multi/Match/MatchSubScreen.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -40,9 +41,6 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
-
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -52,6 +50,7 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(CanBeNull = true)]
         private OsuGame game { get; set; }
 
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
         private MatchLeaderboard leaderboard;
 
         public MatchSubScreen(Room room)
@@ -165,7 +164,16 @@ namespace osu.Game.Screens.Multi.Match
         {
             base.LoadComplete();
 
-            CurrentItem.BindValueChanged(currentItemChanged, true);
+            Playlist.ItemsAdded += _ => updateSelectedItem();
+            Playlist.ItemsRemoved += _ => updateSelectedItem();
+
+            updateSelectedItem();
+        }
+
+        private void updateSelectedItem()
+        {
+            selectedItem.Value = Playlist.FirstOrDefault();
+            currentItemChanged();
         }
 
         public override bool OnExiting(IScreen next)
@@ -180,16 +188,18 @@ namespace osu.Game.Screens.Multi.Match
         /// <summary>
         /// Handles propagation of the current playlist item's content to game-wide mechanisms.
         /// </summary>
-        private void currentItemChanged(ValueChangedEvent<PlaylistItem> e)
+        private void currentItemChanged()
         {
+            var item = selectedItem.Value;
+
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
-            var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.OnlineBeatmapID);
+            var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.Value.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-            Mods.Value = e.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
 
-            if (e.NewValue?.Ruleset != null)
+            if (item?.Ruleset != null)
-                Ruleset.Value = e.NewValue.Ruleset;
+                Ruleset.Value = item.Ruleset.Value;
 
             previewTrackManager.StopAnyPlaying(this);
         }
@@ -202,11 +212,11 @@ namespace osu.Game.Screens.Multi.Match
             if (Beatmap.Value != beatmapManager.DefaultBeatmap)
                 return;
 
-            if (CurrentItem.Value == null)
+            if (selectedItem.Value == null)
                 return;
 
             // Try to retrieve the corresponding local beatmap
-            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentItem.Value.Beatmap.OnlineBeatmapID);
+            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == selectedItem.Value.Beatmap.Value.OnlineBeatmapID);
 
             if (localBeatmap != null)
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
@@ -223,7 +233,7 @@ namespace osu.Game.Screens.Multi.Match
             {
                 default:
                 case GameTypeTimeshift _:
-                    multiplayer?.Start(() => new TimeshiftPlayer(CurrentItem.Value)
+                    multiplayer?.Start(() => new TimeshiftPlayer(selectedItem.Value)
                     {
                         Exited = () => leaderboard.RefreshScores()
                     });

osu.Game/Screens/Multi/MultiplayerComposite.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -32,10 +31,7 @@ namespace osu.Game.Screens.Multi
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
+        protected BindableList<User> Participants { get; private set; }
-
-        [Resolved(typeof(Room))]
-        protected Bindable<IEnumerable<User>> Participants { get; private set; }
 
         [Resolved(typeof(Room))]
         protected Bindable<int> ParticipantCount { get; private set; }

osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs

@@ -50,10 +50,10 @@ namespace osu.Game.Screens.Multi.Play
             bool failed = false;
 
             // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
-            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.OnlineBeatmapID)
+            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
-            if (ruleset.Value.ID != playlistItem.Ruleset.ID)
+            if (ruleset.Value.ID != playlistItem.Ruleset.Value.ID)
                 throw new InvalidOperationException("Current Ruleset does not match PlaylistItem's Ruleset");
 
             if (!playlistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))

osu.Game/Screens/Select/MatchSongSelect.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -21,11 +22,11 @@ namespace osu.Game.Screens.Select
         public string ShortTitle => "song selection";
         public override string Title => ShortTitle.Humanize();
 
-        [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
-
         public override bool AllowEditing => false;
 
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -38,8 +39,8 @@ namespace osu.Game.Screens.Select
         {
             var item = new PlaylistItem
             {
-                Beatmap = Beatmap.Value.BeatmapInfo,
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                Ruleset = Ruleset.Value,
+                Ruleset = { Value = Ruleset.Value },
                 RulesetID = Ruleset.Value.ID ?? 0
             };
 
@@ -58,11 +59,13 @@ namespace osu.Game.Screens.Select
             if (base.OnExiting(next))
                 return true;
 
-            if (CurrentItem.Value != null)
+            var firstItem = Playlist.FirstOrDefault();
+
+            if (firstItem != null)
             {
-                Ruleset.Value = CurrentItem.Value.Ruleset;
+                Ruleset.Value = firstItem.Ruleset.Value;
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap);
+                Beatmap.Value = beatmaps.GetWorkingBeatmap(firstItem.Beatmap.Value);
-                Mods.Value = CurrentItem.Value.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+                Mods.Value = firstItem.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
             }
 
             return false;

osu.Game/Tests/Visual/OsuTestScene.cs

@@ -191,9 +191,9 @@ namespace osu.Game.Tests.Visual
                     track = audio?.Tracks.GetVirtual(length);
             }
 
-            protected override void Dispose(bool isDisposing)
+            ~ClockBackedTestWorkingBeatmap()
             {
-                base.Dispose(isDisposing);
+                // Remove the track store from the audio manager
                 store?.Dispose();
             }
 

osu.Game/Users/UserPanel.cs

@@ -26,11 +26,12 @@ namespace osu.Game.Users
 {
     public class UserPanel : OsuClickableContainer, IHasContextMenu
     {
-        private readonly User user;
         private const float height = 100;
         private const float content_padding = 10;
         private const float status_height = 30;
 
+        public readonly User User;
+
         [Resolved(canBeNull: true)]
         private OsuColour colours { get; set; }
 
@@ -54,7 +55,7 @@ namespace osu.Game.Users
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
 
-            this.user = user;
+            User = user;
 
             Height = height - status_height;
         }
@@ -86,7 +87,7 @@ namespace osu.Game.Users
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        User = user,
+                        User = User,
                     }, 300, 5000)
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -106,7 +107,7 @@ namespace osu.Game.Users
                             new UpdateableAvatar
                             {
                                 Size = new Vector2(height - status_height - content_padding * 2),
-                                User = user,
+                                User = User,
                                 Masking = true,
                                 CornerRadius = 5,
                                 OpenOnClick = { Value = false },
@@ -125,7 +126,7 @@ namespace osu.Game.Users
                                 {
                                     new OsuSpriteText
                                     {
-                                        Text = user.Username,
+                                        Text = User.Username,
                                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18, italics: true),
                                     },
                                     infoContainer = new FillFlowContainer
@@ -138,7 +139,7 @@ namespace osu.Game.Users
                                         Spacing = new Vector2(5f, 0f),
                                         Children = new Drawable[]
                                         {
-                                            new UpdateableFlag(user.Country)
+                                            new UpdateableFlag(User.Country)
                                             {
                                                 Width = 30f,
                                                 RelativeSizeAxes = Axes.Y,
@@ -191,12 +192,12 @@ namespace osu.Game.Users
                 }
             });
 
-            if (user.IsSupporter)
+            if (User.IsSupporter)
             {
                 infoContainer.Add(new SupporterIcon
                 {
                     Height = 20f,
-                    SupportLevel = user.SupportLevel
+                    SupportLevel = User.SupportLevel
                 });
             }
 
@@ -206,7 +207,7 @@ namespace osu.Game.Users
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
-                profile?.ShowUser(user);
+                profile?.ShowUser(User);
             };
         }
 

osu.Game/osu.Game.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
     <PackageReference Include="Sentry" Version="2.0.2" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.213.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />