Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #94680 from bruvzg/fix_net_detection

Browse Source 
Replace .NET detection code with `ClassDB::class_exists("CSharpScript")`.
This commit is contained in:
Rémi Verschelde 2024-07-24 09:59:42 +02:00
commit 25e5efaf9e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config/project_settings.cpp
View File

@ -1491,7 +1491,7 @@ ProjectSettings::ProjectSettings() {
PackedStringArray extensions;
extensions.push_back("gd");
if (Engine::get_singleton()->has_singleton("GodotSharp")) {
if (ClassDB::class_exists("CSharpScript")) {
extensions.push_back("cs");
}
extensions.push_back("gdshader");

2
editor/editor_asset_installer.cpp
View File

@ -632,7 +632,7 @@ void EditorAssetInstaller::_notification(int p_what) {
extension_icon_map["gdshader"] = get_editor_theme_icon(SNAME("Shader"));
extension_icon_map["gdshaderinc"] = get_editor_theme_icon(SNAME("TextFile"));
extension_icon_map["gd"] = get_editor_theme_icon(SNAME("GDScript"));
if (Engine::get_singleton()->has_singleton("GodotSharp")) {
if (ClassDB::class_exists("CSharpScript")) {
extension_icon_map["cs"] = get_editor_theme_icon(SNAME("CSharpScript"));
} else {
// Mark C# support as unavailable.

6
platform/macos/export/export_plugin.cpp
View File

@ -141,7 +141,7 @@ String EditorExportPlatformMacOS::get_export_option_warning(const EditorExportPr
if (p_name == "codesign/codesign") {
if (dist_type == 2) {
if (codesign_tool == 2 && Engine::get_singleton()->has_singleton("GodotSharp")) {
if (codesign_tool == 2 && ClassDB::class_exists("CSharpScript")) {
return TTR("'rcodesign' doesn't support signing applications with embedded dynamic libraries (GDExtension or .NET).");
}
if (codesign_tool == 0) {
@ -333,7 +333,7 @@ bool EditorExportPlatformMacOS::get_export_option_visibility(const EditorExportP
}
// These entitlements are required to run managed code, and are always enabled in Mono builds.
if (Engine::get_singleton()->has_singleton("GodotSharp")) {
if (ClassDB::class_exists("CSharpScript")) {
if (p_option == "codesign/entitlements/allow_jit_code_execution" || p_option == "codesign/entitlements/allow_unsigned_executable_memory" || p_option == "codesign/entitlements/allow_dyld_environment_variables") {
return false;
}
@ -1979,7 +1979,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
ent_f->store_line("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
ent_f->store_line("<plist version=\"1.0\">");
ent_f->store_line("<dict>");
if (Engine::get_singleton()->has_singleton("GodotSharp")) {
if (ClassDB::class_exists("CSharpScript")) {
// These entitlements are required to run managed code, and are always enabled in Mono builds.
ent_f->store_line("<key>com.apple.security.cs.allow-jit</key>");
ent_f->store_line("<true/>");