Merge pull request #2 from stormid/feature/fix-build

Add updated cake mix files

.cake/Artifacts-Copy.cake

@@ -0,0 +1,58 @@
+#load "Configuration.cake"
+
+public static Configuration IncludeArtifactCopyTarget(this Configuration configuration, DirectoryPath sourceDirectory)
+{
+    var copyList = new HashSet<DirectoryPath>();
+    if(configuration.TaskParameters.TryGetValue("Artifacts:Copy__Items", out object value) && value is HashSet<DirectoryPath>)
+    {
+        copyList = value as HashSet<DirectoryPath>;
+    }
+    else
+    {
+        configuration.TaskParameters.Add("Artifacts:Copy__Items", copyList);
+    }
+
+    copyList.Add(sourceDirectory);
+
+    return configuration;
+}
+
+public static bool HasArtifactCopyTargets(this Configuration configuration)
+{
+    var copyList = new HashSet<DirectoryPath>();
+    if(configuration.TaskParameters.TryGetValue("Artifacts:Copy__Items", out object value) && value is HashSet<DirectoryPath>)
+    {
+        copyList = value as HashSet<DirectoryPath>;
+    }
+
+    return copyList.Any();
+}
+
+public static IEnumerable<DirectoryPath> GetArtifactCopyTargets(this Configuration configuration)
+{
+    var copyList = new HashSet<DirectoryPath>();
+    if(configuration.TaskParameters.TryGetValue("Artifacts:Copy__Items", out object value) && value is HashSet<DirectoryPath>)
+    {
+        copyList = value as HashSet<DirectoryPath>;
+    }    
+    return copyList;
+}
+
+Task("Artifacts:Copy")
+    .WithCriteria<Configuration>((ctx, config) => config.HasArtifactCopyTargets())
+    .IsDependentOn("Build")
+    .IsDependeeOf("Publish")
+    .Does<Configuration>(config => 
+{
+    var artifacts = $"{config.Artifacts.Root}";
+    EnsureDirectoryExists(artifacts);
+    foreach(var directory in config.GetArtifactCopyTargets()) 
+    {
+        var copyFrom = directory;
+        var copyTo = $"{artifacts}/{directory.GetDirectoryName()}";
+        Information("{0} -> {1}", copyFrom, copyTo);
+        EnsureDirectoryExists(copyTo);
+        CopyDirectory(directory, copyTo);
+        config.Artifacts.Add(ArtifactTypeOption.Other, directory.GetDirectoryName(), directory.FullPath);
+    }
+});

.cake/Artifacts-DotNetCore-Ef.cake

@@ -1,5 +1,5 @@
 #load "Configuration.cake"
-#addin nuget:?package=Newtonsoft.Json
+#addin nuget:?package=Newtonsoft.Json&version=12.0.1
 using Newtonsoft.Json;
 
 public class EfMigration 
@@ -25,7 +25,7 @@ IEnumerable<EfContext> GetAllDbContexts(DirectoryPath workingDirectory, string c
         RedirectStandardOutput = true
     };
 
-    settings.Arguments = string.Format("ef dbcontext list --configuration {0} --json", configuration);
+    settings.Arguments = string.Format("ef dbcontext list --configuration {0} --json --prefix-output", configuration);
     var list = Enumerable.Empty<EfContext>();
 
     using(var process = StartAndReturnProcess("dotnet", settings))
@@ -35,7 +35,7 @@ IEnumerable<EfContext> GetAllDbContexts(DirectoryPath workingDirectory, string c
         {
             try 
             {
-                var outputAsJson = string.Join(Environment.NewLine, process.GetStandardOutput());
+                var outputAsJson = string.Join(Environment.NewLine, process.GetStandardOutput().Where(l => l.StartsWith("data:")).Select(l => l.Replace("data:", "")));
                 list = JsonConvert.DeserializeObject<List<EfContext>>(outputAsJson);
                 Verbose("Found {0} Db contexts", list.Count());
             }
@@ -56,7 +56,7 @@ IEnumerable<EfMigration> GetMigrationsForContext(string dbContext, DirectoryPath
         RedirectStandardOutput = true
     };
 
-    settings.Arguments = string.Format("ef migrations list --configuration {0} --context {1} --json", configuration, dbContext);
+    settings.Arguments = string.Format("ef migrations list --configuration {0} --context {1} --json --prefix-output", configuration, dbContext);
 
     var list = Enumerable.Empty<EfMigration>();
     using(var process = StartAndReturnProcess("dotnet", settings))
@@ -66,7 +66,7 @@ IEnumerable<EfMigration> GetMigrationsForContext(string dbContext, DirectoryPath
         {
             try
             {
-                var outputAsJson = string.Join(Environment.NewLine, process.GetStandardOutput());
+                var outputAsJson = string.Join(Environment.NewLine, process.GetStandardOutput().Where(l => l.StartsWith("data:")).Select(l => l.Replace("data:", "")));
                 list = JsonConvert.DeserializeObject<List<EfMigration>>(outputAsJson);
             }
             catch(Exception exception)             
@@ -78,45 +78,86 @@ IEnumerable<EfMigration> GetMigrationsForContext(string dbContext, DirectoryPath
     return list;
 }
 
+public static Configuration IncludeAsEfDbContext(this Configuration configuration, Func<CustomProjectParserResult, bool> includeAsEFDbContext)
+{
+    var projects = new HashSet<CustomProjectParserResult>();
+    if(configuration.TaskParameters.TryGetValue("Artifacts:DotNetCore:Ef:Migration-Script", out object value) && value is HashSet<CustomProjectParserResult>)
+    {
+        projects = value as HashSet<CustomProjectParserResult>;
+    }
+    else
+    {
+        configuration.TaskParameters.Add("Artifacts:DotNetCore:Ef:Migration-Script", projects);
+    }
+
+    var projectsToInclude = configuration.Solution.Projects.Where(includeAsEFDbContext).ToList();
+
+    if(projectsToInclude != null && projectsToInclude.Any())
+    {
+        projects.UnionWith(projectsToInclude);
+    }
+
+    return configuration;
+}
+
+public static bool HasCustomEfDbContextTargets(this Configuration configuration)
+{
+    var projectList = configuration.GetEfDbContextTargets();
+    return projectList?.Any() ?? false;
+}
+
+public static IEnumerable<CustomProjectParserResult> GetEfDbContextTargets(this Configuration configuration)
+{
+    var projects = new HashSet<CustomProjectParserResult>();
+    if(configuration.TaskParameters.TryGetValue("Artifacts:DotNetCore:Ef:Migration-Script", out object value) && value is HashSet<CustomProjectParserResult>)
+    {
+        projects = value as HashSet<CustomProjectParserResult>;
+    }    
+    return projects;
+}
+
 Task("Artifacts:DotNetCore:Ef:Migration-Script")
     .IsDependentOn("Build")
     .IsDependeeOf("Publish")
     .Does<Configuration>(config => 
 {
-    var efProjects = config.Solution.Projects.ToList();
+    var efProjects = (config.HasCustomEfDbContextTargets() ? config.GetEfDbContextTargets() : config.Solution.Projects).ToList();
 
     Information("Generating scripts for {0} projects", efProjects.Count());
     foreach(var project in efProjects) {
         var assemblyName = config.Solution.GetProjectName(project);
         var workingDirectory = project.ProjectFilePath.GetDirectory();
         var availableDbContexts = GetAllDbContexts(workingDirectory, config.Solution.BuildConfiguration).ToList();
 
-        Information("Generating scripts for {0} containing {1} contexts", assemblyName, availableDbContexts.Count);
-        foreach(var dbContext in availableDbContexts) 
+        if(availableDbContexts.Any())
         {
-            Information("Generating Sql Script for {0}", dbContext.SafeName);
-            var migrations = GetMigrationsForContext(dbContext.SafeName, workingDirectory, config.Solution.BuildConfiguration);
-
-            var sqlScript = MakeAbsolute(File($"{config.Artifacts.Root}/sql/{dbContext.SafeName}.sql"));
-            if(FileExists(sqlScript)) {
-                DeleteFile(sqlScript);
-            }
+            Information("Generating scripts for {0} containing {1} contexts", assemblyName, availableDbContexts.Count);
+            foreach(var dbContext in availableDbContexts) 
+            {
+                Information("Generating Sql Script for {0}", dbContext.SafeName);
+                var migrations = GetMigrationsForContext(dbContext.SafeName, workingDirectory, config.Solution.BuildConfiguration);
+
+                var sqlScript = MakeAbsolute(File($"{config.Artifacts.Root}/sql/{dbContext.SafeName}.sql"));
+                if(FileExists(sqlScript)) {
+                    DeleteFile(sqlScript);
+                }
 
-            var settings = new ProcessSettings() 
-            { 
-                WorkingDirectory = workingDirectory
-            };
+                var settings = new ProcessSettings() 
+                { 
+                    WorkingDirectory = workingDirectory
+                };
 
-            settings.Arguments = string.Format("ef migrations script -i -o {0} --configuration {1} --context {2}", sqlScript, config.Solution.BuildConfiguration, dbContext.SafeName);
+                settings.Arguments = string.Format("ef migrations script -i -o {0} --configuration {1} --context {2}", sqlScript, config.Solution.BuildConfiguration, dbContext.SafeName);
 
-            using(var process = StartAndReturnProcess("dotnet", settings))
-            {
-                process.WaitForExit();
-                Verbose("Exit code: {0}", process.GetExitCode());
-            }
+                using(var process = StartAndReturnProcess("dotnet", settings))
+                {
+                    process.WaitForExit();
+                    Verbose("Exit code: {0}", process.GetExitCode());
+                }
 
-            config.Artifacts.Add(ArtifactTypeOption.Other, sqlScript.GetFilename().ToString(), sqlScript);
+                config.Artifacts.Add(ArtifactTypeOption.Other, sqlScript.GetFilename().ToString(), sqlScript);
+            }
         }
     }
 
-});
+});

.cake/Build-MsBuild.cake

@@ -8,7 +8,6 @@ Task("Build:MsBuild")
     MSBuild(config.Solution.Path.ToString(), c => c
         .SetConfiguration(config.Solution.BuildConfiguration)
         .SetVerbosity(Verbosity.Minimal)
-        .UseToolVersion(MSBuildToolVersion.VS2017)
         .WithWarningsAsError()
         .WithTarget("Build")
     );

.cake/CI-VSTS.cake → .cake/CI-Azure-DevOps.cake

@@ -1,18 +1,18 @@
 #load "Configuration.cake"
 
 Task("CI:VSTS:UploadArtifacts")
-    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnVSTS || TFBuild.IsRunningOnTFS)
+    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines)
     .IsDependentOn("Publish")
     .IsDependeeOf("CI:UploadArtifacts")
     .Does<Configuration>(config => 
 {
     Information("Uploading artifacts from {0}", config.Artifacts.Root);
-    TFBuild.Commands.UploadArtifact("artifacts", config.Artifacts.Root.ToString(), "artifacts");    
+    TFBuild.Commands.UploadArtifact("artifacts", config.Artifacts.Root.ToString(), "artifacts");
 });
 
 Task("CI:VSTS:UpdateBuildNumber")
     .IsDependeeOf("CI:UpdateBuildNumber")
-    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnVSTS || TFBuild.IsRunningOnTFS)
+    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines)
     .Does<Configuration>(config =>
 {
     Information(

.cake/CI.cake

@@ -1,4 +1,4 @@
-#load "CI-VSTS.cake"
+#load "CI-Azure-DevOps.cake"
 #load "CI-AppVeyor.cake"
 
 Task("CI")

.cake/Configuration-Version.cake

@@ -1,4 +1,4 @@
-#tool "nuget:?package=GitVersion.CommandLine&prerelease"
+#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0&prerelease"
 
 public class BuildVersion {
     public FilePath VersionAssemblyInfo { get; private set; }
@@ -97,4 +97,4 @@ public class BuildVersion {
             throw new Exception("Version information has not been determined, build failed!");
         }
     }
-}
+}

.cake/Configuration.cake

@@ -1,4 +1,4 @@
-#addin "Cake.Incubator&version=3.1.0"
+#addin "Cake.Incubator&version=5.0.1"
 #load "Configuration-Version.cake"
 
 const string _solutionFilePathPattern = "*.sln";
@@ -56,6 +56,8 @@ public partial class Configuration {
         return config;
     }
 
+    public Dictionary<string, object> TaskParameters { get; } = new Dictionary<string, object>();
+
     public BuildVersion Version { get; }
 
     public SolutionParameters Solution { get; }
@@ -81,6 +83,8 @@ public partial class Configuration {
         Artifacts = new ArtifactsParameters(context, artifactsRootPath ?? context.Directory("artifacts"));
     }
 
+    public ICakeLog Logger => context.Log;
+
     public void Log(ICakeLog logger) 
     {
         Solution.Log(logger);
@@ -110,7 +114,7 @@ public struct Artifact {
     }
 
     public override string ToString() {
-        return $"{Name} ({Type}/{Category}) - {Path}";
+        return $"{Name} ({Type}/{Category}) - {Path.FullPath}";
     }
 }
 
@@ -133,7 +137,7 @@ public class ArtifactsParameters : List<Artifact> {
     }
 
     public void Add(ArtifactTypeOption type, string name, FilePath path) {
-        Add(new Artifact(type, name, path));
+        Add(new Artifact(type, name, context.MakeAbsolute(path)));
     }
 }
 
