Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove iPhone/iPhoneSimulator platform configurations #6351

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Remove iPhone/iPhoneSimulator platform configurations #6351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dccd37d
Remove `iPhone`/`iPhoneSimulator` platform configurations
frenzibyte Aug 8, 2024
d5977e3
Remove no longer needed specifications
frenzibyte Aug 8, 2024
ff413e7
Update spirv package
smoogipoo Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu-framework.iOS.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
"SampleGame\\SampleGame.csproj"
]
}
}
}
216 changes: 16 additions & 200 deletions osu-framework.sln
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
so there's nothing to be worried about. -->
<NoWarn>MT7091</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhone'">
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'">
<RuntimeIdentifiers>iossimulator-x64</RuntimeIdentifiers>
</PropertyGroup>
<Import Project="..\..\..\..\osu.Framework.iOS.props" />
<ItemGroup>
<ProjectReference Include="..\TemplateGame.Game\TemplateGame.Game.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
so there's nothing to be worried about. -->
<NoWarn>MT7091</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhone'">
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'">
<RuntimeIdentifiers>iossimulator-x64</RuntimeIdentifiers>
</PropertyGroup>
<Import Project="..\..\..\..\osu.Framework.iOS.props" />
<ItemGroup>
<ProjectReference Include="..\FlappyDon.Game\FlappyDon.Game.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions osu.Framework.iOS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
<!-- On release configurations, we use AOT compiler for optimal performance. -->
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhone'">
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'">
<RuntimeIdentifiers>iossimulator-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\bass.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
<NativeReference Include="$(MSBuildThisFileDirectory)osu.Framework.iOS\runtimes\ios\native\bass_fx.xcframework" Kind="Framework" SmartLink="false" ForceLoad="true" />
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework/osu.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
<PackageReference Include="ppy.ManagedBass.Wasapi" Version="2022.1216.0" />
<PackageReference Include="ppy.Veldrid" Version="4.9.58-gfe61932a71" />
<PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-gca6cec7843" />
<PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-g0c0fcee30c" />
<PackageReference Include="SharpFNT" Version="2.0.0" />
<!-- Preview version of ImageSharp causes NU5104. -->
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
Expand Down
Loading