Merge branch 'fix-test-nullref' into timeshift-results-2

build/InspectCode.cake

@@ -1,5 +1,5 @@
-#addin "nuget:?package=CodeFileSanity&version=0.0.33"
+#addin "nuget:?package=CodeFileSanity&version=0.0.36"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.3.2"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2020.1.3"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
 var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.601.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.609.0" />
   </ItemGroup>
 </Project>

osu.Desktop/OsuGameDesktop.cs

@@ -59,7 +59,7 @@ namespace osu.Desktop
             try
             {
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
 
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -48,7 +48,7 @@ namespace osu.Desktop.Updater
 
             try
             {
-                if (updateManager == null) updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching);
                 if (info.ReleasesToApply.Count == 0)

osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs

@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         {
             var catchCurrent = (CatchDifficultyHitObject)current;
 
-            if (lastPlayerPosition == null)
+            lastPlayerPosition ??= catchCurrent.LastNormalizedPosition;
-                lastPlayerPosition = catchCurrent.LastNormalizedPosition;
 
             float playerPosition = Math.Clamp(
                 lastPlayerPosition.Value,

osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs

@@ -61,7 +61,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         private DrawableSlider slider;
 
         [SetUpSteps]
-        public override void SetUpSteps() { }
+        public override void SetUpSteps()
+        {
+        }
 
         [TestCase(0)]
         [TestCase(1)]
@@ -132,10 +134,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkPositionChange(16600, sliderRepeat, positionDecreased);
         }
 
-        private void retrieveDrawableSlider(int index) => AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
+        private void retrieveDrawableSlider(int index) =>
-        {
+            AddStep($"retrieve {(index + 1).ToOrdinalWords()} slider", () =>
-            slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index);
+                slider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.ElementAt(index));
-        });
 
         private void ensureSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionIncreased);
         private void ensureNoSnakingIn(double startTime) => checkPositionChange(startTime, sliderEnd, positionRemainsSame);

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs

@@ -135,8 +135,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 fp.Alpha = 0;
                 fp.Scale = new Vector2(1.5f * osuEnd.Scale);
 
-                if (firstTransformStartTime == null)
+                firstTransformStartTime ??= fadeInTime;
-                    firstTransformStartTime = fadeInTime;
 
                 fp.AnimationStartTime = fadeInTime;
 

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                         // arbitrary write to non-hashed file
                         using (var sw = new FileInfo(Directory.GetFiles(extractedFolder, "*.mp3").First()).AppendText())
