mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 09:02:55 +08:00
Merge branch 'master' into iskincomponent
This commit is contained in:
commit
236ddf2d06
@ -61,6 +61,6 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
||||||
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.830.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<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="12.0.2" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
||||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
||||||
<PackageReference Include="ppy.osu.Framework" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Framework" Version="2019.830.1" />
|
||||||
<PackageReference Include="SharpCompress" Version="0.24.0" />
|
<PackageReference Include="SharpCompress" Version="0.24.0" />
|
||||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||||
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
<PackageReference Include="SharpRaven" Version="2.4.0" />
|
||||||
|
@ -118,8 +118,8 @@
|
|||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
||||||
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.830.0" />
|
||||||
<PackageReference Include="ppy.osu.Framework" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Framework" Version="2019.830.1" />
|
||||||
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.830.0" />
|
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.830.1" />
|
||||||
<PackageReference Include="SharpCompress" Version="0.24.0" />
|
<PackageReference Include="SharpCompress" Version="0.24.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" />
|
||||||
|
Loading…
Reference in New Issue
Block a user