@@ -158,11 +162,12 @@ public class SolutionParameters {
     }
 
     private ISet<Func<CustomProjectParserResult, bool>> WebProjectResolvers { get; } = new HashSet<Func<CustomProjectParserResult, bool>>() {
-        p => p.IsWebApplication()
+        p => p.IsWebApplication(),
+        p => p.HasPackage("Microsoft.NET.Sdk.Functions")
     };
 
     private ISet<Func<CustomProjectParserResult, bool>> TestProjectResolvers { get; } = new HashSet<Func<CustomProjectParserResult, bool>>() {
-        p => p.IsDotNetCliTestProject()
+        p => p.IsTestProject()
     };
 
     private ISet<Func<CustomProjectParserResult, bool>> NuGetProjectResolvers { get; } = new HashSet<Func<CustomProjectParserResult, bool>>() {

.cake/Npm-RunScript.cake

@@ -27,7 +27,6 @@ public class NpmConfiguration
 
     public bool CanExecuteNpm {
         get {
-            cakeContext.Information($"{WorkingDirectory.TrimEnd('/')}/package.json");
             return cakeContext.FileExists($"{WorkingDirectory.TrimEnd('/')}/package.json");
         }
     }

.cake/Publish-Pack-DotNetCore.cake

@@ -12,8 +12,7 @@ Task("Publish:Pack:DotNetCore")
         NoRestore = true,
         IncludeSymbols = true,
         Configuration = config.Solution.BuildConfiguration,
-        OutputDirectory = projectArtifactDirectory,
-        Verbosity = DotNetCoreVerbosity.Minimal
+        OutputDirectory = projectArtifactDirectory
     };
     settings.MSBuildSettings = new DotNetCoreMSBuildSettings();
     settings.MSBuildSettings

.cake/Publish-Pack-NuGet.cake

@@ -8,9 +8,11 @@ Task("Publish:Pack:NuGet")
     var projectArtifactDirectory = config.Artifacts.GetRootFor(ArtifactTypeOption.NuGet);
 
     foreach(var nugetProject in config.Solution.NuGetProjects) {
+     var properties = new Dictionary<string,string>{ { "Configuration", "Release"} };   
      var nuGetPackSettings   = new NuGetPackSettings {
                                      Version                 = $"{config.Version.SemVersion}",
-                                     OutputDirectory         = $"{projectArtifactDirectory}/"
+                                     OutputDirectory         = $"{projectArtifactDirectory}/",
+                                     Properties              = properties
                                  };
 
         NuGetPack(nugetProject.ProjectFilePath.ToString(), nuGetPackSettings);

.cake/Publish-Zip-DotNetCore.cake

@@ -18,8 +18,7 @@ Task("Publish:Zip:DotNetCore")
         {
             NoRestore = true,
             Configuration = config.Solution.BuildConfiguration,
-            OutputDirectory = publishDirectory,
-            Verbosity = DotNetCoreVerbosity.Minimal,
+            OutputDirectory = publishDirectory
         };
 
         settings.MSBuildSettings = new DotNetCoreMSBuildSettings();