Avoid using ContinueWith in already async context

osu.Game/Database/ArchiveModelManager.cs

@@ -152,26 +152,35 @@ protected async Task Import(ProgressNotification notification, params string[] p
 
             var imported = new List<TModel>();
 
-            await Task.WhenAll(paths.Select(path => Import(path, notification.CancellationToken).ContinueWith(t =>
+            await Task.WhenAll(paths.Select(async path =>
             {
                 notification.CancellationToken.ThrowIfCancellationRequested();
 
+                try
+                {
+                    var model = await Import(path, notification.CancellationToken);
+
                     lock (imported)
                     {
-                    Interlocked.Increment(ref current);
+                        imported.Add(model);
 
-                    if (t.Exception == null)
-                    {
-                        imported.Add(t.Result);
                         notification.Text = $"Imported {current} of {paths.Length} {term}s";
                         notification.Progress = (float)current / paths.Length;
                     }
-                    else
+                }
+                catch (TaskCanceledException)
                 {
-                        Logger.Error(t.Exception, $@"Could not import ({Path.GetFileName(path)})");
+                    throw;
                 }
+                catch (Exception e)
+                {
+                    Logger.Error(e, $@"Could not import ({Path.GetFileName(path)})");
                 }
-            }, TaskContinuationOptions.NotOnCanceled)));
+                finally
+                {
+                    Interlocked.Increment(ref current);
+                }
+            }));
 
             if (imported.Count == 0)
             {