# Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests
Also centralises wait-or-assert logic.
Welcome back BeatmapManager
Hide database functionality at a lower level in preparation from eventually making it private.
Has been failing CI randomly, so let's increase the timeout a bit.
This reverts commit 6f20473e65, reversing changes made to c76a495d3d.
6f20473e65
c76a495d3d
# Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs
When file is in use, we expect it to presist removal, in other words, fail to delete.
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).