h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 00:53:10 +08:00
Code Issues Releases Wiki Activity

Merge pull request #13359 from peppy/update-framework

Browse Source 
Update framework
This commit is contained in:
Dan Balasescu 2021-06-07 16:56:23 +09:00 committed by GitHub
commit d95f3841cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -52,6 +52,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2021.601.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2021.607.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
View File

@ -30,9 +30,12 @@ namespace osu.Game.Graphics.Containers.Markdown
break; break;
case ListItemBlock listItemBlock: case ListItemBlock listItemBlock:
var isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered; bool isOrdered = ((ListBlock)listItemBlock.Parent)?.IsOrdered == true;
var childContainer = CreateListItem(listItemBlock, level, isOrdered);
OsuMarkdownListItem childContainer = CreateListItem(listItemBlock, level, isOrdered);
container.Add(childContainer); container.Add(childContainer);
foreach (var single in listItemBlock) foreach (var single in listItemBlock)
base.AddMarkdownComponent(single, childContainer.Content, level); base.AddMarkdownComponent(single, childContainer.Content, level);
break; break;

2
osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
case ParagraphBlock paragraphBlock: case ParagraphBlock paragraphBlock:
// Check if paragraph only contains an image // Check if paragraph only contains an image
if (paragraphBlock.Inline.Count() == 1 && paragraphBlock.Inline.FirstChild is LinkInline { IsImage: true } linkInline) if (paragraphBlock.Inline?.Count() == 1 && paragraphBlock.Inline.FirstChild is LinkInline { IsImage: true } linkInline)
{ {
container.Add(new WikiMarkdownImageBlock(linkInline)); container.Add(new WikiMarkdownImageBlock(linkInline));
return; return;

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

@ -34,7 +34,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="ppy.osu.Framework" Version="2021.601.0" /> <PackageReference Include="ppy.osu.Framework" Version="2021.607.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" />
<PackageReference Include="Sentry" Version="3.4.0" /> <PackageReference Include="Sentry" Version="3.4.0" />
<PackageReference Include="SharpCompress" Version="0.28.2" /> <PackageReference Include="SharpCompress" Version="0.28.2" />

4
osu.iOS.props
View File

@ -70,7 +70,7 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2021.601.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.607.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2021.525.0" />
</ItemGroup> </ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) --> <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@ -93,7 +93,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ppy.osu.Framework" Version="2021.601.0" /> <PackageReference Include="ppy.osu.Framework" Version="2021.607.0" />
<PackageReference Include="SharpCompress" Version="0.28.2" /> <PackageReference Include="SharpCompress" Version="0.28.2" />
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="SharpRaven" Version="2.4.0" /> <PackageReference Include="SharpRaven" Version="2.4.0" />