From f0c9253bec11ef0852b9d3daf96d7d2d0c4aeea9 Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Thu, 4 Sep 2025 21:42:35 +0200 Subject: [PATCH] [.NET] Require `net9.0` for Android exports To ensure Android exports are compatible with the new Play Store requirement that all `.so` libraries included are aligned to 16k, we now require C# projects to target `net9.0` which uses the correct alignment (as opposed to the current one of 4k). The thirdparty jar library has also been updated to the one from the 9.0.4 runtime package so it's compatible with non-gradle builds targeting `net9.0`. Non-android projects are not affect, the minimum TFM is still `net8.0`. --- .../ProjectGenerator.cs | 4 ++++ ...m.Security.Cryptography.Native.Android.jar | Bin 8552 -> 12999 bytes ...Cryptography.Native.Android.jar.source.txt | 1 + platform/android/export/export_plugin.cpp | 7 ++++--- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar.source.txt diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs index e969f31c8b..b4992d0bf4 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs @@ -26,6 +26,10 @@ namespace GodotTools.ProjectEditor var mainGroup = root.AddPropertyGroup(); mainGroup.AddProperty("TargetFramework", GodotMinimumRequiredTfm); + // Non-gradle builds require .NET 9 to match the jar libraries included in the export template. + var net9 = mainGroup.AddProperty("TargetFramework", "net9.0"); + net9.Condition = " '$(GodotTargetPlatform)' == 'android' "; + mainGroup.AddProperty("EnableDynamicLoading", "true"); string sanitizedName = IdentifierUtils.SanitizeQualifiedIdentifier(name, allowEmptyIdentifiers: true); diff --git a/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar b/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar index 736603088187993cf62014b17e619502133dc211..7dd662be19553489e94d4e051a81bb209413337c 100755 GIT binary patch literal 12999 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 XN{XRWMKFp58?p;XW_(W diff --git a/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar.source.txt b/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar.source.txt new file mode 100644 index 0000000000..188b63e09d --- /dev/null +++ b/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar.source.txt @@ -0,0 +1 @@ +https://www.nuget.org/packages/Microsoft.NETCore.App.Runtime.Mono.android-arm64/9.0.4 diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index f1a44f40ca..b7d2618c22 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2739,6 +2739,7 @@ bool _validate_dotnet_tfm(const String &required_tfm, String &r_error) { List args; args.push_back("build"); args.push_back(project_path); + args.push_back("/p:GodotTargetPlatform=android"); args.push_back("--getProperty:TargetFramework"); int exitcode; @@ -2778,9 +2779,9 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref