Bring osu.Android to .NET 6 #17462

huoyaoyuan · 2022-03-26T15:02:43Z

Requires Compile osuTK.Android for net6.0 osuTK#75
Requires Bring Android framework to .NET 6 osu-framework#5080
Blocked by Mono crashes with SEGV_ACCERR for P/Invoke in android Debug dotnet/runtime#67140

Development requirement

Run dotnet workload install android to install the necessary SDK components (may require sudo).
Can be changed to dotnet workload restore once there's no old projects (Xamarin) remaining.
The default Android SDK version changed from 29 to 31.
Xamarin toolchain in Visual Studio should be still required. I haven't tested if the managed components can be compiled without Xamarin installed.

Known issue

Realm currently only works in Release configuration. A hard crash will happen in Debug configuration.

Compatibility check list

Audio, network and video all work fine together with framework side change.

Moq compatibility not tested.

Fastlane deployment not tested.

huoyaoyuan · 2022-03-26T17:19:41Z

The XA4301 warning is about picking linux assets for android from NativeLibs, since android is considered a child of linux. Should be resolved at framework side.

…Fody warnings now.

huoyaoyuan · 2022-04-03T14:58:18Z

The mono debugger issue can be workarounded by removing Xamarn.Essentials and reimplement it. There's no blocking issue I can find now.

osu.Android/OsuGameAndroid.cs

osu.Android/OsuGameActivity.cs

Co-authored-by: Susko3 <Susko3@protonmail.com>

osu.Android/OsuGameActivity.cs

bdach · 2022-04-10T19:12:09Z

Briefly tested this branch on my two devices, and got a pretty worrying exception stack trace on one of them:

