Update usages to new naming

CodeAnalysis/BannedSymbols.txt

@@ -14,4 +14,4 @@ M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallb
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IQueryable<T>,NotificationCallbackDelegate<T>) instead.
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Collections.Generic.IList{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IList<T>,NotificationCallbackDelegate<T>) instead.
 M:System.Threading.Tasks.Task.Wait();Don't use Task.Wait. Use Task.WaitSafely() to ensure we avoid deadlocks.
-P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.WaitSafelyForResult() to ensure we avoid deadlocks.
+P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.GetResultSafely() to ensure we avoid deadlocks.

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

@@ -984,7 +984,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             var manager = osu.Dependencies.Get<BeatmapManager>();
 
-            var importedSet = manager.Import(new ImportTask(temp)).WaitSafelyForResult();
+            var importedSet = manager.Import(new ImportTask(temp)).GetResultSafely();
 
             ensureLoaded(osu).WaitSafely();
 
@@ -999,7 +999,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             var manager = osu.Dependencies.Get<BeatmapManager>();
 
-            var importedSet = manager.Import(new ImportTask(temp)).WaitSafelyForResult();
+            var importedSet = manager.Import(new ImportTask(temp)).GetResultSafely();
 
             ensureLoaded(osu).WaitSafely();
 

osu.Game.Tests/Beatmaps/TestSceneBeatmapDifficultyCache.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Beatmaps
         [BackgroundDependencyLoader]
         private void load(OsuGameBase osu)
         {
-            importedSet = ImportBeatmapTest.LoadQuickOszIntoOsu(osu).WaitSafelyForResult();
+            importedSet = ImportBeatmapTest.LoadQuickOszIntoOsu(osu).GetResultSafely();
         }
 
         [SetUpSteps]

osu.Game.Tests/NonVisual/TaskChainTest.cs

@@ -43,9 +43,9 @@ namespace osu.Game.Tests.NonVisual
 
             await Task.WhenAll(task1.task, task2.task, task3.task);
 
-            Assert.That(task1.task.WaitSafelyForResult(), Is.EqualTo(1));
+            Assert.That(task1.task.GetResultSafely(), Is.EqualTo(1));
-            Assert.That(task2.task.WaitSafelyForResult(), Is.EqualTo(2));
+            Assert.That(task2.task.GetResultSafely(), Is.EqualTo(2));
-            Assert.That(task3.task.WaitSafelyForResult(), Is.EqualTo(3));
+            Assert.That(task3.task.GetResultSafely(), Is.EqualTo(3));
         }
 
         [Test]
@@ -69,9 +69,9 @@ namespace osu.Game.Tests.NonVisual
             // Wait on both tasks.
             await Task.WhenAll(task1.task, task3.task);
 
-            Assert.That(task1.task.WaitSafelyForResult(), Is.EqualTo(1));
+            Assert.That(task1.task.GetResultSafely(), Is.EqualTo(1));
             Assert.That(task2.task.IsCompleted, Is.False);
-            Assert.That(task3.task.WaitSafelyForResult(), Is.EqualTo(2));
+            Assert.That(task3.task.GetResultSafely(), Is.EqualTo(2));
         }
 
         [Test]

osu.Game.Tests/Skins/IO/ImportSkinTest.cs

@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Skins.IO
 
             var imported = skinManager.Import(new ImportTask(exportStream, "exported.osk"));
 
-            imported.WaitSafelyForResult().PerformRead(s =>
+            imported.GetResultSafely().PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.Skins.IO
 
             var imported = skinManager.Import(new ImportTask(exportStream, "exported.osk"));
 
-            imported.WaitSafelyForResult().PerformRead(s =>
+            imported.GetResultSafely().PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);

osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Skins
         [BackgroundDependencyLoader]
         private void load()
         {
-            var imported = beatmaps.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-beatmap.osz"))).WaitSafelyForResult();
+            var imported = beatmaps.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-beatmap.osz"))).GetResultSafely();
             beatmap = beatmaps.GetWorkingBeatmap(imported.Value.Beatmaps[0]);
             beatmap.LoadTrack();
         }

osu.Game.Tests/Skins/TestSceneSkinResources.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Skins
         [BackgroundDependencyLoader]
         private void load()
         {
-            var imported = skins.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-skin.osk"))).WaitSafelyForResult();
+            var imported = skins.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-skin.osk"))).GetResultSafely();
             skin = imported.PerformRead(skinInfo => skins.GetSkin(skinInfo));
         }
 

osu.Game.Tests/Visual/Editing/TestSceneDifficultySwitching.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         public override void SetUpSteps()
         {
-            AddStep("import test beatmap", () => importedBeatmapSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).WaitSafelyForResult());
+            AddStep("import test beatmap", () => importedBeatmapSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).GetResultSafely());
             base.SetUpSteps();
         }
 

osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         public override void SetUpSteps()
         {
-            AddStep("import test beatmap", () => importedBeatmapSet = ImportBeatmapTest.LoadOszIntoOsu(game).WaitSafelyForResult());
+            AddStep("import test beatmap", () => importedBeatmapSet = ImportBeatmapTest.LoadOszIntoOsu(game).GetResultSafely());
             base.SetUpSteps();
         }
 

osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs

@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("state is not downloaded", () => downloadButton.State.Value == DownloadState.NotDownloaded);
 
-            AddStep("import score", () => imported = scoreManager.Import(getScoreInfo(true)).WaitSafelyForResult());
+            AddStep("import score", () => imported = scoreManager.Import(getScoreInfo(true)).GetResultSafely());
 
             AddUntilStep("state is available", () => downloadButton.State.Value == DownloadState.LocallyAvailable);
 

osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs

@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("import beatmap", () =>
             {
-                importedBeatmap = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).WaitSafelyForResult();
+                importedBeatmap = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).GetResultSafely();
                 importedBeatmapId = importedBeatmap.Beatmaps.First(b => b.RulesetID == 0).OnlineID ?? -1;
             });
         }

osu.Game.Tests/Visual/Menus/TestSceneMusicActionHandling.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("import beatmap with track", () =>
             {
-                var setWithTrack = Game.BeatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).WaitSafelyForResult();
+                var setWithTrack = Game.BeatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).GetResultSafely();
                 Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(setWithTrack.Value.Beatmaps.First());
             });
 

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

@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            importedSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).WaitSafelyForResult();
+            importedSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).GetResultSafely();
             importedBeatmap = importedSet.Beatmaps.First(b => b.RulesetID == 0);
             importedBeatmapId = importedBeatmap.OnlineID ?? -1;
         }

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

@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = LookupCache.GetUserAsync(1).WaitSafelyForResult());
+            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = LookupCache.GetUserAsync(1).GetResultSafely());
 
             AddStep("create leaderboard", () =>
             {
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestUserQuit()
         {
             foreach (int user in users)
-                AddStep($"mark user {user} quit", () => Client.RemoveUser(LookupCache.GetUserAsync(user).WaitSafelyForResult().AsNonNull()));
+                AddStep($"mark user {user} quit", () => Client.RemoveUser(LookupCache.GetUserAsync(user).GetResultSafely().AsNonNull()));
         }
 
         [Test]

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

@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = LookupCache.GetUserAsync(1).WaitSafelyForResult());
+            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = LookupCache.GetUserAsync(1).GetResultSafely());
 
             AddStep("create leaderboard", () =>
             {

osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs

@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.Navigation
                             Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
                         },
                     }
-                }).WaitSafelyForResult().Value;
+                }).GetResultSafely().Value;
             });
 
             AddAssert($"import {i} succeeded", () => imported != null);

osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs

@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Navigation
                             Ruleset = new OsuRuleset().RulesetInfo
                         },
                     }
-                }).WaitSafelyForResult().Value;
+                }).GetResultSafely().Value;
             });
         }
 
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Navigation
                     OnlineID = i,
                     BeatmapInfo = beatmap.Beatmaps.First(),
                     Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
-                }).WaitSafelyForResult().Value;
+                }).GetResultSafely().Value;
             });
 
             AddAssert($"import {i} succeeded", () => imported != null);

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs

@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Visual.Playlists
             });
         }
 
-        private void importBeatmap() => AddStep("import beatmap", () => importedBeatmap = manager.Import(CreateBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).WaitSafelyForResult());
+        private void importBeatmap() => AddStep("import beatmap", () => importedBeatmap = manager.Import(CreateBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).GetResultSafely());
 
         private class TestPlaylistsRoomSubScreen : PlaylistsRoomSubScreen
         {

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

@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 beatmap.DifficultyName = $"SR{i + 1}";
             }
 
-            return Game.BeatmapManager.Import(beatmapSet).WaitSafelyForResult().Value;
+            return Game.BeatmapManager.Import(beatmapSet).GetResultSafely().Value;
         }
 
         private bool ensureAllBeatmapSetsImported(IEnumerable<BeatmapSetInfo> beatmapSets) => beatmapSets.All(set => set != null);

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

