From 28d0236bb05e90e3917fed771e135b4e01a95fb9 Mon Sep 17 00:00:00 2001 From: Senthil Date: Thu, 19 Nov 2015 16:45:54 -0800 Subject: [PATCH] Fix quotes in native CPP intermediate compilation Continuation of path quote fixes from: https://github.com/dotnet/cli/commit/96c62d2d25840ea00e676afa02643628d8354650 @livarcocc/@brthor, PTAL --- .../Windows/WindowsCppCompileStep.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs b/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs index 4ae034948..30fa68d13 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs +++ b/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs @@ -68,11 +68,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native argsList.Add("/c"); // Add Includes + var win7CppSdkPath = Path.Combine(config.AppDepSDKPath, "CPPSdk\\win7"); argsList.Add("/I"); - argsList.Add(Path.Combine(config.AppDepSDKPath, "CPPSdk\\win7")); + argsList.Add($"\"{win7CppSdkPath}\""); + var cppSdkPath = Path.Combine(config.AppDepSDKPath, "CPPSdk"); argsList.Add("/I"); - argsList.Add(Path.Combine(config.AppDepSDKPath, "CPPSdk")); + argsList.Add($"\"{cppSdkPath}\""); // Configuration Based Compiler Options argsList.Add(ConfigurationCompilerOptionsMap[config.BuildType]); @@ -83,7 +85,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native // Input File var inCppFile = DetermineInFile(config); - argsList.Add(inCppFile); + argsList.Add($"\"{inCppFile}\""); this.CompilerArgStr = string.Join(" ", argsList); } @@ -124,4 +126,4 @@ namespace Microsoft.DotNet.Tools.Compiler.Native } } -} \ No newline at end of file +}