Add automated publishing for windows. Remove extra steps for other platforms

Author: kthompson

azure-pipelines.yml

@@ -57,17 +57,6 @@ stages:
             inputs:
               artifactName: coverage-report.zip
               pathtoPublish: 'artifacts/coverage-report.zip'
-      - job: Pack
-        displayName: 'Pack'
-        dependsOn: [ Compile ]
-        steps:
-          - task: CmdLine@2
-            inputs:
-              script: './build.cmd Pack --skip'
-          - task: PublishBuildArtifacts@1
-            inputs:
-              artifactName: packages
-              pathtoPublish: 'artifacts/packages'
   - stage: windows_latest
     displayName: 'windows-latest'
     dependsOn: [  ]
@@ -121,6 +110,27 @@ stages:
             inputs:
               artifactName: packages
               pathtoPublish: 'artifacts/packages'
+      - job: Publish
+        displayName: 'Publish'
+        dependsOn: [ Test, Pack ]
+        steps:
+          - task: DownloadBuildArtifacts@0
+            displayName: Download Artifacts
+            inputs:
+              buildType: 'current'
+              downloadType: 'single'
+              artifactName: test-results
+              downloadPath: 'artifacts'
+          - task: DownloadBuildArtifacts@0
+            displayName: Download Artifacts
+            inputs:
+              buildType: 'current'
+              downloadType: 'single'
+              artifactName: packages
+              downloadPath: 'artifacts'
+          - task: CmdLine@2
+            inputs:
+              script: './build.cmd Publish --skip --api-key $(ApiKey)'
   - stage: macOS_latest
     displayName: 'macOS-latest'
     dependsOn: [  ]
@@ -163,14 +173,3 @@ stages:
             inputs:
               artifactName: coverage-report.zip
               pathtoPublish: 'artifacts/coverage-report.zip'
-      - job: Pack
-        displayName: 'Pack'
-        dependsOn: [ Compile ]
-        steps:
-          - task: CmdLine@2
-            inputs:
-              script: './build.cmd Pack --skip'
-          - task: PublishBuildArtifacts@1
-            inputs:
-              artifactName: packages
-              pathtoPublish: 'artifacts/packages'

build/Build.cs

@@ -32,7 +32,7 @@
     AzurePipelinesImage.UbuntuLatest,
     AzurePipelinesImage.WindowsLatest,
     AzurePipelinesImage.MacOsLatest,
-    InvokedTargets = new[] { nameof(Test), nameof(Pack) },
+    InvokedTargets = new[] { nameof(Test), nameof(Publish) },
     NonEntryTargets = new[] { nameof(Restore) },
     ExcludedTargets = new[] { nameof(Clean) }
 )]
@@ -44,7 +44,7 @@ class Build : NukeBuild
     ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ///   - Microsoft VSCode           https://nuke.build/vscode
 
-    public static int Main () => Execute<Build>(x => x.Compile);
+    public static int Main () => Execute<Build>(x => x.Pack);
 
     [CI] private readonly AzurePipelines AzurePipelines;
 
@@ -65,6 +65,9 @@ class Build : NukeBuild
     AbsolutePath CoverageReportArchive => ArtifactsDirectory / "coverage-report.zip";
 
     const string MasterBranch = "master";
+    const string DevelopBranch = "develop";
+    const string ReleaseBranchPrefix = "release";
+    const string HotfixBranchPrefix = "hotfix";
 
     Target Clean => _ => _
         .Before(Restore)
@@ -180,10 +183,13 @@ class Build : NukeBuild
         .Requires(() => ApiKey)
         .Requires(() => GitHasCleanWorkingCopy())
         .Requires(() => Configuration.Equals(Configuration.Release))