@@ -760,7 +760,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("import huge difficulty count map", () =>
             {
                 var usableRulesets = rulesets.AvailableRulesets.Where(r => r.OnlineID != 2).ToArray();
-                imported = manager.Import(TestResources.CreateTestBeatmapSetInfo(50, usableRulesets)).WaitSafelyForResult().Value;
+                imported = manager.Import(TestResources.CreateTestBeatmapSetInfo(50, usableRulesets)).GetResultSafely().Value;
             });
 
             AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported.Beatmaps.First()));

osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default));
             dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, ContextFactory, Scheduler));
 
-            beatmapInfo = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).WaitSafelyForResult().Value.Beatmaps[0];
+            beatmapInfo = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).GetResultSafely().Value.Beatmaps[0];
 
             for (int i = 0; i < 50; i++)
             {
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     User = new APIUser { Username = "TestUser" },
                 };
 
-                importedScores.Add(scoreManager.Import(score).WaitSafelyForResult().Value);
+                importedScores.Add(scoreManager.Import(score).GetResultSafely().Value);
             }
 
             return dependencies;

osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapBackgroundSprite.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             this.api = api;
 
-            testBeatmap = ImportBeatmapTest.LoadOszIntoOsu(osu).WaitSafelyForResult();
+            testBeatmap = ImportBeatmapTest.LoadOszIntoOsu(osu).GetResultSafely();
         }
 
         [Test]

osu.Game/Beatmaps/BeatmapDifficultyCache.cs

@@ -270,7 +270,7 @@ namespace osu.Game.Beatmaps
                         if (cancellationToken.IsCancellationRequested)
                             return;
 
-                        var starDifficulty = task.GetCompletedResult();
+                        var starDifficulty = task.GetResultSafely();
 
                         if (starDifficulty != null)
                             bindable.Value = starDifficulty.Value;

osu.Game/Beatmaps/BeatmapManager.cs

@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps
                 }
             };
 
-            var imported = beatmapModelManager.Import(set).WaitSafelyForResult().Value;
+            var imported = beatmapModelManager.Import(set).GetResultSafely().Value;
 
             return GetWorkingBeatmap(imported.Beatmaps.First());
         }

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -186,7 +186,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return loadBeatmapAsync().WaitSafelyForResult();
+                    return loadBeatmapAsync().GetResultSafely();
                 }
                 catch (AggregateException ae)
                 {

osu.Game/Database/OnlineLookupCache.cs

@@ -59,7 +59,7 @@ namespace osu.Game.Database
                     if (!task.IsCompletedSuccessfully)
                         return null;
 
-                    return task.GetCompletedResult();
+                    return task.GetResultSafely();
                 }, token));
             }
 

osu.Game/Online/Chat/ChannelManager.cs

