Merge pull request #6351 from frenzibyte/remove-iphone-configurations

Remove `iPhone`/`iPhoneSimulator` platform configurations
ppy · Aug 9, 2024 · 2a7d7a0 · 2a7d7a0
2 parents 4658a3f + ff413e7
commit 2a7d7a0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 220 deletions.
diff --git a/osu-framework.iOS.slnf b/osu-framework.iOS.slnf
@@ -16,4 +16,4 @@
       "SampleGame\\SampleGame.csproj"
     ]
   }
-}
+}
diff --git a/osu-framework.sln b/osu-framework.sln
diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj
@@ -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" />

diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj
@@ -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" />

diff --git a/osu.Framework.iOS.props b/osu.Framework.iOS.props
@@ -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" />

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
@@ -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" />