sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into per-ruleset-skinnable-tests

Browse Source
This commit is contained in:
Dan Balasescu
2020-04-07 22:59:42 +09:00
committed by GitHub
parent 9071bf5cbb 2118998243
commit 7951a52a15
14 changed files with 116 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -27,9 +27,6 @@ namespace osu.Game.Tests.Visual
private Skin specialSkin;
private Skin oldSkin;
// Keep a static reference to ensure we don't use a dynamically recompiled DLL as a source (resources will be missing).
private static DllResourceStore dllStore;
protected SkinnableTestScene()
: base(2, 3)
{
@ -41,7 +38,7 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader]
private void load(AudioManager audio, SkinManager skinManager)
{
dllStore ??= new DllResourceStore(GetType().Assembly);
var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);