1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 16:07:25 +08:00

Merge pull request #21583 from Susko3/fix-android-linker-calendars

Fix android crash when using non-Gregorian calendars
This commit is contained in:
Dan Balasescu 2022-12-09 13:05:36 +09:00 committed by GitHub
commit f2fdff22e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions

View File

@ -58,4 +58,7 @@
<!-- 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. -->
<PackageReference Include="Realm" Version="10.18.0" /> <PackageReference Include="Realm" Version="10.18.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/>
</ItemGroup>
</Project> </Project>

7
osu.Android/Linker.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<linker>
<assembly fullname="mscorlib">
<!-- see https://github.com/ppy/osu/issues/21516 -->
<type fullname="System.Globalization.*Calendar"/>
</assembly>
</linker>

View File

@ -24,4 +24,8 @@
<assembly fullname="osu.Game.Rulesets.Osu"> <assembly fullname="osu.Game.Rulesets.Osu">
<type fullname="*" /> <type fullname="*" />
</assembly> </assembly>
<assembly fullname="mscorlib">
<!-- see https://github.com/ppy/osu/issues/21516 -->
<type fullname="System.Globalization.*Calendar"/>
</assembly>
</linker> </linker>