diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f041f2e916..d468886d6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: build-only-ios: name: Build only (iOS) - runs-on: macos-latest + runs-on: macos-15 timeout-minutes: 60 steps: - name: Checkout @@ -143,7 +143,7 @@ jobs: dotnet-version: "8.0.x" - name: Install .NET Workloads - run: dotnet workload install ios --from-rollback-file https://raw.githubusercontent.com/ppy/osu-framework/refs/heads/master/workloads.json + run: dotnet workload install ios - name: Build run: dotnet build -c Debug osu.iOS.slnf diff --git a/osu.Android.props b/osu.Android.props index 0509d86b0a..ebe2ca782a 100644 --- a/osu.Android.props +++ b/osu.Android.props @@ -10,7 +10,7 @@ true - + diff --git a/osu.iOS.props b/osu.iOS.props index 99eed6c204..74b56bbaf6 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -17,6 +17,6 @@ -all - + diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs index c7ef1c885a..fff781f38f 100644 --- a/osu.iOS/OsuGameIOS.cs +++ b/osu.iOS/OsuGameIOS.cs @@ -20,15 +20,9 @@ namespace osu.iOS { private readonly AppDelegate appDelegate; - public override Version AssemblyVersion - { - get - { - // Example: 2025.613.0-tachyon - string bundleVersion = NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString(); - return new Version(bundleVersion.Split('-')[0]); - } - } + public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString()); + + public override string Version => NSBundle.MainBundle.InfoDictionary["OsuVersion"].ToString(); public override bool HideUnlicensedContent => true; diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj index 19c0c610b5..3e8beddaa4 100644 --- a/osu.iOS/osu.iOS.csproj +++ b/osu.iOS/osu.iOS.csproj @@ -4,8 +4,12 @@ 13.4 Exe 0.1.0 - $(Version) - $(Version) + + + $([System.String]::Copy('$(Version)').Split('-')[0]) + + $(VersionNoSuffix) + $(VersionNoSuffix) @@ -18,4 +22,14 @@ + + + + $(AppBundleDir)/Info.plist + OsuVersion + + +