From 25f10b3c406761b0bb88bf70da1ba2d8f5335fbd Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry
Date: Tue, 5 Jun 2018 22:18:43 +0200
Subject: Mono: Fix passing wrong logger assembly path to MSBuild - Add option
 to print MSBuild's stdout and stderr instead of redirecting it. This can be
 enabled by setting the environment variable: Godot_DEBUG_MSBUILD=1

---
 modules/mono/editor/godotsharp_builds.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/mono/editor/godotsharp_builds.cpp')

diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp
index e29384aab..3adfc62d7 100644
--- a/modules/mono/editor/godotsharp_builds.cpp
+++ b/modules/mono/editor/godotsharp_builds.cpp
@@ -527,8 +527,9 @@ void GodotSharpBuilds::BuildProcess::start(bool p_blocking) {
 
 	// Call Build
 
-	Variant logger_assembly = OS::get_singleton()->get_executable_path().get_base_dir().plus_file(EDITOR_TOOLS_ASSEMBLY_NAME) + ".dll";
-	Variant logger_output_dir = logs_dir;
+	String logger_assembly_path = GDMono::get_singleton()->get_editor_tools_assembly()->get_path();
+	Variant logger_assembly = ProjectSettings::get_singleton()->globalize_path(logger_assembly_path);
+	Variant logger_output_dir = log_dirpath;
 	Variant custom_props = build_info.custom_props;
 
 	const Variant *args[3] = { &logger_assembly, &logger_output_dir, &custom_props };
-- 
cgit v1.2.3-70-g09d2