From d614232f8d556947e37ce4ba799f2e48b6255e09 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sat, 16 Dec 2023 14:45:28 +0200
Subject: [PATCH] Fix VS build issues with C# projects when engine path has
 spaces

---
 .../VisualStudioProjectGenerator.cs           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
index b04531d9f..5cc1b2205 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
@@ -702,7 +702,7 @@ namespace Flax.Build.Projects.VisualStudio
             // Override MSBuild build tasks to run Flax.Build in C#-only projects
             {
                 // Build command for the build tool
-                var buildToolPath = Path.ChangeExtension(Utilities.MakePathRelativeTo(typeof(Builder).Assembly.Location, Path.GetDirectoryName(solution.MainProject.Path)), null);
+                var buildToolPath = Path.ChangeExtension(typeof(Builder).Assembly.Location, null);
                 
                 var targetsFileContent = new StringBuilder();
                 targetsFileContent.AppendLine("<Project>");
@@ -724,16 +724,16 @@ namespace Flax.Build.Projects.VisualStudio
                 {
                     foreach (var configuration in solution.MainProject.Configurations)
                     {
-                        var cmdLine = string.Format("{0} -log -mutex -workspace={1} -arch={2} -configuration={3} -platform={4} -buildTargets={5}",
-                                                FixPath(buildToolPath),
-                                                FixPath(solution.MainProject.WorkspaceRootPath),
+                        var cmdLine = string.Format("\"{0}\" -log -mutex -workspace=\"{1}\" -arch={2} -configuration={3} -platform={4} -buildTargets={5}",
+                                                buildToolPath,
+                                                solution.MainProject.WorkspaceRootPath,
                                                 configuration.Architecture,
                                                 configuration.Configuration,
                                                 configuration.Platform,
                                                 configuration.Target);
                         Configuration.PassArgs(ref cmdLine);
 
-                        str.AppendLine(string.Format("    <Exec Command=\"{0} {1}\" Condition=\"'$(Configuration)|$(Platform)'=='{2}'\"/>", cmdLine, extraArgs, configuration.Name));
+                        str.AppendLine(string.Format("    <Exec Command='{0} {1}' Condition=\"'$(Configuration)|$(Platform)'=='{2}'\"/>", cmdLine, extraArgs, configuration.Name));
                     }
                 }
             }
@@ -774,14 +774,5 @@ namespace Flax.Build.Projects.VisualStudio
                 projects.Add(project);
             }
         }
-
-        private static string FixPath(string path)
-        {
-            if (path.Contains(' '))
-            {
-                path = "\"" + path + "\"";
-            }
-            return path;
-        }
     }
 }