mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix quotes around path containing spaces

Browse source
This commit is contained in:
schellap 2015-11-19 16:06:58 -08:00
parent 0b3ea258e7
commit 96c62d2d25
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Microsoft.DotNet.Tools.Compiler.Native/ILCompilerInvoker.cs
View file

@ -42,11 +42,11 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
var argsList = new List<string>(); var argsList = new List<string>();
var managedPath = Path.Combine(config.IlcPath, ILCompiler); var managedPath = Path.Combine(config.IlcPath, ILCompiler);
argsList.Add(managedPath); argsList.Add($"\"{managedPath}\"");
// Input File // Input File
var inputFilePath = config.InputManagedAssemblyPath; var inputFilePath = config.InputManagedAssemblyPath;
argsList.Add(inputFilePath); argsList.Add($"\"{inputFilePath}\"");
// System.Private.CoreLib Reference // System.Private.CoreLib Reference
var coreLibPath = Path.Combine(config.IlcPath, OSCoreLibNameMap[config.OS]); var coreLibPath = Path.Combine(config.IlcPath, OSCoreLibNameMap[config.OS]);
@ -103,4 +103,4 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
} }
} }

8
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs
View file

@ -102,14 +102,15 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
var SDKLibs = ModeLibMap[config.NativeMode]; var SDKLibs = ModeLibMap[config.NativeMode];
foreach (var lib in SDKLibs) foreach (var lib in SDKLibs)
{ {
argsList.Add(Path.Combine(config.IlcPath, lib)); var sdkLibPath = Path.Combine(config.IlcPath, lib);
argsList.Add($"\"{sdkLibPath}\"");
} }
// Configuration Based Libs // Configuration Based Libs
var configLibs = ConfigurationLinkLibMap[config.BuildType]; var configLibs = ConfigurationLinkLibMap[config.BuildType];
foreach (var lib in configLibs) foreach (var lib in configLibs)
{ {
argsList.Add(lib); argsList.Add($"\"{lib}\"");
} }
// Link Libs // Link Libs
@ -136,7 +137,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
.ForwardStdErr() .ForwardStdErr()
.ForwardStdOut() .ForwardStdOut()
.Execute(); .Execute();
return result.ExitCode; return result.ExitCode;
} }
@ -163,4 +163,4 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
} }
} }