h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 15:53:21 +08:00
Code Issues Releases Wiki Activity

Merge pull request #18917 from peppy/framework-bump

Browse Source 
Update framework
This commit is contained in:
Dean Herbert 2022-06-28 19:10:25 +09:00 committed by GitHub
commit 6ef7c3c0b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -52,7 +52,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.624.1" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2022.628.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. --> <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

17
osu.Game/OsuGame.cs
View File

@ -24,6 +24,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Framework.Threading; using osu.Framework.Threading;
@ -686,27 +687,29 @@ namespace osu.Game
{ {
base.LoadComplete(); base.LoadComplete();
foreach (var language in Enum.GetValues(typeof(Language)).OfType<Language>()) var languages = Enum.GetValues(typeof(Language)).OfType<Language>();
var mappings = languages.Select(language =>
{ {
#if DEBUG #if DEBUG
if (language == Language.debug) if (language == Language.debug)
{ return new LocaleMapping("debug", new DebugLocalisationStore());
Localisation.AddLanguage(Language.debug.ToString(), new DebugLocalisationStore());
continue;
}
#endif #endif
string cultureCode = language.ToCultureCode(); string cultureCode = language.ToCultureCode();
try try
{ {
Localisation.AddLanguage(cultureCode, new ResourceManagerLocalisationStore(cultureCode)); return new LocaleMapping(new ResourceManagerLocalisationStore(cultureCode));
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Error(ex, $"Could not load localisations for language \"{cultureCode}\""); Logger.Error(ex, $"Could not load localisations for language \"{cultureCode}\"");
return null;
} }
} }).Where(m => m != null);
Localisation.AddLocaleMappings(mappings);
// The next time this is updated is in UpdateAfterChildren, which occurs too late and results // The next time this is updated is in UpdateAfterChildren, which occurs too late and results
// in the cursor being shown for a few frames during the intro. // in the cursor being shown for a few frames during the intro.

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

@ -36,7 +36,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="10.14.0" /> <PackageReference Include="Realm" Version="10.14.0" />
<PackageReference Include="ppy.osu.Framework" Version="2022.624.1" /> <PackageReference Include="ppy.osu.Framework" Version="2022.628.1" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" />
<PackageReference Include="Sentry" Version="3.17.1" /> <PackageReference Include="Sentry" Version="3.17.1" />
<PackageReference Include="SharpCompress" Version="0.31.0" /> <PackageReference Include="SharpCompress" Version="0.31.0" />

4
osu.iOS.props
View File

@ -61,7 +61,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="2022.624.1" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.628.1" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.623.0" />
</ItemGroup> </ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) --> <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@ -84,7 +84,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ppy.osu.Framework" Version="2022.624.1" /> <PackageReference Include="ppy.osu.Framework" Version="2022.628.1" />
<PackageReference Include="SharpCompress" Version="0.31.0" /> <PackageReference Include="SharpCompress" Version="0.31.0" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />