diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs index d5079456..599b0ca7 100644 --- a/cake/BuildContext.cs +++ b/cake/BuildContext.cs @@ -12,6 +12,7 @@ using Cake.Common.Tools.DotNet; using Cake.Common.Tools.DotNet.Build; using Cake.Common.Tools.DotNet.MSBuild; +using Cake.Common.Tools.DotNet.Restore; using Cake.Common.Tools.DotNet.Run; using Cake.Common.Tools.DotNet.Test; using Cake.Common.Tools.DotNetCore.MSBuild; @@ -37,6 +38,8 @@ public class BuildContext : FrostingContext public Cake.Common.Tools.DotNet.Build.DotNetBuildSettings DotNetBuildSettings { get; } + public DotNetRestoreSettings DotNetRestoreTemplatesSettings { get; } + public Cake.Common.Tools.DotNet.Test.DotNetTestSettings DotNetTestSettings { get; } public DotNetRunSettings DotNetRunSettings { get; } @@ -59,7 +62,9 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters) Verbosity = DotNetVerbosity.Quiet } }; - + + DotNetRestoreTemplatesSettings = new DotNetRestoreSettings() { NoCache = true, IgnoreFailedSources = true }; + DotNetTestSettings = new DotNetTestSettings() { Verbosity = buildParameters.Verbosity, diff --git a/cake/Program.cs b/cake/Program.cs index 22272bdd..b57b3e5e 100644 --- a/cake/Program.cs +++ b/cake/Program.cs @@ -332,7 +332,7 @@ public override void Run(BuildContext context) { if (!context.BuildParameters.DoPublish) { - context.Log.Warning($"Skipping template package push."); + context.Log.Warning($"Skipping template package build."); return; } @@ -385,12 +385,12 @@ public override void Run(BuildContext context) }); } + foreach (var template in context.GetTemplateProjects()) { + context.DotNetRestore(Path.Combine(context.ScrDir, template.solution), context.DotNetRestoreTemplatesSettings); context.DotNetBuild(Path.Combine(context.ScrDir, template.solution), context.DotNetBuildSettings); } - - } }