-                            sw.WriteLine("text");
+                            await sw.WriteLineAsync("text");
 
                         using (var zip = ZipArchive.Create())
                         {
@@ -335,7 +335,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     var breakTemp = TestResources.GetTestBeatmapForImport();
 
                     MemoryStream brokenOsu = new MemoryStream();
-                    MemoryStream brokenOsz = new MemoryStream(File.ReadAllBytes(breakTemp));
+                    MemoryStream brokenOsz = new MemoryStream(await File.ReadAllBytesAsync(breakTemp));
 
                     File.Delete(breakTemp);
 
@@ -651,7 +651,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                     using (var resourceForkFile = File.CreateText(resourceForkFilePath))
                     {
-                        resourceForkFile.WriteLine("adding content so that it's not empty");
+                        await resourceForkFile.WriteLineAsync("adding content so that it's not empty");
                     }
 
                     try

osu.Game.Tests/Chat/MessageFormatterTests.cs

@@ -428,22 +428,27 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(5, result.Links.Count);
 
             Link f = result.Links.Find(l => l.Url == "https://osu.ppy.sh/wiki/wiki links");
+            Assert.That(f, Is.Not.Null);
             Assert.AreEqual(44, f.Index);
             Assert.AreEqual(10, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://www.simple-test.com");
+            Assert.That(f, Is.Not.Null);
             Assert.AreEqual(10, f.Index);
             Assert.AreEqual(11, f.Length);
 
             f = result.Links.Find(l => l.Url == "http://google.com");
+            Assert.That(f, Is.Not.Null);
             Assert.AreEqual(97, f.Index);
             Assert.AreEqual(4, f.Length);
 
             f = result.Links.Find(l => l.Url == "https://osu.ppy.sh");
+            Assert.That(f, Is.Not.Null);
             Assert.AreEqual(78, f.Index);
             Assert.AreEqual(18, f.Length);
 
             f = result.Links.Find(l => l.Url == "\uD83D\uDE12");
+            Assert.That(f, Is.Not.Null);
             Assert.AreEqual(101, f.Index);
             Assert.AreEqual(3, f.Length);
         }

osu.Game.Tests/Scores/IO/ImportScoreTest.cs

@@ -183,11 +183,8 @@ namespace osu.Game.Tests.Scores.IO
         {
             var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
 
-            if (score.Beatmap == null)
+            score.Beatmap ??= beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First();
-                score.Beatmap = beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First();
+            score.Ruleset ??= new OsuRuleset().RulesetInfo;
-
-            if (score.Ruleset == null)
-                score.Ruleset = new OsuRuleset().RulesetInfo;
 
             var scoreManager = osu.Dependencies.Get<ScoreManager>();
             await scoreManager.Import(score, archive);

osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs

@@ -38,13 +38,9 @@ namespace osu.Game.Tests.Visual.SongSelect
     public class TestScenePlaySongSelect : ScreenTestScene
     {
         private BeatmapManager manager;
-
         private RulesetStore rulesets;
-
         private MusicController music;
-
         private WorkingBeatmap defaultBeatmap;
-
         private TestSongSelect songSelect;
 
         [BackgroundDependencyLoader]
@@ -308,15 +304,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
 
-            var sortMode = config.GetBindable<SortMode>(OsuSetting.SongSelectSortingMode);
+            AddStep(@"Sort by Artist", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Artist));
-
+            AddStep(@"Sort by Title", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Title));
-            AddStep(@"Sort by Artist", delegate { sortMode.Value = SortMode.Artist; });
+            AddStep(@"Sort by Author", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Author));
-            AddStep(@"Sort by Title", delegate { sortMode.Value = SortMode.Title; });
+            AddStep(@"Sort by DateAdded", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
-            AddStep(@"Sort by Author", delegate { sortMode.Value = SortMode.Author; });
+            AddStep(@"Sort by BPM", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.BPM));
-            AddStep(@"Sort by DateAdded", delegate { sortMode.Value = SortMode.DateAdded; });
+            AddStep(@"Sort by Length", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Length));
-            AddStep(@"Sort by BPM", delegate { sortMode.Value = SortMode.BPM; });
+            AddStep(@"Sort by Difficulty", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
-            AddStep(@"Sort by Length", delegate { sortMode.Value = SortMode.Length; });
-            AddStep(@"Sort by Difficulty", delegate { sortMode.Value = SortMode.Difficulty; });
         }
 
         [Test]

osu.Game.Tests/Visual/UserInterface/TestSceneOsuIcon.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.Diagnostics;
 using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -45,7 +46,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             foreach (var p in typeof(OsuIcon).GetProperties(BindingFlags.Public | BindingFlags.Static))
-                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)p.GetValue(null)));
+            {
+                var propValue = p.GetValue(null);
+                Debug.Assert(propValue != null);
+
+                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)propValue));
+            }
 
             AddStep("toggle shadows", () => flow.Children.ForEach(i => i.SpriteIcon.Shadow = !i.SpriteIcon.Shadow));
             AddStep("change icons", () => flow.Children.ForEach(i => i.SpriteIcon.Icon = new IconUsage((char)(i.SpriteIcon.Icon.Icon + 1))));

osu.Game.Tournament.Tests/LadderTestScene.cs

@@ -24,8 +24,7 @@ namespace osu.Game.Tournament.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (Ladder.Ruleset.Value == null)
+            Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
-                Ladder.Ruleset.Value = rulesetStore.AvailableRulesets.First();
 
             Ruleset.BindTo(Ladder.Ruleset);
         }

osu.Game.Tournament/IPC/FileBasedIPC.cs

@@ -34,6 +34,7 @@ namespace osu.Game.Tournament.IPC
 
         private int lastBeatmapId;
         private ScheduledDelegate scheduled;
+        private GetBeatmapRequest beatmapLookupRequest;
 
         public Storage Storage { get; private set; }
 
@@ -77,6 +78,8 @@ namespace osu.Game.Tournament.IPC
 
                                 if (lastBeatmapId != beatmapId)
                                 {
+                                    beatmapLookupRequest?.Cancel();
+
                                     lastBeatmapId = beatmapId;
 
                                     var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId && b.BeatmapInfo != null);
