Merge branch 'master' into mania-skinning-testability

global.json

@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.24"
+    "Microsoft.Build.Traversal": "2.0.32"
   }
 }

osu.Game/Beatmaps/BeatmapManager.cs

@@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path)?.ToLowerInvariant() == ".osz";
 
-        protected override Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
+        protected override async Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
             if (archive != null)
                 beatmapSet.Beatmaps = createBeatmapDifficulties(beatmapSet.Files);
@@ -103,7 +103,19 @@ namespace osu.Game.Beatmaps
 
             validateOnlineIds(beatmapSet);
 
-            return updateQueue.UpdateAsync(beatmapSet, cancellationToken);
+            bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
+
+            await updateQueue.UpdateAsync(beatmapSet, cancellationToken);
+
+            // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
+            if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
+            {
+                if (beatmapSet.OnlineBeatmapSetID != null)
+                {
+                    beatmapSet.OnlineBeatmapSetID = null;
+                    LogForModel(beatmapSet, "Disassociating beatmap set ID due to loss of all beatmap IDs");
+                }
+            }
         }
 
         protected override void PreImport(BeatmapSetInfo beatmapSet)
@@ -447,6 +459,8 @@ namespace osu.Game.Beatmaps
 
                     var res = req.Result;
 
+                    if (res != null)
+                    {
                         beatmap.Status = res.Status;
                         beatmap.BeatmapSet.Status = res.BeatmapSet.Status;
                         beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
@@ -454,6 +468,7 @@ namespace osu.Game.Beatmaps
 
                         LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
                     }
+                }
                 catch (Exception e)
                 {
                     fail(e);

osu.Game/Online/API/APIRequest.cs

@@ -12,11 +12,11 @@ namespace osu.Game.Online.API
     /// An API request with a well-defined response type.
     /// </summary>
     /// <typeparam name="T">Type of the response (used for deserialisation).</typeparam>
-    public abstract class APIRequest<T> : APIRequest
+    public abstract class APIRequest<T> : APIRequest where T : class
     {
         protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
-        public T Result => ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
+        public T Result => ((OsuJsonWebRequest<T>)WebRequest)?.ResponseObject;
 
         protected APIRequest()
         {

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

@@ -6,7 +6,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel>
+    public abstract class GetRankingsRequest<TModel> : APIRequest<TModel> where TModel : class
     {
         private readonly RulesetInfo ruleset;
         private readonly int page;

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

@@ -6,7 +6,7 @@ using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API.Requests
 {
-    public abstract class PaginatedAPIRequest<T> : APIRequest<T>
+    public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
         private readonly int page;
         private readonly int itemsPerPage;

osu.Game/Screens/Play/ReplayPlayer.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Screens;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
 {
@@ -29,6 +30,8 @@ namespace osu.Game.Screens.Play
             this.Push(CreateResults(DrawableRuleset.ReplayScore.ScoreInfo));
         }
 
+        protected override ResultsScreen CreateResults(ScoreInfo score) => new ResultsScreen(score, false);
+
         protected override ScoreInfo CreateScore() => score.ScoreInfo;
     }
 }

osu.Game/Screens/Ranking/ResultsScreen.cs

@@ -33,16 +33,21 @@ namespace osu.Game.Screens.Ranking
 
         public readonly ScoreInfo Score;
 
+        private readonly bool allowRetry;
+
         private Drawable bottomPanel;
 
-        public ResultsScreen(ScoreInfo score)
+        public ResultsScreen(ScoreInfo score, bool allowRetry = true)
         {
             Score = score;
+            this.allowRetry = allowRetry;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            FillFlowContainer buttons;
+
             InternalChildren = new[]
             {
                 new ResultsScrollContainer
@@ -68,7 +73,7 @@ namespace osu.Game.Screens.Ranking
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4Extensions.FromHex("#333")
                         },
-                        new FillFlowContainer
+                        buttons = new FillFlowContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -78,15 +83,16 @@ namespace osu.Game.Screens.Ranking
                             Children = new Drawable[]
                             {
                                 new ReplayDownloadButton(Score) { Width = 300 },
-                                new RetryButton { Width = 300 },
                             }
                         }
                     }
                 }
             };
 
-            if (player != null)
+            if (player != null && allowRetry)
             {
+                buttons.Add(new RetryButton { Width = 300 });
+
                 AddInternal(new HotkeyRetryOverlay
                 {
                     Action = () =>