2022-04-10 19:01:17 [error]: An unobserved error has occurred.
2022-04-10 19:01:17 [error]: System.AggregateException: TaskExceptionHolder_UnhandledException (net_http_ssl_connection_failed)
2022-04-10 19:01:17 [error]: ---> System.Net.Http.HttpRequestException: net_http_ssl_connection_failed
2022-04-10 19:01:17 [error]: ---> System.Security.Authentication.AuthenticationException: net_auth_SSPI
2022-04-10 19:01:17 [error]: ---> Interop+AndroidCrypto+SslException: Exception_WasThrown, Interop+AndroidCrypto+SslException
2022-04-10 19:01:17 [error]: Exception_EndOfInnerExceptionStack
2022-04-10 19:01:17 [error]: at System.Net.Security.SslStream.<ForceAuthenticationAsync>d__173`1[[System.Net.Security.AsyncReadWriteAdapter, System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].MoveNext()
2022-04-10 19:01:17 [error]: at System.Net.Http.ConnectHelper.EstablishSslConnectionAsync(SslClientAuthenticationOptions , HttpRequestMessage , Boolean , Stream , CancellationToken )
2022-04-10 19:01:17 [error]: Exception_EndOfInnerExceptionStack
2022-04-10 19:01:17 [error]: at System.Net.Http.ConnectHelper.EstablishSslConnectionAsync(SslClientAuthenticationOptions , HttpRequestMessage , Boolean , Stream , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpConnectionPool.ConnectAsync(HttpRequestMessage , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpConnectionPool.CreateHttp11ConnectionAsync(HttpRequestMessage , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpConnectionPool.AddHttp11ConnectionAsync(HttpRequestMessage )
2022-04-10 19:01:17 [error]: at System.Threading.Tasks.TaskCompletionSourceWithCancellation`1.<WaitWithCancellationAsync>d__1[[System.Net.Http.HttpConnection, System.Net.Http, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].MoveNext()
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpConnectionPool.GetHttp11ConnectionAsync(HttpRequestMessage , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpConnectionPool.SendWithVersionDetectionAndRetryAsync(HttpRequestMessage , Boolean , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.RedirectHandler.SendAsync(HttpRequestMessage , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.DecompressionHandler.SendAsync(HttpRequestMessage , Boolean , CancellationToken )
2022-04-10 19:01:17 [error]: at System.Net.Http.HttpClient.<SendAsync>g__Core|83_0(HttpRequestMessage , HttpCompletionOption , CancellationTokenSource , Boolean , CancellationTokenSource , CancellationToken )
2022-04-10 19:01:17 [error]: at osu.Framework.IO.Network.WebRequest.Complete(Exception e)
2022-04-10 19:01:17 [error]: at osu.Framework.IO.Network.WebRequest.internalPerform(CancellationToken cancellationToken)
2022-04-10 19:01:17 [error]: at osu.Framework.IO.Network.WebRequest.PerformAsync(CancellationToken cancellationToken)
2022-04-10 19:01:17 [error]: at osu.Framework.Extensions.ExceptionExtensions.ExceptionExtensions.Rethrow(Exception exception)
2022-04-10 19:01:17 [error]: at osu.Framework.Extensions.ExceptionExtensions.ExceptionExtensions.RethrowAsSingular(AggregateException aggregateException)
2022-04-10 19:01:17 [error]: at osu.Framework.IO.Network.WebRequest.Perform()
2022-04-10 19:01:17 [error]: at osu.Game.Online.API.APIRequest.Perform(IAPIProvider api)
2022-04-10 19:01:17 [error]: at osu.Game.Online.API.APIAccess.Perform(APIRequest request)
2022-04-10 19:01:17 [error]: Exception_EndOfInnerExceptionStack

As you could guess, the above causes everything online to not work. I've checked and this does not happen on the latest release.

Device in question is a Samsung device, API 24. #17499 possibly related?

huoyaoyuan · 2022-04-11T04:21:27Z

Did you test if it reproduces on that device with old xamarin? If so, I think it could not block this PR as it's not a new issue.

You may change NET6_0 to use HttpClientHandler here to see if there's difference.

I haven't found a way to disable LLVM, and the issue may potentially be resolved (doesn't occur for me), so we might as well just remove the key for now.

…o net6.0

peppy · 2022-12-17T02:08:25Z

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {


Not sure we want this? @smoogipoo

Theoretically, there are environments that can compile net6.0 but have unfixed issues in the SDK.
If we introduce net7.0 in any project, I think it can serve as a soft requirement for SDK version.

@smoogipoo can you make a call on this one? from our brief discussion last week i think you'd want to see this removed?

I think I would prefer this being removed, since it's one of those things that silently changes compilation in the background that isn't easily noticeable via any tooling. That being said, it is not a strong preference.

peppy · 2022-12-17T02:11:52Z

osu.Android/osu.Android.csproj

-    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
-    <EnableLLVM>false</EnableLLVM> <!-- This currently causes random lockups during gameplay. https://github.com/mono/mono/issues/18973 -->
+
+    <!-- This currently causes random lockups during gameplay. https://github.com/mono/mono/issues/18973 -->


I wonder if this is still relevant

Testing with the same reproduction steps in the issue thread, I can't reproduce this at all with LLVM enabled (assuming it's enabled by default given that clang is used during building).

I think it's probably not, but we can test this in a separated PR.

As long as it isn't forgotten.

frenzibyte

Other than what's mentioned above, this looks pretty sane to me and matches iOS (minus the workarounds).

peppy · 2022-12-19T06:45:35Z

Have removed for now. Have also tested this branch deploying to device and all seems good. I'll cherry-pick the changes across to the framework update branch in their current state.

huoyaoyuan added 4 commits March 26, 2022 22:05

Convert osu.Android to .NET 6

f1738a0

Convert all Android projects and move shared properties.

140664a

Add dotnet workload command in CI

55663ce

Restore workload in GitHub action

3eb12f2

pull-request-size bot added the size/L label Mar 26, 2022

Use dotnet build to compile for android

c8a7edb

bdach added blocked Don't merge this. area:tooling platform/android labels Mar 26, 2022

huoyaoyuan added 4 commits March 27, 2022 02:30

Fix typos in ci.yml

f6519c2

Remove warningaserror for Android. It's not clear how to resolve the …

985ec18

…Fody warnings now.

Move Android manifest to new default location.

4086214

Rewrite code from Xamarin.Essentials

f2eb2ec

huoyaoyuan marked this pull request as ready for review April 3, 2022 14:58

huoyaoyuan added 6 commits April 3, 2022 23:18

Prefer OperatingSystem.IsAndroidVersionAtLeast over Build.VERSION.SdkInt

dbd1e57

Handle ruleset assembly loading

e9a7f8a

Add missing EmbeddedResource to android tests

6ffc173

Also load ruleset assemblies for Android test

5cedefa

Handle sqlite load failure

be64cbf

Resolve Fody warnings.

7ff7ea6

pull-request-size bot added size/XL and removed size/L labels Apr 6, 2022

Susko3 suggested changes Apr 7, 2022

View reviewed changes

osu.Android/OsuGameAndroid.cs Outdated Show resolved Hide resolved

osu.Android/OsuGameActivity.cs Outdated Show resolved Hide resolved

huoyaoyuan and others added 2 commits April 8, 2022 14:32

Commit suggestion from code review

85ad9c1

Co-authored-by: Susko3 <Susko3@protonmail.com>

Update AndroidBatteryInfo per code review

6600ef8

Susko3 suggested changes Apr 9, 2022

View reviewed changes

osu.Android/OsuGameActivity.cs Show resolved Hide resolved

frenzibyte and others added 14 commits December 16, 2022 00:22

Remove MtouchUseLlvm key for now

b488421

I haven't found a way to disable LLVM, and the issue may potentially be resolved (doesn't occur for me), so we might as well just remove the key for now.

Remove transitive dependencies

d791bc5

Update workflows in line with framework changes

2c78fed

Suppress MT7091

67787da

Merge branch 'net6-ios' into guard-url-protocols

ce408ea

Update framework

e63b544

Update netstandard2.1 references to net6.0

d6cae99

Fix the MOTHERLOAD of undetected issues that are now visible thanks t…

27c4971

…o net6.0

Merge branch 'master' into guard-url-protocols

ba54551

Fix incorrect ConfigureAwait call in ImportAsUpdate

de079e0

Fix assembly location lookups

dd9a418

Fix some more inspections

1925366

Pin workflow to macOS 12

d74478c

Manually use Xcode 14.1

4dbc1c3

peppy reviewed Dec 17, 2022

View reviewed changes

Replace Xamarin.Essentials with .NET MAUI Essentials

04ecfaa

frenzibyte reviewed Dec 17, 2022

View reviewed changes

peppy added 2 commits December 19, 2022 14:28

Merge branch 'master' into net6.0-android

d839426

Merge branch 'guard-url-protocols' into net6.0-android

e35635f

pull-request-size bot added size/XXL and removed size/L labels Dec 19, 2022

peppy added 3 commits December 19, 2022 14:54

Fix deploys to devices that don't support fast deploy

e50b293

Remove rollForward rule for now

8d512be

Merge branch 'master' into net6.0-android

03cec4b

peppy added a commit to peppy/osu that referenced this pull request Dec 19, 2022

Cherry-picked android changes from ppy#17462

8774135

peppy mentioned this pull request Dec 19, 2022

Update framework #21629

Merged

smoogipoo closed this in #21629 Dec 19, 2022

huoyaoyuan deleted the net6.0-android branch December 19, 2022 14:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring osu.Android to .NET 6 #17462

Bring osu.Android to .NET 6 #17462

huoyaoyuan commented Mar 26, 2022 •

edited by bdach

Loading

huoyaoyuan commented Mar 26, 2022

huoyaoyuan commented Apr 3, 2022

bdach commented Apr 10, 2022

huoyaoyuan commented Apr 11, 2022 •

edited

Loading

peppy Dec 17, 2022

huoyaoyuan Dec 17, 2022

peppy Dec 19, 2022

smoogipoo Dec 19, 2022 •

edited

Loading

peppy Dec 17, 2022

frenzibyte Dec 17, 2022 •

edited

Loading

huoyaoyuan Dec 17, 2022

peppy Dec 19, 2022

frenzibyte left a comment

peppy commented Dec 19, 2022

Bring osu.Android to .NET 6 #17462

Bring osu.Android to .NET 6 #17462

Conversation

huoyaoyuan commented Mar 26, 2022 • edited by bdach Loading

Development requirement

Known issue

Compatibility check list

huoyaoyuan commented Mar 26, 2022

huoyaoyuan commented Apr 3, 2022

bdach commented Apr 10, 2022

huoyaoyuan commented Apr 11, 2022 • edited Loading

peppy Dec 17, 2022

Choose a reason for hiding this comment

huoyaoyuan Dec 17, 2022

Choose a reason for hiding this comment

peppy Dec 19, 2022

Choose a reason for hiding this comment

smoogipoo Dec 19, 2022 • edited Loading

Choose a reason for hiding this comment

peppy Dec 17, 2022

Choose a reason for hiding this comment

frenzibyte Dec 17, 2022 • edited Loading

Choose a reason for hiding this comment

huoyaoyuan Dec 17, 2022

Choose a reason for hiding this comment

peppy Dec 19, 2022

Choose a reason for hiding this comment

frenzibyte left a comment

Choose a reason for hiding this comment

peppy commented Dec 19, 2022

huoyaoyuan commented Mar 26, 2022 •

edited by bdach

Loading

huoyaoyuan commented Apr 11, 2022 •

edited

Loading

smoogipoo Dec 19, 2022 •

edited

Loading

frenzibyte Dec 17, 2022 •

edited

Loading