Quoted shader file paths and fixed Vulkan task name (MonoGame#8969)

arosolino · web-flow · commit d3c5a232271d · 2025-08-26T09:04:29.000+02:00
Fixes MonoGame#8968 ### Description of Change - Escaping the file path passed to mgfxc - Fixed a small typo with Vulkan
diff --git a/build/BuildShaders/BuildShadersDX11Task.cs b/build/BuildShaders/BuildShadersDX11Task.cs
@@ -15,7 +15,7 @@ public override void Run(BuildContext context)
         foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))
         {
             context.Information($"Building {filePath.GetFilename()}");
-            context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.dx11.mgfxo /Profile:DirectX_11", shadersDir);
+            context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.dx11.mgfxo /Profile:DirectX_11", shadersDir);
             context.Information("");
         }
     }
diff --git a/build/BuildShaders/BuildShadersDX12Task.cs b/build/BuildShaders/BuildShadersDX12Task.cs
@@ -17,7 +17,7 @@ public override void Run(BuildContext context)
         foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))
         {
             context.Information($"Building {filePath.GetFilename()}");
-            context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.dx12.mgfxo /Profile:DirectX_12", workingDir);
+            context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.dx12.mgfxo /Profile:DirectX_12", workingDir);
             context.Information("");
         }
 
diff --git a/build/BuildShaders/BuildShadersOGLTask.cs b/build/BuildShaders/BuildShadersOGLTask.cs
@@ -13,7 +13,7 @@ public override void Run(BuildContext context)
         foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))
         {
             context.Information($"Building {filePath.GetFilename()}");
-            context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.ogl.mgfxo", shadersDir);
+            context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.ogl.mgfxo", shadersDir);
             context.Information("");
         }
     }
diff --git a/build/BuildShaders/BuildShadersVulkanTask.cs b/build/BuildShaders/BuildShadersVulkanTask.cs
@@ -1,7 +1,7 @@
 
 namespace BuildScripts;
 
-[TaskName("Build Vulklan Shaders")]
+[TaskName("Build Vulkan Shaders")]
 [IsDependentOn(typeof(BuildMGFXCTask))]
 public sealed class BuildShadersVulkanTask : FrostingTask<BuildContext>
 {
@@ -14,7 +14,7 @@ public override void Run(BuildContext context)
         foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))
             {
                 context.Information($"Building {filePath.GetFilename()}");
-                context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.vk.mgfxo /Profile:Vulkan", workingDir);
+                context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.vk.mgfxo /Profile:Vulkan", workingDir);
                 context.Information("");
             }
     }
diff --git a/scripts/build_shaders_vulkan.ps1 b/scripts/build_shaders_vulkan.ps1
@@ -1,2 +1,2 @@
-dotnet run --project "$PSScriptRoot/../build/Build.csproj" -- --target="Build Vulklan Shaders"
-exit $LASTEXITCODE;
+dotnet run --project "$PSScriptRoot/../build/Build.csproj" -- --target="Build Vulkan Shaders"
+exit $LASTEXITCODE;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public override void Run(BuildContext context)`
`15`	`15`	`foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))`
`16`	`16`	`{`
`17`	`17`	`context.Information($"Building {filePath.GetFilename()}");`
`18`		`- context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.dx11.mgfxo /Profile:DirectX_11", shadersDir);`
	`18`	`+ context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.dx11.mgfxo /Profile:DirectX_11", shadersDir);`
`19`	`19`	`context.Information("");`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public override void Run(BuildContext context)`
`17`	`17`	`foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))`
`18`	`18`	`{`
`19`	`19`	`context.Information($"Building {filePath.GetFilename()}");`
`20`		`- context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.dx12.mgfxo /Profile:DirectX_12", workingDir);`
	`20`	`+ context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.dx12.mgfxo /Profile:DirectX_12", workingDir);`
`21`	`21`	`context.Information("");`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public override void Run(BuildContext context)`
`13`	`13`	`foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))`
`14`	`14`	`{`
`15`	`15`	`context.Information($"Building {filePath.GetFilename()}");`
`16`		`- context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.ogl.mgfxo", shadersDir);`
	`16`	`+ context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.ogl.mgfxo", shadersDir);`
`17`	`17`	`context.Information("");`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`namespace BuildScripts;`
`3`	`3`
`4`		`-[TaskName("Build Vulklan Shaders")]`
	`4`	`+[TaskName("Build Vulkan Shaders")]`
`5`	`5`	`[IsDependentOn(typeof(BuildMGFXCTask))]`
`6`	`6`	`public sealed class BuildShadersVulkanTask : FrostingTask<BuildContext>`
`7`	`7`	`{`
`@@ -14,7 +14,7 @@ public override void Run(BuildContext context)`
`14`	`14`	`foreach (var filePath in context.GetFiles($"{shadersDir}/*.fx"))`
`15`	`15`	`{`
`16`	`16`	`context.Information($"Building {filePath.GetFilename()}");`
`17`		`- context.DotNetRun(mgfxc, $"{filePath} {filePath.GetFilenameWithoutExtension()}.vk.mgfxo /Profile:Vulkan", workingDir);`
	`17`	`+ context.DotNetRun(mgfxc, $"\"{filePath}\" {filePath.GetFilenameWithoutExtension()}.vk.mgfxo /Profile:Vulkan", workingDir);`
`18`	`18`	`context.Information("");`
`19`	`19`	`}`
`20`	`20`	`}`