Merge branch 'master' into import-early-checksum-abort

This commit is contained in:
Dan Balasescu
2021-06-28 19:29:08 +09:00
committed by GitHub
71 changed files with 1534 additions and 248 deletions

View File

@ -788,7 +788,7 @@ namespace osu.Game.Database
/// <param name="model">The model to populate.</param>
/// <param name="archive">The archive to use as a reference for population. May be null.</param>
/// <param name="cancellationToken">An optional cancellation token.</param>
protected virtual Task Populate(TModel model, [CanBeNull] ArchiveReader archive, CancellationToken cancellationToken = default) => Task.CompletedTask;
protected abstract Task Populate(TModel model, [CanBeNull] ArchiveReader archive, CancellationToken cancellationToken = default);
/// <summary>
/// Perform any final actions before the import to database executes.