Merge branch 'master' into feature/informationalversion

Author: mgnslndh

azure-pipelines.yml

@@ -71,8 +71,22 @@ stages:
   - job: Publish
     pool:
       vmImage: windows-latest
+    strategy:
+      matrix:
+        CI:
+          TASK_NAME: 'CI'
+        NuGet:
+          TASK_NAME: 'NuGet'
+        Chocolatey:
+         TASK_NAME: 'Chocolatey'
+        Gem:
+          TASK_NAME: 'Gem'
+        Documentation:
+          TASK_NAME: 'Documentation'
     steps:
     - template: build/stages/publish.yml
+      parameters:
+        taskName: $(TASK_NAME)
 
 - stage: Release
   dependsOn:

build.cake

@@ -140,13 +140,64 @@ Task("Test")
 {
 });
 
+Task("Publish-CI")
+    .IsDependentOn("Publish-AppVeyor")
+    .IsDependentOn("Publish-AzurePipeline")
+    .Finally(() =>
+{
+    if (publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of GitVersion.");
+    }
+});
+
+Task("Publish-Gem")
+    .IsDependentOn("Publish-Gem-Internal")
+    .Finally(() =>
+{
+    if (publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of GitVersion.");
+    }
+});
+
+Task("Publish-NuGet")
+    .IsDependentOn("Publish-NuGet-Internal")
+    .Finally(() =>
+{
+    if (publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of GitVersion.");
+    }
+});
+
+Task("Publish-Chocolatey")
+    .IsDependentOn("Publish-Chocolatey-Internal")
+    .Finally(() =>
+{
+    if (publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of GitVersion.");
+    }
+});
+
+Task("Publish-Documentation")
+    .IsDependentOn("Publish-Documentation-Internal")
+    .Finally(() =>
+{
+    if (publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of GitVersion.");
+    }
+});
+
 Task("Publish")
     .IsDependentOn("Publish-AppVeyor")
     .IsDependentOn("Publish-AzurePipeline")
-    .IsDependentOn("Publish-NuGet")
-    .IsDependentOn("Publish-Chocolatey")
-    .IsDependentOn("Publish-Gem")
-    .IsDependentOn("Publish-Documentation")
+    .IsDependentOn("Publish-NuGet-Internal")
+    .IsDependentOn("Publish-Chocolatey-Internal")
+    .IsDependentOn("Publish-Gem-Internal")
+    .IsDependentOn("Publish-Documentation-Internal")
     .Finally(() =>
 {
     if (publishingError)

build.config

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-CAKE_VERSION=0.35
+CAKE_VERSION=0.36
 DOTNET_VERSION=2.1.802,3.1.100

build/publish.cake

@@ -81,7 +81,7 @@ Task("Publish-AzurePipeline")
     publishingError = true;
 });
 
-Task("Publish-Gem")
+Task("Publish-Gem-Internal")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem,        "Publish-Gem was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Gem works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Gem works only on AzurePipeline.")
@@ -109,7 +109,7 @@ Task("Publish-Gem")
     publishingError = true;
 });
 
-Task("Publish-NuGet")
+Task("Publish-NuGet-Internal")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishNuget,      "Publish-NuGet was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-NuGet works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-NuGet works only on AzurePipeline.")
@@ -147,7 +147,7 @@ Task("Publish-NuGet")
     publishingError = true;
 });
 
-Task("Publish-Chocolatey")
+Task("Publish-Chocolatey-Internal")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishChocolatey, "Publish-Chocolatey was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Chocolatey works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Chocolatey works only on AzurePipeline.")

build/stages/publish.yml

@@ -1,3 +1,6 @@
+parameters:
+  taskName: ''
+
 steps:
 - template: common-steps.yml
 - task: UseRubyVersion@0
@@ -12,7 +15,7 @@ steps:
     source: current
     path: $(Build.SourcesDirectory)
     artifact: storage
-- script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Publish
+- script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Publish-${{ parameters.taskName }}
   displayName: '[Publish]'
   env:
     GITHUB_TOKEN: $(GITHUB_TOKEN)
@@ -21,7 +24,6 @@ steps:
     CHOCOLATEY_API_KEY: $(CHOCOLATEY_API_KEY)
     CHOCOLATEY_API_URL: $(CHOCOLATEY_API_URL)
     RUBY_GEM_API_KEY: $(RUBY_GEM_API_KEY)
-    TFX_TOKEN: $(TFX_TOKEN)
     ENABLED_PUBLISH_GEM: $(ENABLED_PUBLISH_GEM)
     ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
     ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)

build/utils/utils.cake

@@ -45,7 +45,7 @@ public static bool IsOnMainBranch(this ICakeContext context)
     }
     else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
     {
-        repositoryBranch = buildSystem.TFBuild.Environment.Repository.Branch;
+        repositoryBranch = buildSystem.TFBuild.Environment.Repository.SourceBranchName;
     }
 
     context.Information("Repository Branch: {0}" , repositoryBranch);

build/wyam.cake

@@ -52,12 +52,12 @@ Task("Force-Publish-Documentation")
     PublishDocumentation(parameters);
 });
 
-Task("Publish-Documentation")
+Task("Publish-Documentation-Internal")
     .IsDependentOn("Clean-Documentation")
     .WithCriteria(() => DirectoryExists(MakeAbsolute(Directory("docs"))), "Wyam documentation directory is missing")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Documentation is ran only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Documentation is ran only on AzurePipeline.")
-    .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsPullRequest, "Publish-Documentation works only for non-PR commits.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Documentation works only for non-PR commits.")
     .Does<BuildParameters>((parameters) =>
 {
     // Check to see if any documentation has changed

docs/input/docs/configuration.md

@@ -137,6 +137,18 @@ When using `mode: ContinuousDeployment`, the value specified in
 `continuous-delivery-fallback-tag` will be used as the pre-release tag for
 branches which do not have one specified. Default set to `ci`.
 
+Just to clarify: For a build name without `...-ci-<buildnumber>` or in other
+words without a `PreReleaseTag` (ergo `"PreReleaseTag":""` in GitVersion's JSON output)
+at the end you would need to set `continuous-delivery-fallback-tag` to an empty string (`''`):
+
+```yaml
+mode: ContinuousDeployment
+continuous-delivery-fallback-tag: ''
+...
+```
+
+Doing so can be helpful if you use your `master` branch as a `release` branch.
+
 ### tag-prefix
 
 A regex which is used to trim git tags before processing (eg v1.0.0). Default is

src/GitVersion.sln.GhostDoc.xml

@@ -2,6 +2,7 @@
 using Shouldly;
 using GitVersion.Extensions;
 using GitVersion;
+using GitVersionCore.Tests.Helpers;
 
 namespace GitVersionCore.Tests
 {