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

various fixes

Browse source
This commit is contained in:
piotrp 2016-01-22 00:42:33 -08:00 • committed by Bryan Thornbury
parent 37445f053d
commit 9c5e520285
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,8 +79,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
return returnCode; return returnCode;
} }
sources = sources.Select(s => s.Trim('"')).ToList();
var translated = TranslateCommonOptions(commonOptions, outputName); var translated = TranslateCommonOptions(commonOptions, outputName);
var allArgs = new List<string>(translated); var allArgs = new List<string>(translated);
@ -96,9 +94,9 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
allArgs.Add($"-out:\"{outputName}\""); allArgs.Add($"-out:\"{outputName}\"");
} }
allArgs.AddRange(references.Select(r => $"-r:\"{r}\"")); allArgs.AddRange(references.Select(r => $"-r:\"{r.Trim('"')}\""));
allArgs.AddRange(resources.Select(resource => $"-resource:{resource}")); allArgs.AddRange(resources.Select(resource => $"-resource:{resource.Trim('"')}"));
allArgs.AddRange(sources.Select(s => $"\"{s}\"")); allArgs.AddRange(sources.Select(s => $"\"{s.Trim('"')}\""));
var rsp = Path.Combine(tempOutDir, "dotnet-compile-csc.rsp"); var rsp = Path.Combine(tempOutDir, "dotnet-compile-csc.rsp");

12
src/Microsoft.DotNet.Tools.Test/project.json
View file

@ -14,9 +14,12 @@
"NETStandard.Library": "1.0.0-rc2-23704", "NETStandard.Library": "1.0.0-rc2-23704",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23704", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23704",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23704", "System.Diagnostics.TraceSource": "4.0.0-rc2-23704",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23616", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23616",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": { "Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "build" "type": "build"
@ -25,21 +28,14 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "build" "type": "build"
}, },
"Microsoft.Extensions.Testing.Abstractions": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.CommandLineUtils.Sources": { "Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "build" "type": "build"
}, },
"Microsoft.Extensions.Logging": "1.0.0-rc2-15935", "Microsoft.Extensions.Logging": "1.0.0-rc2-16023"
"Newtonsoft.Json": "7.0.1"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
} }
},
"scripts": {
} }
} }

6
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -11,8 +11,8 @@
}, },
"dependencies": { "dependencies": {
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": {"target":"project"}, "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-15935", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16023",
"NETStandard.Library": "1.0.0-rc2-23704", "NETStandard.Library": "1.0.0-rc2-23704",
"System.Resources.ResourceManager": "4.0.1-rc2-23704", "System.Resources.ResourceManager": "4.0.1-rc2-23704",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704" "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704"
@ -20,7 +20,5 @@
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
} }
},
"scripts": {
} }
} }

11
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -4,6 +4,7 @@
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
@ -19,10 +20,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public virtual CommandResult Execute(string args = "") public virtual CommandResult Execute(string args = "")
{ {
Console.WriteLine($"Executing - {_command} {args}"); var commandPath = _command;
if (!Path.IsPathRooted(_command))
{
_command = Env.GetCommandPath(_command) ??
Env.GetCommandPathFromAppBase(AppContext.BaseDirectory, _command);
}
var commandPath = Env.GetCommandPath(_command) ?? Console.WriteLine($"Executing - {_command} {args}");
Env.GetCommandPathFromAppBase(AppContext.BaseDirectory, _command);
var stdOut = new StreamForwarder(); var stdOut = new StreamForwarder();
var stdErr = new StreamForwarder(); var stdErr = new StreamForwarder();