diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs index e969f31c8bc..b4992d0bf48 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 73660308818..7dd662be195 100755 Binary files a/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar and b/modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar differ 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 00000000000..188b63e09dd --- /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 f1a44f40cac..b7d2618c22f 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