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

PR comments

Browse source
This commit is contained in:
Andy Gocke 2015-11-04 12:04:51 -08:00
parent a60a030bca
commit da8f254cb4
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
View file

@ -62,14 +62,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
if (outputName != null) if (outputName != null)
{ {
allArgs.Add($"-out:{outputName}"); allArgs.Add($"-out:\"{outputName}\"");
} }
allArgs.AddRange(references.Select(r => $"-r:{r}")); allArgs.AddRange(references.Select(r => $"-r:\"{r}\""));
allArgs.AddRange(resources.Select(resource => $"-resource:{resource}")); allArgs.AddRange(resources.Select(resource => $"-resource:{resource}"));
allArgs.AddRange(sources); allArgs.AddRange(sources.Select(s => $"\"{s}\""));
var rsp = Path.Combine(tempOutDir.Trim('"'), "dotnet-compile-csc.rsp"); var rsp = Path.Combine(tempOutDir, "dotnet-compile-csc.rsp");
File.WriteAllLines(rsp, allArgs, Encoding.UTF8); File.WriteAllLines(rsp, allArgs, Encoding.UTF8);

2
src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
View file

@ -7,7 +7,6 @@
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502", "Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.CommandLine": "0.1.0-*",
"System.Console": "4.0.0-beta-23502", "System.Console": "4.0.0-beta-23502",
"System.Collections": "4.0.11-beta-23502", "System.Collections": "4.0.11-beta-23502",
"System.Linq": "4.0.1-beta-23502", "System.Linq": "4.0.1-beta-23502",
@ -22,7 +21,6 @@
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Net.Compilers.netcore": "1.1.0-*" "Microsoft.Net.Compilers.netcore": "1.1.0-*"
}, },

12
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -173,8 +173,8 @@ namespace Microsoft.DotNet.Tools.Compiler
// Assemble args // Assemble args
var compilerArgs = new List<string>() var compilerArgs = new List<string>()
{ {
$"--temp-output:\"{intermediateOutputPath}\"", $"--temp-output:{intermediateOutputPath}",
$"--out:\"{outputName}\"" $"--out:{outputName}"
}; };
var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, configuration); var compilationOptions = context.ProjectFile.GetCompilerOptions(context.TargetFramework, configuration);
@ -190,19 +190,19 @@ namespace Microsoft.DotNet.Tools.Compiler
if (projectDependency.Project.Files.SourceFiles.Any()) if (projectDependency.Project.Files.SourceFiles.Any())
{ {
var projectOutputPath = GetProjectOutput(projectDependency.Project, projectDependency.Framework, configuration, outputPath); var projectOutputPath = GetProjectOutput(projectDependency.Project, projectDependency.Framework, configuration, outputPath);
compilerArgs.Add($"-r:\"{projectOutputPath}\""); compilerArgs.Add($"-r:{projectOutputPath}");
} }
} }
else else
{ {
compilerArgs.AddRange(dependency.CompilationAssemblies.Select(r => $"-r:\"{r.ResolvedPath}\"")); compilerArgs.AddRange(dependency.CompilationAssemblies.Select(r => $"-r:{r.ResolvedPath}"));
} }
compilerArgs.AddRange(dependency.SourceReferences.Select(s => $"\"{s}\"")); compilerArgs.AddRange(dependency.SourceReferences);
} }
// Add project source files // Add project source files
var sourceFiles = context.ProjectFile.Files.SourceFiles; var sourceFiles = context.ProjectFile.Files.SourceFiles;
compilerArgs.AddRange(sourceFiles.Select(s => $"\"{s}\"")); compilerArgs.AddRange(sourceFiles);
if (!AddResources(context.ProjectFile, compilerArgs, intermediateOutputPath)) if (!AddResources(context.ProjectFile, compilerArgs, intermediateOutputPath))
{ {