@@ -85,9 +88,9 @@ namespace osu.Game.Tournament.IPC
                                         Beatmap.Value = existing.BeatmapInfo;
                                     else
                                     {
-                                        var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = beatmapId });
+                                        beatmapLookupRequest = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = beatmapId });
-                                        req.Success += b => Beatmap.Value = b.ToBeatmap(Rulesets);
+                                        beatmapLookupRequest.Success += b => Beatmap.Value = b.ToBeatmap(Rulesets);
-                                        API.Queue(req);
+                                        API.Queue(beatmapLookupRequest);
                                     }
                                 }
 

osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs

@@ -47,8 +47,7 @@ namespace osu.Game.Tournament.Screens.Drawings
 
             this.storage = storage;
 
-            if (TeamList == null)
+            TeamList ??= new StorageBackedTeamList(storage);
-                TeamList = new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
             {

osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs

@@ -14,7 +14,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
-        public bool ShowScore { set => score.FadeTo(value ? 1 : 0, 200); }
+        public bool ShowScore
+        {
+            set => score.FadeTo(value ? 1 : 0, 200);
+        }
 
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)

osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs

@@ -21,7 +21,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay teamDisplay;
 
-        public bool ShowScore { set => teamDisplay.ShowScore = value; }
+        public bool ShowScore
+        {
+            set => teamDisplay.ShowScore = value;
+        }
 
         public TeamScoreDisplay(TeamColour teamColour)
         {

osu.Game.Tournament/TournamentGameBase.cs

@@ -150,11 +150,8 @@ namespace osu.Game.Tournament
                     ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd());
             }
 
-            if (ladder == null)
+            ladder ??= new LadderInfo();
-                ladder = new LadderInfo();
+            ladder.Ruleset.Value ??= RulesetStore.AvailableRulesets.First();
-
-            if (ladder.Ruleset.Value == null)
-                ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();
 
             Ruleset.BindTo(ladder.Ruleset);
 

osu.Game/Beatmaps/BeatmapManager.cs

@@ -246,8 +246,7 @@ namespace osu.Game.Beatmaps
 
                 if (working == null)
                 {
-                    if (beatmapInfo.Metadata == null)
+                    beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
-                        beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
                     workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store,
                         new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager));

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -425,8 +425,7 @@ namespace osu.Game.Beatmaps.Formats
         private void handleHitObject(string line)
         {
             // If the ruleset wasn't specified, assume the osu!standard ruleset.
-            if (parser == null)
+            parser ??= new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
-                parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
 
             var obj = parser.Parse(line);
             if (obj != null)

osu.Game/IO/Serialization/Converters/TypedListConverter.cs

@@ -41,12 +41,24 @@ namespace osu.Game.IO.Serialization.Converters
             var list = new List<T>();
 
             var obj = JObject.Load(reader);
+
+            if (obj["$lookup_table"] == null)
+                return list;
+
             var lookupTable = serializer.Deserialize<List<string>>(obj["$lookup_table"].CreateReader());
+            if (lookupTable == null)
+                return list;
+
+            if (obj["$items"] == null)
+                return list;
 
             foreach (var tok in obj["$items"])
             {
                 var itemReader = tok.CreateReader();
 
+                if (tok["$type"] == null)
+                    throw new JsonException("Expected $type token.");
+
                 var typeName = lookupTable[(int)tok["$type"]];
                 var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
                 serializer.Populate(itemReader, instance);

osu.Game/Online/API/APIAccess.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
@@ -250,7 +251,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

osu.Game/Online/Chat/ChannelManager.cs

@@ -108,8 +108,7 @@ namespace osu.Game.Online.Chat
         /// <param name="target">An optional target channel. If null, <see cref="CurrentChannel"/> will be used.</param>
         public void PostMessage(string text, bool isAction = false, Channel target = null)
         {
-            if (target == null)
+            target ??= CurrentChannel.Value;
-                target = CurrentChannel.Value;
 
             if (target == null)
                 return;
@@ -192,8 +191,7 @@ namespace osu.Game.Online.Chat
         /// <param name="target">An optional target channel. If null, <see cref="CurrentChannel"/> will be used.</param>
         public void PostCommand(string text, Channel target = null)
         {
-            if (target == null)
+            target ??= CurrentChannel.Value;
-                target = CurrentChannel.Value;
 
             if (target == null)
                 return;
@@ -396,8 +394,7 @@ namespace osu.Game.Online.Chat
                     fetchInitalMessages(channel);
             }
 
-            if (CurrentChannel.Value == null)
+            CurrentChannel.Value ??= channel;
-                CurrentChannel.Value = channel;
 
             return channel;
         }

osu.Game/Online/Chat/StandAloneChatDisplay.cs

@@ -73,8 +73,7 @@ namespace osu.Game.Online.Chat
         [BackgroundDependencyLoader(true)]
         private void load(ChannelManager manager)
         {
-            if (ChannelManager == null)
+            ChannelManager ??= manager;
-                ChannelManager = manager;
         }
 
         protected virtual StandAloneDrawableChannel CreateDrawableChannel(Channel channel) =>

osu.Game/OsuGameBase.cs

@@ -164,7 +164,7 @@ namespace osu.Game
             dependencies.Cache(SkinManager = new SkinManager(Storage, contextFactory, Host, Audio, new NamespacedResourceStore<byte[]>(Resources, "Skins/Legacy")));
             dependencies.CacheAs<ISkinSource>(SkinManager);
 
-            if (API == null) API = new APIAccess(LocalConfig);
+            API ??= new APIAccess(LocalConfig);
 
             dependencies.CacheAs(API);
 
@@ -311,11 +311,10 @@ namespace osu.Game
         {
             base.SetHost(host);
 
-            if (Storage == null) // may be non-null for certain tests
+            // may be non-null for certain tests
-                Storage = new OsuStorage(host);
+            Storage ??= new OsuStorage(host);
 
-            if (LocalConfig == null)
+            LocalConfig ??= new OsuConfigManager(Storage);
-                LocalConfig = new OsuConfigManager(Storage);
         }
 
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();

osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs

@@ -68,8 +68,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (!Items.Contains(channel))
                 AddItem(channel);
 
-            if (Current.Value == null)
+            Current.Value ??= channel;
-                Current.Value = channel;
         }
 
         /// <summary>

osu.Game/Rulesets/Mods/ModEasy.cs

@@ -35,7 +35,9 @@ namespace osu.Game.Rulesets.Mods
 
         private BindableNumber<double> health;
 
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty) { }
+        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

