From aa5b7be5f385a245bac626b03dd6a89d67fe41f2 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Mon, 12 Dec 2022 00:19:24 +0300 Subject: [PATCH] Migrate framework iOS projects to .NET 6 --- SampleGame.iOS/SampleGame.iOS.csproj | 52 +----- .../TemplateGame.iOS/TemplateGame.iOS.csproj | 142 +--------------- .../FlappyDon.iOS/FlappyDon.iOS.csproj | 155 +----------------- osu.Framework.Tests.iOS/Linker.xml | 12 -- .../osu.Framework.Tests.iOS.csproj | 46 +----- osu.Framework.iOS.props | 79 +-------- osu.Framework.iOS/GameUIApplication.cs | 2 +- osu.Framework.iOS/osu.Framework.iOS.csproj | 14 +- osu.Framework/RuntimeInfo.cs | 2 +- 9 files changed, 39 insertions(+), 465 deletions(-) delete mode 100644 osu.Framework.Tests.iOS/Linker.xml diff --git a/SampleGame.iOS/SampleGame.iOS.csproj b/SampleGame.iOS/SampleGame.iOS.csproj index 681761958..fe911a190 100644 --- a/SampleGame.iOS/SampleGame.iOS.csproj +++ b/SampleGame.iOS/SampleGame.iOS.csproj @@ -1,51 +1,13 @@ - - + - Debug - iPhoneSimulator - {529D5E2E-774A-4831-9C9E-59E3E8DFF155} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - SampleGame.iOS - SampleGame.iOS - Resources + net6.0-ios + 11.0 - - false - - - false - + + + - - - - - - - - - - - - - - - - - {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D} - SampleGame - - - {C76BF5B3-985E-4D39-95FE-97C9C879B83A} - osu.Framework - - - {BBC0D18F-8595-43A6-AE61-5BF36A072CCE} - osu.Framework.iOS - - - - \ No newline at end of file + 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 index 7448f3e88..e18dbbe91 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj @@ -1,143 +1,14 @@ - - + - true - Debug - iPhone - 8.0.30703 - 2.0 - {7AA1DB5D-78DB-4693-AE50-D6078F5A0CAB} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - Debug - iPhone - 8.0.30703 - 2.0 - {7AA1DB5D-78DB-4693-AE50-D6078F5A0CAB} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - TemplateGame.iOS - TemplateGame - - - - --nosymbolstrip=BASS_FX_BPM_BeatCallbackReset --nosymbolstrip=BASS_FX_BPM_BeatCallbackSet --nosymbolstrip=BASS_FX_BPM_BeatDecodeGet --nosymbolstrip=BASS_FX_BPM_BeatFree --nosymbolstrip=BASS_FX_BPM_BeatGetParameters --nosymbolstrip=BASS_FX_BPM_BeatSetParameters --nosymbolstrip=BASS_FX_BPM_CallbackReset --nosymbolstrip=BASS_FX_BPM_CallbackSet --nosymbolstrip=BASS_FX_BPM_DecodeGet --nosymbolstrip=BASS_FX_BPM_Free --nosymbolstrip=BASS_FX_BPM_Translate --nosymbolstrip=BASS_FX_GetVersion --nosymbolstrip=BASS_FX_ReverseCreate --nosymbolstrip=BASS_FX_ReverseGetSource --nosymbolstrip=BASS_FX_TempoCreate --nosymbolstrip=BASS_FX_TempoGetRateRatio --nosymbolstrip=BASS_FX_TempoGetSource --nosymbolstrip=BASS_Mixer_ChannelFlags --nosymbolstrip=BASS_Mixer_ChannelGetData --nosymbolstrip=BASS_Mixer_ChannelGetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelGetLevel --nosymbolstrip=BASS_Mixer_ChannelGetLevelEx --nosymbolstrip=BASS_Mixer_ChannelGetMatrix --nosymbolstrip=BASS_Mixer_ChannelGetMixer --nosymbolstrip=BASS_Mixer_ChannelGetPosition --nosymbolstrip=BASS_Mixer_ChannelGetPositionEx --nosymbolstrip=BASS_Mixer_ChannelIsActive --nosymbolstrip=BASS_Mixer_ChannelRemove --nosymbolstrip=BASS_Mixer_ChannelRemoveSync --nosymbolstrip=BASS_Mixer_ChannelSetEnvelope --nosymbolstrip=BASS_Mixer_ChannelSetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelSetMatrix --nosymbolstrip=BASS_Mixer_ChannelSetMatrixEx --nosymbolstrip=BASS_Mixer_ChannelSetPosition --nosymbolstrip=BASS_Mixer_ChannelSetSync --nosymbolstrip=BASS_Mixer_GetVersion --nosymbolstrip=BASS_Mixer_StreamAddChannel --nosymbolstrip=BASS_Mixer_StreamAddChannelEx --nosymbolstrip=BASS_Mixer_StreamCreate --nosymbolstrip=BASS_Mixer_StreamGetChannels --nosymbolstrip=BASS_Split_StreamCreate --nosymbolstrip=BASS_Split_StreamGetAvailable --nosymbolstrip=BASS_Split_StreamGetSource --nosymbolstrip=BASS_Split_StreamGetSplits --nosymbolstrip=BASS_Split_StreamReset --nosymbolstrip=BASS_Split_StreamResetEx - - --nolinkaway --nostrip $(GeneratedMtouchSymbolStripFlags) - - - true - full - True - bin\iPhone\Debug - prompt - 4 - True - True - /unsafe - True - false - True - ARMv7, ARMv7s, ARM64 - - - true - - - true - True - full - False - prompt - 4 - True - True - x86_64 - True - full - False - bin\iPhoneSimulator\Debug - prompt - true - None + net6.0-ios + 11.0 iPhone Developer - - true - true - TemplateGame.iOS - TemplateGame.iOS - - - true - full - True - bin\iPhone\Debug - prompt - 4 - True - True - /unsafe - True - false - True - ARM64 - - - true - iPhone Developer - - - true - true - - - ARM64 - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - - - true - true - iPhone Developer - bin\iPhone\Release - ARM64 - + - - - - - - - - - - - - - {6BEB95A6-0673-4AF5-892E-9146FF8B0948} - TemplateGame.Game - - - {6E3EBF71-8664-49D7-BD0D-2B21B3EEC540} - TemplateGame.Resources - - - - - - - - - + + @@ -146,5 +17,4 @@ - 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 index 963d8d177..0134cc38f 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj @@ -1,157 +1,13 @@ - - + - true - Debug - iPhone - 8.0.30703 - 2.0 - {48783186-230D-4048-A97A-E4F1DF43BF5C} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - Debug - iPhone - 8.0.30703 - 2.0 - {48783186-230D-4048-A97A-E4F1DF43BF5C} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - FlappyDon.iOS - FlappyDon - - - - --nosymbolstrip=BASS_FX_BPM_BeatCallbackReset --nosymbolstrip=BASS_FX_BPM_BeatCallbackSet --nosymbolstrip=BASS_FX_BPM_BeatDecodeGet --nosymbolstrip=BASS_FX_BPM_BeatFree --nosymbolstrip=BASS_FX_BPM_BeatGetParameters --nosymbolstrip=BASS_FX_BPM_BeatSetParameters --nosymbolstrip=BASS_FX_BPM_CallbackReset --nosymbolstrip=BASS_FX_BPM_CallbackSet --nosymbolstrip=BASS_FX_BPM_DecodeGet --nosymbolstrip=BASS_FX_BPM_Free --nosymbolstrip=BASS_FX_BPM_Translate --nosymbolstrip=BASS_FX_GetVersion --nosymbolstrip=BASS_FX_ReverseCreate --nosymbolstrip=BASS_FX_ReverseGetSource --nosymbolstrip=BASS_FX_TempoCreate --nosymbolstrip=BASS_FX_TempoGetRateRatio --nosymbolstrip=BASS_FX_TempoGetSource --nosymbolstrip=BASS_Mixer_ChannelFlags --nosymbolstrip=BASS_Mixer_ChannelGetData --nosymbolstrip=BASS_Mixer_ChannelGetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelGetLevel --nosymbolstrip=BASS_Mixer_ChannelGetLevelEx --nosymbolstrip=BASS_Mixer_ChannelGetMatrix --nosymbolstrip=BASS_Mixer_ChannelGetMixer --nosymbolstrip=BASS_Mixer_ChannelGetPosition --nosymbolstrip=BASS_Mixer_ChannelGetPositionEx --nosymbolstrip=BASS_Mixer_ChannelIsActive --nosymbolstrip=BASS_Mixer_ChannelRemove --nosymbolstrip=BASS_Mixer_ChannelRemoveSync --nosymbolstrip=BASS_Mixer_ChannelSetEnvelope --nosymbolstrip=BASS_Mixer_ChannelSetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelSetMatrix --nosymbolstrip=BASS_Mixer_ChannelSetMatrixEx --nosymbolstrip=BASS_Mixer_ChannelSetPosition --nosymbolstrip=BASS_Mixer_ChannelSetSync --nosymbolstrip=BASS_Mixer_GetVersion --nosymbolstrip=BASS_Mixer_StreamAddChannel --nosymbolstrip=BASS_Mixer_StreamAddChannelEx --nosymbolstrip=BASS_Mixer_StreamCreate --nosymbolstrip=BASS_Mixer_StreamGetChannels --nosymbolstrip=BASS_Split_StreamCreate --nosymbolstrip=BASS_Split_StreamGetAvailable --nosymbolstrip=BASS_Split_StreamGetSource --nosymbolstrip=BASS_Split_StreamGetSplits --nosymbolstrip=BASS_Split_StreamReset --nosymbolstrip=BASS_Split_StreamResetEx - - --nolinkaway --nostrip $(GeneratedMtouchSymbolStripFlags) - - - true - full - True - bin\iPhone\Debug - prompt - 4 - True - - - True - /unsafe - True - false - True - ARMv7, ARMv7s, ARM64 - - - true - - - true - True - full - False - prompt - 4 - False - True - True - x86_64 - True - full - False - bin\iPhoneSimulator\Debug - iOS DEBUG DIST SIMULATOR - prompt - 4 - False - True - True - true - None + net6.0-ios + 11.0 iPhone Developer - - true - true - TemplateGame.iOS - TemplateGame.iOS - - - true - full - True - bin\iPhone\Debug - prompt - 4 - True - iPhone Developer - True - /unsafe - True - false - True - - - ARM64 - - - true - - - true - true - - - iPhone Developer - ARM64 - - - bin\iPhoneSimulator\Release - true - SdkOnly - true - iPhone Developer - x86_64 - - - true - iPhone Distribution - true - bin\iPhone\Release - ARM64 - + - - - - - - - - - - - - - {7809CB42-8FED-4BB7-8C68-7638357B94A6} - FlappyDon.Game - - - - - false - - - false - - - - - - - - - + @@ -160,5 +16,4 @@ - \ No newline at end of file diff --git a/osu.Framework.Tests.iOS/Linker.xml b/osu.Framework.Tests.iOS/Linker.xml deleted file mode 100644 index 18f1579b7..000000000 --- a/osu.Framework.Tests.iOS/Linker.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj b/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj index 7f793973a..a3748e187 100644 --- a/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj +++ b/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj @@ -1,36 +1,12 @@ - - + - Debug - iPhoneSimulator - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe + net6.0-ios + 11.0 osu.Framework.Tests osu.Framework.Tests - Resources - {D972753E-45FC-4B82-B017-34BDE485F1BB} - - - false - - - false - - - - - - - - - - - - - - %(RecursiveDir)%(Filename)%(Extension) @@ -40,17 +16,7 @@ - - {C76BF5B3-985E-4D39-95FE-97C9C879B83A} - osu.Framework - - - {BBC0D18F-8595-43A6-AE61-5BF36A072CCE} - osu.Framework.iOS - + + - - - - - \ No newline at end of file + diff --git a/osu.Framework.iOS.props b/osu.Framework.iOS.props index 2c6284987..24bd7684e 100644 --- a/osu.Framework.iOS.props +++ b/osu.Framework.iOS.props @@ -1,74 +1,26 @@  - 8.0 - PackageReference - bin\$(Platform)\$(Configuration) - cjk,mideast,other,rare,west - false - NSUrlSessionHandler - iPhone Developer - - - - --nosymbolstrip=BASS_FX_BPM_BeatCallbackReset --nosymbolstrip=BASS_FX_BPM_BeatCallbackSet --nosymbolstrip=BASS_FX_BPM_BeatDecodeGet --nosymbolstrip=BASS_FX_BPM_BeatFree --nosymbolstrip=BASS_FX_BPM_BeatGetParameters --nosymbolstrip=BASS_FX_BPM_BeatSetParameters --nosymbolstrip=BASS_FX_BPM_CallbackReset --nosymbolstrip=BASS_FX_BPM_CallbackSet --nosymbolstrip=BASS_FX_BPM_DecodeGet --nosymbolstrip=BASS_FX_BPM_Free --nosymbolstrip=BASS_FX_BPM_Translate --nosymbolstrip=BASS_FX_GetVersion --nosymbolstrip=BASS_FX_ReverseCreate --nosymbolstrip=BASS_FX_ReverseGetSource --nosymbolstrip=BASS_FX_TempoCreate --nosymbolstrip=BASS_FX_TempoGetRateRatio --nosymbolstrip=BASS_FX_TempoGetSource --nosymbolstrip=BASS_Mixer_ChannelFlags --nosymbolstrip=BASS_Mixer_ChannelGetData --nosymbolstrip=BASS_Mixer_ChannelGetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelGetLevel --nosymbolstrip=BASS_Mixer_ChannelGetLevelEx --nosymbolstrip=BASS_Mixer_ChannelGetMatrix --nosymbolstrip=BASS_Mixer_ChannelGetMixer --nosymbolstrip=BASS_Mixer_ChannelGetPosition --nosymbolstrip=BASS_Mixer_ChannelGetPositionEx --nosymbolstrip=BASS_Mixer_ChannelIsActive --nosymbolstrip=BASS_Mixer_ChannelRemove --nosymbolstrip=BASS_Mixer_ChannelRemoveSync --nosymbolstrip=BASS_Mixer_ChannelSetEnvelope --nosymbolstrip=BASS_Mixer_ChannelSetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelSetMatrix --nosymbolstrip=BASS_Mixer_ChannelSetMatrixEx --nosymbolstrip=BASS_Mixer_ChannelSetPosition --nosymbolstrip=BASS_Mixer_ChannelSetSync --nosymbolstrip=BASS_Mixer_GetVersion --nosymbolstrip=BASS_Mixer_StreamAddChannel --nosymbolstrip=BASS_Mixer_StreamAddChannelEx --nosymbolstrip=BASS_Mixer_StreamCreate --nosymbolstrip=BASS_Mixer_StreamGetChannels --nosymbolstrip=BASS_Split_StreamCreate --nosymbolstrip=BASS_Split_StreamGetAvailable --nosymbolstrip=BASS_Split_StreamGetSource --nosymbolstrip=BASS_Split_StreamGetSplits --nosymbolstrip=BASS_Split_StreamReset --nosymbolstrip=BASS_Split_StreamResetEx - - --nolinkaway --nostrip $(GeneratedMtouchSymbolStripFlags) - - - true - full - false - DEBUG;ENABLE_TEST_CLOUD; - true - true - - - pdbonly - true - - - x86_64 - None + true - true - SdkOnly - ARM64 - Entitlements.plist + ios-arm64 - - true - 25823 - false + + iossimulator-x64 - - true - - - true - 28126 - - - - - - - - - - - - - + + + + @@ -78,23 +30,10 @@ - + - - - - <_ReferencePathToRemove - Include="@(ReferencePath)" - Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" /> - - - diff --git a/osu.Framework.iOS/GameUIApplication.cs b/osu.Framework.iOS/GameUIApplication.cs index 1de979a6c..ec2d60d0a 100644 --- a/osu.Framework.iOS/GameUIApplication.cs +++ b/osu.Framework.iOS/GameUIApplication.cs @@ -37,7 +37,7 @@ namespace osu.Framework.iOS { if (eventMem == null) return; - var eventPtr = (IntPtr*)eventMem.Handle.ToPointer(); + var eventPtr = (IntPtr*)eventMem.Handle.Handle.ToPointer(); int eventType = (int)eventPtr[gsevent_type]; int eventModifier = (int)eventPtr[gsevent_flags]; diff --git a/osu.Framework.iOS/osu.Framework.iOS.csproj b/osu.Framework.iOS/osu.Framework.iOS.csproj index ca5e41c60..5ad85642c 100644 --- a/osu.Framework.iOS/osu.Framework.iOS.csproj +++ b/osu.Framework.iOS/osu.Framework.iOS.csproj @@ -1,12 +1,12 @@ - + - xamarinios10 + net6.0-ios + 11.0 Library true osu!framework iOS osu.Framework.iOS osu.Framework.iOS - Resources A 2D application/game framework written with rhythm games in mind. @@ -14,18 +14,12 @@ ppy.osu.Framework.iOS osu game framework - - - - - - - + diff --git a/osu.Framework/RuntimeInfo.cs b/osu.Framework/RuntimeInfo.cs index ccf952179..a2ea846a5 100644 --- a/osu.Framework/RuntimeInfo.cs +++ b/osu.Framework/RuntimeInfo.cs @@ -55,7 +55,7 @@ namespace osu.Framework } private static bool detectAndroid() => AppDomain.CurrentDomain.GetAssemblies().Any(x => x.ToString().Contains("Mono.Android")); - private static bool detectIOS() => AppDomain.CurrentDomain.GetAssemblies().Any(x => x.ToString().Contains("Xamarin.iOS")); + private static bool detectIOS() => AppDomain.CurrentDomain.GetAssemblies().Any(x => x.ToString().Contains("Microsoft.iOS")); public enum Platform {