(cake-buildGH-1685) Add DotNetCoreTool settings overload

Use FilePath for all overloads
devlead · Jul 14, 2017 · b8e02a3 · b8e02a3
1 parent d20f7ae
commit b8e02a3
Showing 1 changed file with 31 additions and 6 deletions.
diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs
@@ -1059,7 +1059,7 @@ public static void DotNetCoreVSTest(this ICakeContext context, IEnumerable<FileP
         /// /// Execute an .NET Core Extensibility Tool.
         /// </summary>
         /// <param name="context">The context.</param>
-        /// <param name="project">The projects path.</param>
+        /// <param name="projectPath">The project path.</param>
         /// <param name="command">The command to execute.</param>
         /// <example>
         /// <code>
@@ -1069,7 +1069,7 @@ public static void DotNetCoreVSTest(this ICakeContext context, IEnumerable<FileP
         [CakeMethodAlias]
         [CakeAliasCategory("Tool")]
         [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")]
-        public static void DotNetCoreTool(this ICakeContext context, string project, string command)
+        public static void DotNetCoreTool(this ICakeContext context, FilePath projectPath, string command)
         {
             if (context == null)
             {
@@ -1078,17 +1078,15 @@ public static void DotNetCoreTool(this ICakeContext context, string project, str
 
             var arguments = new ProcessArgumentBuilder();
             var settings = new DotNetCoreToolSettings();
-            var projectPath = FilePath.FromString(project);
 
-            var runner = new DotNetCoreToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
-            runner.Execute(projectPath, command, arguments, settings);
+            context.DotNetCoreTool(projectPath, command, arguments, settings);
         }
 
         /// <summary>
         /// Execute an .NET Core Extensibility Tool.
         /// </summary>
         /// <param name="context">The context.</param>
-        /// <param name="projectPath">The projects path.</param>
+        /// <param name="projectPath">The project path.</param>
         /// <param name="command">The command to execute.</param>
         /// <param name="arguments">The arguments.</param>
         /// <example>
@@ -1107,6 +1105,33 @@ public static void DotNetCoreTool(this ICakeContext context, FilePath projectPat
             }
 
             var settings = new DotNetCoreToolSettings();
+
+            context.DotNetCoreTool(projectPath, command, arguments, settings);
+        }
+
+        /// <summary>
+        /// Execute an .NET Core Extensibility Tool.
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <param name="projectPath">The project path.</param>
+        /// <param name="command">The command to execute.</param>
+        /// <param name="arguments">The arguments.</param>
+        /// <param name="settings">The settings.</param>
+        /// <example>
+        /// <code>
+        ///     DotNetCoreTool("./src/project", "xunit", "-xml report.xml");
+        /// </code>
+        /// </example>
+        [CakeMethodAlias]
+        [CakeAliasCategory("Tool")]
+        [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")]
+        public static void DotNetCoreTool(this ICakeContext context, FilePath projectPath, string command, ProcessArgumentBuilder arguments, DotNetCoreToolSettings settings)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
             var runner = new DotNetCoreToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
 
             runner.Execute(projectPath, command, arguments, settings);