osu.Game/Rulesets/Mods/ModHardRock.cs

@@ -17,7 +17,9 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
 
-        public void ReadFromDifficulty(BeatmapDifficulty difficulty) { }
+        public void ReadFromDifficulty(BeatmapDifficulty difficulty)
+        {
+        }
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

osu.Game/Rulesets/Objects/HitObject.cs

@@ -133,8 +133,7 @@ namespace osu.Game.Rulesets.Objects
         {
             Kiai = controlPointInfo.EffectPointAt(StartTime + control_point_leniency).KiaiMode;
 
-            if (HitWindows == null)
+            HitWindows ??= CreateHitWindows();
-                HitWindows = CreateHitWindows();
             HitWindows?.SetDifficulty(difficulty.OverallDifficulty);
         }
 

osu.Game/Rulesets/UI/FrameStabilityContainer.cs

@@ -181,8 +181,7 @@ namespace osu.Game.Rulesets.UI
         private void setClock()
         {
             // in case a parent gameplay clock isn't available, just use the parent clock.
-            if (parentGameplayClock == null)
+            parentGameplayClock ??= Clock;
-                parentGameplayClock = Clock;
 
             Clock = GameplayClock;
             ProcessCustomClock = false;

osu.Game/Scoring/ScoreInfo.cs

@@ -115,9 +115,7 @@ namespace osu.Game.Scoring
             get => User?.Username;
             set
             {
-                if (User == null)
+                User ??= new User();
-                    User = new User();
-
                 User.Username = value;
             }
         }
@@ -129,9 +127,7 @@ namespace osu.Game.Scoring
             get => User?.Id ?? 1;
             set
             {
-                if (User == null)
+                User ??= new User();
-                    User = new User();
-
                 User.Id = value ?? 1;
             }
         }

