RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues (+ use updated framework)

This commit is contained in:
smoogipoo 2018-12-10 13:48:05 +09:00
parent 352a758f5c
commit 41c7d10dff
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/LinkFlowContainer.cs
View File

@ -62,7 +62,7 @@ public void AddLinks(string text, List<Link> links)
public void AddLink(string text, string url, LinkAction linkType = LinkAction.External, string linkArgument = null, string tooltipText = null, Action<SpriteText> creationParameters = null) public void AddLink(string text, string url, LinkAction linkType = LinkAction.External, string linkArgument = null, string tooltipText = null, Action<SpriteText> creationParameters = null)
{ {
AddInternal(new DrawableLinkCompiler(AddText(text, creationParameters).ToList()) AddInternal(new DrawableLinkCompiler(AddText(text, creationParameters).OfType<SpriteText>().ToList())
{ {
TooltipText = tooltipText ?? (url != text ? url : string.Empty), TooltipText = tooltipText ?? (url != text ? url : string.Empty),
Action = () => Action = () =>

4
osu.Game/OsuGame.cs
View File

@ -553,9 +553,9 @@ private void loadComponentSingleFile<T>(T d, Action<T> add)
try try
{ {
Logger.Log($"Loading {d}...", LoggingTarget.Debug); Logger.Log($"Loading {d}...", level: LogLevel.Debug);
await LoadComponentAsync(d, add); await LoadComponentAsync(d, add);
Logger.Log($"Loaded {d}!", LoggingTarget.Debug); Logger.Log($"Loaded {d}!", level: LogLevel.Debug);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {

3
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -111,7 +112,7 @@ private void recreateText()
{ {
sprite.TextSize = 16; sprite.TextSize = 16;
sprite.Font = @"Exo2.0-Regular"; sprite.Font = @"Exo2.0-Regular";
}); }).OfType<SpriteText>();
text.AddText(artistBind.Value, sprite => text.AddText(artistBind.Value, sprite =>
{ {

2
osu.Game/osu.Game.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.4" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="ppy.osu.Framework" Version="2018.1120.0" /> <PackageReference Include="ppy.osu.Framework" Version="0.0.7654" />
<PackageReference Include="SharpCompress" Version="0.22.0" /> <PackageReference Include="SharpCompress" Version="0.22.0" />
<PackageReference Include="NUnit" Version="3.11.0" /> <PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />