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

Merge pull request #4378 from peppy/fix-ios-versioning

Browse Source 
Fix iOS builds not being able to read their deploy version
This commit is contained in:
Dean Herbert 2019-03-01 20:30:24 +09:00 committed by GitHub
commit 810828e807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/OsuGameBase.cs
View File

@ -75,9 +75,9 @@ namespace osu.Game
private Bindable<bool> fpsDisplayVisible; private Bindable<bool> fpsDisplayVisible;
protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() }; public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
public bool IsDeployedBuild => AssemblyName.Version.Major > 0; public bool IsDeployedBuild => AssemblyVersion.Major > 0;
public string Version public string Version
{ {
@ -86,8 +86,8 @@ namespace osu.Game
if (!IsDeployedBuild) if (!IsDeployedBuild)
return @"local " + (DebugUtils.IsDebug ? @"debug" : @"release"); return @"local " + (DebugUtils.IsDebug ? @"debug" : @"release");
var assembly = AssemblyName; var version = AssemblyVersion;
return $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}"; return $@"{version.Major}.{version.Minor}.{version.Build}";
} }
} }

4
osu.iOS/AppDelegate.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using Foundation; using Foundation;
@ -10,6 +10,6 @@ namespace osu.iOS
[Register("AppDelegate")] [Register("AppDelegate")]
public class AppDelegate : GameAppDelegate public class AppDelegate : GameAppDelegate
{ {
protected override Framework.Game CreateGame() => new OsuGame(); protected override Framework.Game CreateGame() => new OsuGameIOS();
} }
} }

14
osu.iOS/OsuGameIOS.cs Normal file
View File

@ -0,0 +1,14 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using Foundation;
using osu.Game;
namespace osu.iOS
{
public class OsuGameIOS : OsuGame
{
protected override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
}
}

1
osu.iOS/osu.iOS.csproj
View File

@ -48,6 +48,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="Application.cs" /> <Compile Include="Application.cs" />
<Compile Include="AppDelegate.cs" /> <Compile Include="AppDelegate.cs" />
<Compile Include="OsuGameIOS.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<LinkDescription Include="Linker.xml" /> <LinkDescription Include="Linker.xml" />