From 9c5e520285144cd18f2368247bb91ece2266f3f0 Mon Sep 17 00:00:00 2001
From: piotrp <piotrp@microsoft.com>
Date: Fri, 22 Jan 2016 00:42:33 -0800
Subject: [PATCH] various fixes

---
 src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs   |  8 +++-----
 src/Microsoft.DotNet.Tools.Test/project.json         | 12 ++++--------
 .../project.json                                     |  6 ++----
 .../Commands/TestCommand.cs                          | 11 ++++++++---
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
index 1bc4835d6..8e67b1afd 100644
--- a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
@@ -79,8 +79,6 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
                 return returnCode;
             }
 
-            sources = sources.Select(s => s.Trim('"')).ToList();
-
             var translated = TranslateCommonOptions(commonOptions, outputName);
 
             var allArgs = new List<string>(translated);
@@ -96,9 +94,9 @@ namespace Microsoft.DotNet.Tools.Compiler.Csc
                 allArgs.Add($"-out:\"{outputName}\"");
             }
 
-            allArgs.AddRange(references.Select(r => $"-r:\"{r}\""));
-            allArgs.AddRange(resources.Select(resource => $"-resource:{resource}"));
-            allArgs.AddRange(sources.Select(s => $"\"{s}\""));
+            allArgs.AddRange(references.Select(r => $"-r:\"{r.Trim('"')}\""));
+            allArgs.AddRange(resources.Select(resource => $"-resource:{resource.Trim('"')}"));
+            allArgs.AddRange(sources.Select(s => $"\"{s.Trim('"')}\""));
 
             var rsp = Path.Combine(tempOutDir, "dotnet-compile-csc.rsp");
 
diff --git a/src/Microsoft.DotNet.Tools.Test/project.json b/src/Microsoft.DotNet.Tools.Test/project.json
index 798db16bc..e008ef096 100644
--- a/src/Microsoft.DotNet.Tools.Test/project.json
+++ b/src/Microsoft.DotNet.Tools.Test/project.json
@@ -14,9 +14,12 @@
     "NETStandard.Library": "1.0.0-rc2-23704",
     "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23704",
     "System.Diagnostics.TraceSource": "4.0.0-rc2-23704",
+
     "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616",
     "Microsoft.NETCore.TestHost": "1.0.0-rc2-23616",
+    
     "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
+    "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
     "Microsoft.Dnx.Runtime.CommandParsing.Sources": {
       "version": "1.0.0-*",
       "type": "build"
@@ -25,21 +28,14 @@
       "version": "1.0.0-*",
       "type": "build"
     },
-    "Microsoft.Extensions.Testing.Abstractions": {
-      "version": "1.0.0-*",
-      "type": "build"
-    },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "version": "1.0.0-*",
       "type": "build"
     },
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-15935",
-    "Newtonsoft.Json": "7.0.1"
+    "Microsoft.Extensions.Logging": "1.0.0-rc2-16023"
   },
   "frameworks": {
     "dnxcore50": {
     }
-  },
-  "scripts": {
   }
 }
diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json
index ad2a0350c..7d9ed8ae0 100644
--- a/src/Microsoft.Extensions.Testing.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "Newtonsoft.Json": "7.0.1",
-    "Microsoft.DotNet.ProjectModel": {"target":"project"},
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-15935",
+    "Microsoft.DotNet.ProjectModel": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16023",
     "NETStandard.Library": "1.0.0-rc2-23704",
     "System.Resources.ResourceManager": "4.0.1-rc2-23704",
     "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704"
@@ -20,7 +20,5 @@
   "frameworks": {
     "dnxcore50": {
     }
-  },
-  "scripts": {
   }
 }
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
index f44449cc6..f236e8a55 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
@@ -4,6 +4,7 @@
 using Microsoft.DotNet.Cli.Utils;
 using System;
 using System.Diagnostics;
+using System.IO;
 
 
 namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -19,10 +20,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
 
         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) ??
-                Env.GetCommandPathFromAppBase(AppContext.BaseDirectory, _command);
+            Console.WriteLine($"Executing - {_command} {args}");
 
             var stdOut = new StreamForwarder();
             var stdErr = new StreamForwarder();