osu.Game/Screens/Edit/Timing/Section.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         checkbox = new OsuCheckbox
                         {
-                            LabelText = typeof(T).Name.Replace(typeof(ControlPoint).Name, string.Empty)
+                            LabelText = typeof(T).Name.Replace(nameof(Beatmaps.ControlPoints.ControlPoint), string.Empty)
                         }
                     }
                 },

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -12,17 +12,16 @@ using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Skinning;
-using osu.Game.Online.API;
-using osu.Game.Users;
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Menu
 {
+    /// <summary>
+    /// A visualiser that reacts to music coming from beatmaps.
+    /// </summary>
     public class LogoVisualisation : Drawable, IHasAccentColour
     {
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
@@ -71,9 +70,6 @@ namespace osu.Game.Screens.Menu
         private IShader shader;
         private readonly Texture texture;
 
-        private Bindable<User> user;
-        private Bindable<Skin> skin;
-
         public LogoVisualisation()
         {
             texture = Texture.WhitePixel;
@@ -81,15 +77,10 @@ namespace osu.Game.Screens.Menu
         }
 
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap, IAPIProvider api, SkinManager skinManager)
+        private void load(ShaderManager shaders, IBindable<WorkingBeatmap> beatmap)
         {
             this.beatmap.BindTo(beatmap);
             shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
-            user = api.LocalUser.GetBoundCopy();
-            skin = skinManager.CurrentSkin.GetBoundCopy();
-
-            user.ValueChanged += _ => updateColour();
-            skin.BindValueChanged(_ => updateColour(), true);
         }
 
         private void updateAmplitudes()
@@ -118,16 +109,6 @@ namespace osu.Game.Screens.Menu
             indexOffset = (indexOffset + index_change) % bars_per_visualiser;
         }
 
-        private void updateColour()
-        {
-            Color4 defaultColour = Color4.White.Opacity(0.2f);
-
-            if (user.Value?.IsSupporter ?? false)
-                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
-            else
-                AccentColour = defaultColour;
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Screens/Menu/MenuLogoVisualisation.cs

@@ -0,0 +1,39 @@
+// 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 osuTK.Graphics;
+using osu.Game.Skinning;
+using osu.Game.Online.API;
+using osu.Game.Users;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+
+namespace osu.Game.Screens.Menu
+{
+    internal class MenuLogoVisualisation : LogoVisualisation
+    {
+        private Bindable<User> user;
+        private Bindable<Skin> skin;
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api, SkinManager skinManager)
+        {
+            user = api.LocalUser.GetBoundCopy();
+            skin = skinManager.CurrentSkin.GetBoundCopy();
+
+            user.ValueChanged += _ => updateColour();
+            skin.BindValueChanged(_ => updateColour(), true);
+        }
+
+        private void updateColour()
+        {
+            Color4 defaultColour = Color4.White.Opacity(0.2f);
+
+            if (user.Value?.IsSupporter ?? false)
+                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
+            else
+                AccentColour = defaultColour;
+        }
+    }
+}

osu.Game/Screens/Menu/OsuLogo.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Menu
         private readonly Container logoBeatContainer;
         private readonly Container logoAmplitudeContainer;
         private readonly Container logoHoverContainer;
-        private readonly LogoVisualisation visualizer;
+        private readonly MenuLogoVisualisation visualizer;
 
         private readonly IntroSequence intro;
 
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Menu
                                             AutoSizeAxes = Axes.Both,
                                             Children = new Drawable[]
                                             {
-                                                visualizer = new LogoVisualisation
+                                                visualizer = new MenuLogoVisualisation
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
                                                     Origin = Anchor.Centre,

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

@@ -34,8 +34,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (filter == null)
+            filter ??= new Bindable<FilterCriteria>();
-                filter = new Bindable<FilterCriteria>();
         }
 
         protected override void LoadComplete()

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -607,10 +607,7 @@ namespace osu.Game.Screens.Select
 
             // todo: remove the need for this.
             foreach (var b in beatmapSet.Beatmaps)
-            {
+                b.Metadata ??= beatmapSet.Metadata;
-                if (b.Metadata == null)
-                    b.Metadata = beatmapSet.Metadata;
-            }
 
             var set = new CarouselBeatmapSet(beatmapSet)
             {

osu.Game/Users/Drawables/DrawableAvatar.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Users.Drawables
 
             Texture texture = null;
             if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
-            if (texture == null) texture = textures.Get(@"Online/avatar-guest");
+            texture ??= textures.Get(@"Online/avatar-guest");
 
             ClickableArea clickableArea;
             Add(clickableArea = new ClickableArea

osu.Game/osu.Game.csproj

@@ -24,7 +24,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.601.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />

osu.iOS.props

@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.601.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.609.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,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.601.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.sln.DotSettings

@@ -60,6 +60,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
@@ -105,6 +106,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -138,6 +141,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
@@ -196,6 +200,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -222,6 +227,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>