prioritize packaged assemblies in tools_enabled binaries

--tools_assemblies should only be set if tools_enabled

-- setting packaged_assemblies_dir when ANDROID_ENABLED

use tools assemblies if TOOLS_ENABLED

Author: the-bham

modules/mono/csharp_script.cpp

@@ -612,7 +612,7 @@ bool CSharpLanguage::is_assembly_reloading_needed() {
 	} else {
 		String assembly_name = Path::get_csharp_project_name();
 
-		assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir()
+		assembly_path = GodotSharpDirs::get_res_assemblies_dir()
 								.path_join(assembly_name + ".dll");
 		assembly_path = ProjectSettings::get_singleton()->globalize_path(assembly_path);
 

modules/mono/godotsharp_dirs.cpp

@@ -91,7 +91,6 @@ String _get_mono_user_dir() {
 #endif
 }
 
-#if !TOOLS_ENABLED
 // This should be the equivalent of GodotTools.Utils.OS.PlatformNameMap.
 static const char *platform_name_map[][2] = {
 	{ "Windows", "windows" },
@@ -119,14 +118,15 @@ String _get_platform_name() {
 
 	return "";
 }
-#endif
 
 class _GodotSharpDirs {
 public:
 	String res_metadata_dir;
 	String res_temp_assemblies_dir;
+	String packaged_assemblies_dir;
 	String mono_user_dir;
 	String api_assemblies_dir;
+	String tools_assemblies_dir;
 
 #ifdef TOOLS_ENABLED
 	String build_logs_dir;
@@ -151,9 +151,9 @@ class _GodotSharpDirs {
 		String res_dir = OS::get_singleton()->get_bundle_resource_dir();
 
 #ifdef TOOLS_ENABLED
-		String data_dir_root = exe_dir.path_join("GodotSharp");
-		data_editor_tools_dir = data_dir_root.path_join("Tools");
-		String api_assemblies_base_dir = data_dir_root.path_join("Api");
+		String engine_data_dir_root = exe_dir.path_join("GodotSharp");
+		data_editor_tools_dir = engine_data_dir_root.path_join("Tools");
+		String api_assemblies_base_dir = engine_data_dir_root.path_join("Api");
 		build_logs_dir = mono_user_dir.path_join("build_logs");
 #ifdef MACOS_ENABLED
 		if (!DirAccess::exists(data_editor_tools_dir)) {
@@ -164,15 +164,21 @@ class _GodotSharpDirs {
 		}
 #endif
 		api_assemblies_dir = api_assemblies_base_dir.path_join(GDMono::get_expected_api_build_config());
-#else // TOOLS_ENABLED
+		tools_assemblies_dir = api_assemblies_base_dir.path_join(GDMono::get_expected_api_build_config());
+#endif //TOOLS_ENABLED
+
 		String platform = _get_platform_name();
 		String arch = Engine::get_singleton()->get_architecture_name();
 		String appname_safe = Path::get_csharp_project_name();
 		String packed_path = "res://.godot/mono/publish/" + arch;
 #ifdef ANDROID_ENABLED
 		api_assemblies_dir = packed_path;
+		packaged_assemblies_dir = packed_path;
 		print_verbose(".NET: Android platform detected. Setting api_assemblies_dir directly to pck path: " + api_assemblies_dir);
-#else
+#else // ANDROID_ENABLED
+
+		packaged_assemblies_dir = ProjectSettings::get_singleton()->globalize_path("res://data_" + appname_safe + "_" + platform + "_" + arch);
+
 		if (DirAccess::exists(packed_path)) {
 			// The dotnet publish data is packed in the pck/zip.
 			String data_dir_root = OS::get_singleton()->get_cache_path().path_join("data_" + appname_safe + "_" + platform + "_" + arch);
@@ -218,7 +224,6 @@ class _GodotSharpDirs {
 #endif
 			api_assemblies_dir = data_dir_root;
 		}
-#endif // ANDROID_ENABLED
 #endif
 	}
 
@@ -233,8 +238,18 @@ String get_res_metadata_dir() {
 	return _GodotSharpDirs::get_singleton().res_metadata_dir;
 }
 
-String get_res_temp_assemblies_dir() {
-	return _GodotSharpDirs::get_singleton().res_temp_assemblies_dir;
+String get_res_assemblies_dir() {
+	if (!DirAccess::exists(_GodotSharpDirs::get_singleton().packaged_assemblies_dir)) {
+		print_verbose(".NET : using engine temporary assemblies");
+		return _GodotSharpDirs::get_singleton().res_temp_assemblies_dir;
+	} else {
+		print_verbose(".NET : using packaged data assemblies");
+		return _GodotSharpDirs::get_singleton().packaged_assemblies_dir;
+	}
+}
+
+String get_tools_assemblies_dir() {
+	return _GodotSharpDirs::get_singleton().tools_assemblies_dir;
 }
 
 String get_api_assemblies_dir() {

modules/mono/godotsharp_dirs.h

@@ -35,9 +35,10 @@
 namespace GodotSharpDirs {
 
 String get_res_metadata_dir();
-String get_res_temp_assemblies_dir();
+String get_res_assemblies_dir();
 
 String get_api_assemblies_dir();
+String get_tools_assemblies_dir();
 
 String get_mono_user_dir();
 

modules/mono/mono_gd/gd_mono.cpp

@@ -430,10 +430,10 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime
 	godot_plugins_initialize_fn godot_plugins_initialize = nullptr;
 
 	HostFxrCharString godot_plugins_path = str_to_hostfxr(
-			GodotSharpDirs::get_api_assemblies_dir().path_join("GodotPlugins.dll"));
+			GodotSharpDirs::get_tools_assemblies_dir().path_join("GodotPlugins.dll"));
 
 	HostFxrCharString config_path = str_to_hostfxr(
-			GodotSharpDirs::get_api_assemblies_dir().path_join("GodotPlugins.runtimeconfig.json"));
+			GodotSharpDirs::get_tools_assemblies_dir().path_join("GodotPlugins.runtimeconfig.json"));
 
 	load_assembly_and_get_function_pointer_fn load_assembly_and_get_function_pointer =
 			initialize_hostfxr_for_config(get_data(config_path));
@@ -642,7 +642,7 @@ void GDMono::initialize() {
 
 #if !defined(APPLE_EMBEDDED_ENABLED)
 	// Check that the .NET assemblies directory exists before trying to use it.
-	if (!DirAccess::exists(GodotSharpDirs::get_api_assemblies_dir())) {
+	if (!DirAccess::exists(GodotSharpDirs::get_api_assemblies_dir()) && !DirAccess::exists(GodotSharpDirs::get_tools_assemblies_dir())) {
 		OS::get_singleton()->alert(vformat(RTR("Unable to find the .NET assemblies directory.\nMake sure the '%s' directory exists and contains the .NET assemblies."), GodotSharpDirs::get_api_assemblies_dir()), RTR(".NET assemblies not found"));
 		ERR_FAIL_MSG(".NET: Assemblies not found");
 	}
@@ -745,7 +745,7 @@ void GDMono::_init_godot_api_hashes() {
 bool GDMono::_load_project_assembly() {
 	String assembly_name = Path::get_csharp_project_name();
 
-	String assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir()
+	String assembly_path = GodotSharpDirs::get_res_assemblies_dir()
 								   .path_join(assembly_name + ".dll");
 	assembly_path = ProjectSettings::get_singleton()->globalize_path(assembly_path);
 
@@ -775,7 +775,7 @@ void GDMono::reload_failure() {
 		ERR_PRINT_ED(".NET: Giving up on assembly reloading. Please restart the editor if unloading was failing.");
 
 		String assembly_name = Path::get_csharp_project_name();
-		String assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir().path_join(assembly_name + ".dll");
+		String assembly_path = GodotSharpDirs::get_res_assemblies_dir().path_join(assembly_name + ".dll");
 		assembly_path = ProjectSettings::get_singleton()->globalize_path(assembly_path);
 		project_assembly_path = assembly_path.simplify_path();
 		project_assembly_modified_time = FileAccess::get_modified_time(assembly_path);