@@ -536,7 +536,7 @@ namespace osu.Game.Online.Chat
                     // Try to get user in order to open PM chat
                     users.GetUserAsync((int)lastClosedChannel.Id).ContinueWith(task =>
                     {
-                        var user = task.GetCompletedResult();
+                        var user = task.GetResultSafely();
 
                         if (user != null)
                             Schedule(() => CurrentChannel.Value = JoinChannel(new Channel(user)));

osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs

@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 if (loadCancellationSource.IsCancellationRequested)
                                     return;
 
-                                var scores = task.GetCompletedResult();
+                                var scores = task.GetResultSafely();
 
                                 var topScore = scores.First();
 

osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Dashboard
                     {
                         users.GetUserAsync(id).ContinueWith(task =>
                         {
-                            var user = task.GetCompletedResult();
+                            var user = task.GetResultSafely();
 
                             if (user == null) return;
 

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

@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         checkForUpdatesButton.Enabled.Value = false;
                         Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(task => Schedule(() =>
                         {
-                            if (!task.GetCompletedResult())
+                            if (!task.GetResultSafely())
                             {
                                 notifications?.Post(new SimpleNotification
                                 {

osu.Game/Scoring/ScoreManager.cs

@@ -113,7 +113,7 @@ namespace osu.Game.Scoring
         public void GetTotalScore([NotNull] ScoreInfo score, [NotNull] Action<long> callback, ScoringMode mode = ScoringMode.Standardised, CancellationToken cancellationToken = default)
         {
             GetTotalScoreAsync(score, mode, cancellationToken)
-                .ContinueWith(task => scheduler.Add(() => callback(task.GetCompletedResult())), TaskContinuationOptions.OnlyOnRanToCompletion);
+                .ContinueWith(task => scheduler.Add(() => callback(task.GetResultSafely())), TaskContinuationOptions.OnlyOnRanToCompletion);
         }
 
         /// <summary>

osu.Game/Screens/Menu/IntroScreen.cs

@@ -111,7 +111,7 @@ namespace osu.Game.Screens.Menu
                 {
                     // if we detect that the theme track or beatmap is unavailable this is either first startup or things are in a bad state.
                     // this could happen if a user has nuked their files store. for now, reimport to repair this.
-                    var import = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).WaitSafelyForResult();
+                    var import = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).GetResultSafely();
 
                     import.PerformWrite(b =>
                     {

osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs

@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Play.HUD
 
             userLookupCache.GetUsersAsync(playingUsers.Select(u => u.UserID).ToArray()).ContinueWith(task => Schedule(() =>
             {
-                var users = task.GetCompletedResult();
+                var users = task.GetResultSafely();
 
                 foreach (var user in users)
                 {

osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs

@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Play.HUD
                 difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, clonedMods, loadCancellationSource.Token)
                                .ContinueWith(task => Schedule(() =>
                                {
-                                   timedAttributes = task.GetCompletedResult();
+                                   timedAttributes = task.GetResultSafely();
 
                                    IsValid = true;
 

osu.Game/Screens/Play/Player.cs

@@ -771,7 +771,7 @@ namespace osu.Game.Screens.Play
                     // This player instance may already be in the process of exiting.
                     return;
 
-                this.Push(CreateResults(prepareScoreForDisplayTask.WaitSafelyForResult()));
+                this.Push(CreateResults(prepareScoreForDisplayTask.GetResultSafely()));
             }, Time.Current + delay, 50);
 
             Scheduler.Add(resultsDisplayDelegate);

osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs

@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
 
-            var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).WaitSafelyForResult();
+            var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
 
             AddInternal(new FillFlowContainer
             {

osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             else
             {
                 performanceCache.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
-                                .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetCompletedResult())), cancellationTokenSource.Token);
+                                .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetResultSafely())), cancellationTokenSource.Token);
             }
         }
 

osu.Game/Screens/Select/Details/AdvancedStats.cs

@@ -153,8 +153,8 @@ namespace osu.Game.Screens.Select.Details
 
             Task.WhenAll(normalStarDifficultyTask, moddedStarDifficultyTask).ContinueWith(_ => Schedule(() =>
             {
-                var normalDifficulty = normalStarDifficultyTask.GetCompletedResult();
+                var normalDifficulty = normalStarDifficultyTask.GetResultSafely();
-                var moddeDifficulty = moddedStarDifficultyTask.GetCompletedResult();
+                var moddeDifficulty = moddedStarDifficultyTask.GetResultSafely();
 
                 if (normalDifficulty == null || moddeDifficulty == null)
                     return;

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

@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 }
 
                 scoreManager.OrderByTotalScoreAsync(scores.ToArray(), cancellationToken)
-                            .ContinueWith(task => scoresCallback?.Invoke(task.GetCompletedResult()), TaskContinuationOptions.OnlyOnRanToCompletion);
+                            .ContinueWith(task => scoresCallback?.Invoke(task.GetResultSafely()), TaskContinuationOptions.OnlyOnRanToCompletion);
 
                 return null;
             }
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                 if (cancellationToken.IsCancellationRequested)
                                     return;
 
-                                scoresCallback?.Invoke(task.GetCompletedResult());
+                                scoresCallback?.Invoke(task.GetResultSafely());
                                 TopScore = r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo);
                             }), TaskContinuationOptions.OnlyOnRanToCompletion);
             };

osu.Game/Screens/Spectate/SpectatorScreen.cs

@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Spectate
 
             userLookupCache.GetUsersAsync(users.ToArray()).ContinueWith(task => Schedule(() =>
             {
-                var foundUsers = task.GetCompletedResult();
+                var foundUsers = task.GetResultSafely();
 
                 foreach (var u in foundUsers)
                 {

osu.Game/Skinning/SkinManager.cs

@@ -154,7 +154,7 @@ namespace osu.Game.Skinning
                     Name = s.Name + @" (modified)",
                     Creator = s.Creator,
                     InstantiationInfo = s.InstantiationInfo,
-                }).WaitSafelyForResult();
+                }).GetResultSafely();
 
                 if (result != null)
                 {

osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs

@@ -148,7 +148,7 @@ namespace osu.Game.Tests.Beatmaps
             if (!conversionTask.Wait(10000))
                 Assert.Fail("Conversion timed out");
 
-            return conversionTask.GetCompletedResult();
+            return conversionTask.GetResultSafely();
         }
 
         protected virtual void OnConversionGenerated(HitObject original, IEnumerable<HitObject> result, IBeatmapConverter beatmapConverter)