(GH-19) Removed usage of obsolete code

cake-contrib · Feb 15, 2017 · bb4567b · bb4567b
1 parent c56fd9b
commit bb4567b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/src/Cake.DocFx/DocFxAliases.cs b/src/Cake.DocFx/DocFxAliases.cs
@@ -81,7 +81,7 @@ public static void DocFx(this ICakeContext context, FilePath configFile, DocFxSe
 
             settings = settings ?? new DocFxSettings();
 
-            var runner = new DocFxRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Globber);
+            var runner = new DocFxRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
             runner.Run(configFile, settings);
         }
 
@@ -155,7 +155,7 @@ public static void DocFxBuild(this ICakeContext context, FilePath configFile, Do
 
             settings = settings ?? new DocFxBuildSettings();
 
-            var runner = new DocFxBuildRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Globber);
+            var runner = new DocFxBuildRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
             runner.Run(configFile, settings);
         }
 
@@ -244,7 +244,7 @@ public static void DocFxMetadata(this ICakeContext context, DocFxMetadataSetting
 
             settings = settings ?? new DocFxMetadataSettings();
 
-            var runner = new DocFxMetadataRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Globber);
+            var runner = new DocFxMetadataRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
             runner.Run(settings);
         }
     }

diff --git a/src/Cake.DocFx/DocFxBuildRunner.cs b/src/Cake.DocFx/DocFxBuildRunner.cs
@@ -1,5 +1,6 @@
 using Cake.Core;
 using Cake.Core.IO;
+using Cake.Core.Tooling;
 using Cake.DocFx.Helper;
 
 namespace Cake.DocFx
@@ -15,9 +16,9 @@ public sealed class DocFxBuildRunner : DocFxTool<DocFxBuildSettings>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="environment">The environment.</param>
         /// <param name="processRunner">The process runner.</param>
-        /// <param name="globber">The globber.</param>
-        public DocFxBuildRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber) 
-            : base(fileSystem, environment, processRunner, globber)
+        /// <param name="tools">The tools.</param>
+        public DocFxBuildRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools) 
+            : base(fileSystem, environment, processRunner, tools)
         {
         }
 

diff --git a/src/Cake.DocFx/DocFxMetadataRunner.cs b/src/Cake.DocFx/DocFxMetadataRunner.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Cake.Core;
 using Cake.Core.IO;
+using Cake.Core.Tooling;
 
 namespace Cake.DocFx
 {
@@ -15,9 +16,9 @@ public sealed class DocFxMetadataRunner : DocFxTool<DocFxMetadataSettings>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="environment">The environment.</param>
         /// <param name="processRunner">The process runner.</param>
-        /// <param name="globber">The globber.</param>
-        public DocFxMetadataRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber) 
-            : base(fileSystem, environment, processRunner, globber)
+        /// <param name="tools">The tools.</param>
+        public DocFxMetadataRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools)
+            : base(fileSystem, environment, processRunner, tools)
         {
         }
 

diff --git a/src/Cake.DocFx/DocFxRunner.cs b/src/Cake.DocFx/DocFxRunner.cs
@@ -1,5 +1,6 @@
 using Cake.Core;
 using Cake.Core.IO;
+using Cake.Core.Tooling;
 using Cake.DocFx.Helper;
 
 namespace Cake.DocFx
@@ -15,9 +16,9 @@ public class DocFxRunner : DocFxTool<DocFxSettings>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="environment">The environment.</param>
         /// <param name="processRunner">The process runner.</param>
-        /// <param name="globber">The globber.</param>
-        public DocFxRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber) 
-            : base(fileSystem, environment, processRunner, globber)
+        /// <param name="tools">The tools.</param>
+        public DocFxRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools)
+            : base(fileSystem, environment, processRunner, tools)
         {
         }
 
@@ -32,7 +33,7 @@ public void Run(FilePath path, DocFxSettings settings)
 
             Run(settings, GetArguments(path, settings));
         }
-        
+
         private ProcessArgumentBuilder GetArguments(FilePath configFile, DocFxSettings settings)
         {
             var builder = new ProcessArgumentBuilder();

diff --git a/src/Cake.DocFx/DocFxTool.cs b/src/Cake.DocFx/DocFxTool.cs
@@ -9,7 +9,7 @@ namespace Cake.DocFx
     /// Base class for the DocFx runners.
     /// </summary>
     /// <typeparam name="TSettings">The type of tool settings to use.</typeparam>
-    public abstract class DocFxTool<TSettings> : Tool<TSettings> 
+    public abstract class DocFxTool<TSettings> : Tool<TSettings>
         where TSettings : ToolSettings
     {
         /// <summary>
@@ -18,9 +18,9 @@ public abstract class DocFxTool<TSettings> : Tool<TSettings>
         /// <param name="fileSystem">The file system.</param>
         /// <param name="environment">The environment.</param>
         /// <param name="processRunner">The process runner.</param>
-        /// <param name="globber">The globber.</param>
-        protected DocFxTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber) 
-            : base(fileSystem, environment, processRunner, globber)
+        /// <param name="tools">The tools.</param>
+        protected DocFxTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools)
+            : base(fileSystem, environment, processRunner, tools)
         {
         }