moves DependsOn to Target base fluent interface so dependsOn can be used in groups

Author: mzorec

src/FlubuCore/Context/FluentInterface/Interfaces/ITarget.cs

@@ -169,41 +169,6 @@ public interface ITarget : ITargetBaseFluentInterfaceOfT<ITarget>
         /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
         new ITarget DoAsync<T, T1, T2, T3, T4>(Func<ITaskContext, T, T1, T2, T3, T4, Task> doAction, T param, T1 param2, T2 param3, T3 param4, T4 param5, Action<DoTaskAsync6<T, T1, T2, T3, T4>> doOptions = null);
 
-        /// <summary>
-        ///     Specifies targets on which this target depends on.
-        /// </summary>
-        /// <param name="targetNames">The dependency target names.</param>
-        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
-        ITarget DependsOn(params string[] targetNames);
-
-        /// <summary>
-        ///     Specifies targets on which this target depends on. Execution of dependant targets is synchronus.
-        /// </summary>
-        /// <param name="targets">The dependency target names.</param>
-        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
-        ITarget DependsOn(params ITargetInternal[] targets);
-
-        /// <summary>
-        ///     Specifies targets on which this target depends on. Execution of dependant targets is asynchronus.
-        /// </summary>
-        /// <param name="targets">The dependency target names.</param>
-        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
-        ITarget DependsOnAsync(params ITargetInternal[] targets);
-
-        /// <summary>
-        ///     Specifies targets on which this target depends on.
-        /// </summary>
-        /// <param name="targets">The dependency target names.</param>
-        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
-        ITarget DependsOn(params ITarget[] targets);
-
-        /// <summary>
-        /// Specifies targets on which this target depends on. Execution of dependant targets is asynchronus.
-        /// </summary>
-        /// <param name="targets">The dependency target names.</param>
-        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
-        ITarget DependsOnAsync(params ITarget[] targets);
-
         /// <summary>
         ///     Sets the target as the default target for the runner.
         /// </summary>

src/FlubuCore/Context/FluentInterface/Interfaces/ITargetBaseFluentInterface.cs

@@ -222,6 +222,41 @@ public interface ITargetBaseFluentInterfaceOfT<TTargetFluentInterface> : ITarget
         /// </summary>
         /// <returns></returns>
         TTargetFluentInterface SequentialLogging(bool enable);
+
+        /// <summary>
+        ///     Specifies targets on which this target depends on.
+        /// </summary>
+        /// <param name="targetNames">The dependency target names.</param>
+        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
+        TTargetFluentInterface DependsOn(params string[] targetNames);
+
+        /// <summary>
+        ///     Specifies targets on which this target depends on. Execution of dependant targets is synchronus.
+        /// </summary>
+        /// <param name="targets">The dependency target names.</param>
+        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
+        TTargetFluentInterface DependsOn(params ITargetInternal[] targets);
+
+        /// <summary>
+        ///     Specifies targets on which this target depends on. Execution of dependant targets is asynchronus.
+        /// </summary>
+        /// <param name="targets">The dependency target names.</param>
+        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
+        TTargetFluentInterface DependsOnAsync(params ITargetInternal[] targets);
+
+        /// <summary>
+        ///     Specifies targets on which this target depends on.
+        /// </summary>
+        /// <param name="targets">The dependency target names.</param>
+        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
+        TTargetFluentInterface DependsOn(params ITarget[] targets);
+
+        /// <summary>
+        /// Specifies targets on which this target depends on. Execution of dependant targets is asynchronus.
+        /// </summary>
+        /// <param name="targets">The dependency target names.</param>
+        /// <returns>This same instance of <see cref="ITargetInternal" />.</returns>
+        TTargetFluentInterface DependsOnAsync(params ITarget[] targets);
     }
 
     public interface ITargetBaseFluentInterface

src/FlubuCore/Context/FluentInterface/TargetBaseFluentInterface.cs

@@ -33,6 +33,56 @@ public TargetBaseFluentInterface()
 
         protected int ActionCount { get; set; }
 
+        public TTargetFluentInterface DependsOn(params string[] targetNames)
+        {
+            LastTargetAction = TargetAction.AddDependency;
+            ActionCount = targetNames.Length;
+            Target.DependsOn(targetNames);
+            return this as TTargetFluentInterface;
+        }
+
+        public TTargetFluentInterface DependsOn(params ITargetInternal[] targets)
+        {
+            LastTargetAction = TargetAction.AddDependency;
+            ActionCount = targets.Length;
+            Target.DependsOn(targets);
+            return this as TTargetFluentInterface;
+        }
+
+        public TTargetFluentInterface DependsOn(params ITarget[] targets)
+        {
+            LastTargetAction = TargetAction.AddDependency;
+            ActionCount = targets.Length;
+            foreach (var t in targets)
+            {
+                var target = (TargetFluentInterface)t;
+                Target.DependsOn(target.Target);
+            }
+
+            return this as TTargetFluentInterface;
+        }
+
+        public TTargetFluentInterface DependsOnAsync(params ITargetInternal[] targets)
+        {
+            LastTargetAction = TargetAction.AddDependency;
+            ActionCount = targets.Length;
+            Target.DependsOnAsync(targets);
+            return this as TTargetFluentInterface;
+        }
+
+        public TTargetFluentInterface DependsOnAsync(params ITarget[] targets)
+        {
+            LastTargetAction = TargetAction.AddDependency;
+            ActionCount = targets.Length;
+            foreach (var t in targets)
+            {
+                var target = (TargetFluentInterface)t;
+                Target.DependsOnAsync(target.Target);
+            }
+
+            return this as TTargetFluentInterface;
+        }
+
         public TTargetFluentInterface AddTask(params ITask[] tasks)
         {
             ActionCount = tasks.Length;