-        .Requires(() => GitRepository.Branch.EqualsOrdinalIgnoreCase(MasterBranch))
+        .Requires(() => GitRepository.Branch.EqualsOrdinalIgnoreCase(MasterBranch) ||
+                        GitRepository.Branch.EqualsOrdinalIgnoreCase(DevelopBranch) ||
+                        GitRepository.Branch.StartsWithOrdinalIgnoreCase(ReleaseBranchPrefix) ||
+                        GitRepository.Branch.StartsWithOrdinalIgnoreCase(HotfixBranchPrefix))
         .Executes(() =>
         {
-            var packages = PackageDirectory.GlobFiles("*.nupkg");
+            var packages = PackageDirectory.GlobFiles("*.nupkg").Where(x => !x.ToString().Contains("Benchmarks"));
             DotNetNuGetPush(_ => _
                     .SetSource(Source)
                     .SetApiKey(ApiKey)

build/FixedAzurePipelinesAttribute.cs

@@ -1,12 +1,17 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
 using JetBrains.Annotations;
-using Nuke.Common.CI.AzurePipelines;
+
 using Nuke.Common.CI.AzurePipelines.Configuration;
+using Nuke.Common.CI.AzurePipelines;
+using Nuke.Common.CI;
 using Nuke.Common.Execution;
 using Nuke.Common.Tooling;
-using System.Linq;
-using Nuke.Common.Utilities;
 using Nuke.Common.Utilities.Collections;
+using Nuke.Common.Utilities;
+using Nuke.Common;
 
 [SuppressMessage("ReSharper", "CheckNamespace")]
 public class FixedAzurePipelinesAttribute : AzurePipelinesAttribute
@@ -16,6 +21,24 @@ public FixedAzurePipelinesAttribute([CanBeNull] string suffix, AzurePipelinesIma
     {
     }
 
+    public override ConfigurationEntity GetConfiguration(NukeBuild build, IReadOnlyCollection<ExecutableTarget> relevantTargets) =>
+        FixStageJobs((AzurePipelinesConfiguration)base.GetConfiguration(build, relevantTargets));
+
+    static AzurePipelinesConfiguration FixStageJobs(AzurePipelinesConfiguration config)
+    {
+        config.Stages = config.Stages
+            .Select(stage => stage.Name != "windows_latest" ? RemovePublishAndPackJobs(stage) : stage)
+            .ToArray();
+
+        return config;
+    }
+
+    static AzurePipelinesStage RemovePublishAndPackJobs(AzurePipelinesStage stage)
+    {
+        stage.Jobs = stage.Jobs.Where(job => job.Name != "Publish" && job.Name != "Pack").ToArray();
+        return stage;
+    }
+
     protected override AzurePipelinesJob GetJob(ExecutableTarget executableTarget, LookupTable<ExecutableTarget, AzurePipelinesJob> jobs)
     {
         var job = base.GetJob(executableTarget, jobs);
@@ -34,20 +57,23 @@ from pub in dep.PublishArtifacts
             PartitionName = job.PartitionName,
             InvokedTargets = job.InvokedTargets,
             PublishArtifacts = job.PublishArtifacts,
-            DownloadArtifacts = downloads
+            DownloadArtifacts = downloads,
+            ExtraArgs = job.Name == "Publish" ? " --api-key $(ApiKey)" : ""
         };
     }
 }
 
 class FixedAzurePipelinesJob : AzurePipelinesJob {
+    public string ExtraArgs { get; set; }
+
     protected override void WriteSteps(CustomFileWriter writer)
     {
         DownloadArtifacts.ForEach(x =>
         {
-            using (writer.WriteBlock("- task: DownloadBuildArtifacts@0"))
+            using (AzurePipelinesCustomWriterExtensions.WriteBlock(writer, "- task: DownloadBuildArtifacts@0"))
             {
                 writer.WriteLine("displayName: Download Artifacts");
-                using (writer.WriteBlock("inputs:"))
+                using (AzurePipelinesCustomWriterExtensions.WriteBlock(writer, "inputs:"))
                 {
                     string[] parts = x.Split('/');
                     var path = parts.SkipLast(1).Join('/').SingleQuote();
@@ -59,6 +85,28 @@ protected override void WriteSteps(CustomFileWriter writer)
             }
         });
 
-        base.WriteSteps(writer);
+        using (writer.WriteBlock("- task: CmdLine@2"))
+        {
+            var arguments = $"{InvokedTargets.JoinSpace()} --skip";
+            if (PartitionName != null)
+                arguments += $" --test-partition $(System.JobPositionInPhase)";
+
+            using (writer.WriteBlock("inputs:"))
+            {
+                writer.WriteLine($"script: './{BuildCmdPath} {arguments}{ExtraArgs}'");
+            }
+        }
+
+        PublishArtifacts.ForEach(x =>
+        {
+            using (writer.WriteBlock("- task: PublishBuildArtifacts@1"))
+            {
+                using (writer.WriteBlock("inputs:"))
+                {
+                    writer.WriteLine($"artifactName: {x.Split('/').Last()}");
+                    writer.WriteLine($"pathtoPublish: {x.SingleQuote()}");
+                }
+            }
+        });
     }
 }