RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-23 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test CI run with new changes

Browse Source
This commit is contained in:
Dean Herbert 2018-04-21 18:15:27 +09:00
parent ae0fb39087
commit 44a9aa529a
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 10597927c0eac1b1ea263598088ffc5b2f520953 Subproject commit 54bdeda01dc9ec356037b63c002dbce282226e90

3
osu.Game/IO/Archives/ArchiveReader.cs
View File

@ -1,14 +1,13 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
namespace osu.Game.IO.Archives namespace osu.Game.IO.Archives
{ {
public abstract class ArchiveReader : IDisposable, IResourceStore<byte[]> public abstract class ArchiveReader : IResourceStore<byte[]>
{ {
/// <summary> /// <summary>
/// Opens a stream for reading a specific file from this archive. /// Opens a stream for reading a specific file from this archive.

25
osu.Game/Skinning/LegacySkin.cs
View File

@ -113,6 +113,31 @@ namespace osu.Game.Skinning
string path = getPathForFile(name); string path = getPathForFile(name);
return path == null ? null : underlyingStore.Get(path); return path == null ? null : underlyingStore.Get(path);
} }
#region IDisposable Support
private bool isDisposed;
protected virtual void Dispose(bool disposing)
{
if (!isDisposed)
{
isDisposed = true;
}
}
~LegacySkinResourceStore()
{
Dispose(false);
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
} }
} }
} }

9
osu.Game/Tests/Visual/OsuTestCase.cs
View File

@ -19,14 +19,7 @@ namespace osu.Game.Tests.Visual
public OsuTestCaseTestRunner() public OsuTestCaseTestRunner()
{ {
runner = new TestCaseTestRunner.TestRunner(); Add(runner = new TestCaseTestRunner.TestRunner());
}
protected override void LoadComplete()
{
base.LoadComplete();
Add(runner);
} }
public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test); public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test);