Merge branch 'release/0.33.0' into main

Author: gep13

README.md

@@ -24,7 +24,7 @@ Cake (C# Make) is a build automation system with a C# DSL to do things like comp
 | Bitrise                     | MacOS         | ![Bitrise Build Status](https://app.bitrise.io/app/7a9d707b00881436/status.svg?token=m8zsF3tNONLaF03eHU-Ftg&branch=develop)                                                | ![Build Status](https://app.bitrise.io/app/804b431c1f27e0a0/status.svg?token=qKosHEaJAJEqzZcq4s5WRg&branch=develop)                                                        |
 | Bitrise                     | Linux         | ![Bitrise Build Status](https://app.bitrise.io/app/b811c91a26b1ea80/status.svg?token=zdwab0niOTRF4p3HcFYaxQ&branch=develop)                                                | ![Build Status](https://app.bitrise.io/app/5a406f34f22113c6/status.svg?token=TQPbsmA9yP-iJOhzunIP4w&branch=develop)                                                        |
 | MyGet Build Services        | Windows       | [![MyGet Build Status](https://www.myget.org/BuildSource/Badge/cake-myget-build-service?identifier=53513546-050e-45de-9500-f161c99df6e2)](https://www.myget.org/)   |                                                                                                                                                                |
-| Bitbucket Pipelines         | Linux         | [![Build Status](https://cakebitbucketpipelinesshield.azurewebsites.net/status/cakebuild/cake-integration-tests/develop)](https://cakebitbucketpipelinesshield.azurewebsites.net/url/cakebuild/cake-integration-tests/develop) | [![Build Status](https://cakebitbucketpipelinesshield.azurewebsites.net/status/cakebuild/cake-integration-tests/IntegrationTests_develop)](https://cakebitbucketpipelinesshield.azurewebsites.net/url/cakebuild/cake-integration-tests/IntegrationTests_develop) |
+| Bitbucket Pipelines         | Linux         | [![Build Status](https://cakebitbucketpipelinesshield.azurewebsites.net/status/cakebuild/cake-integration-tests/develop)](https://cakebitbucketpipelinesshield.azurewebsites.net/url/cakebuild/cake-integration-tests/develop) |  |
 | GitLab                      | Linux      | [![build status](https://gitlab.com/cake-build/cake/badges/develop/build.svg)](https://gitlab.com/cake-build/cake/builds) |                                                                                                                                                                |
 
 ## Code Coverage

ReleaseNotes.md

@@ -1,3 +1,47 @@
+### New in 0.33.0 (Released 2019/04/01)
+
+* 2514 Add additional report types for ReportGenerator
+* 2130 Add exceptions thrown to TaskTeardownContext
+* 2456 Add logging aliases to override the log verbosity
+* 2453 Unify pull request status across providers
+* 2440 Add EnvironmentVariable alias
+* 2400 Add globber pattern support to the #load directive
+* 2504 Update .NET Core SDK 2.1.505
+* 2487 Warn and skip code gen for duplicate aliases
+* 2481 FilePath and DirectoryPath implicit conversions should return null when passed null
+* 2473 ParseAssemblyInfo does not support .NET Core generated assembly info
+* 2468 DotNet commands do not respect the verbosity
+* 2439 HtmlInline_AzurePipelines and MHtml shares the same numeric value
+* 2432 Azure Pipelines build system not recognized with non-Windows jobs
+* 2088 VSWhere -requires and -products argument values are quoted but VSWhere doesn't support multiple values in quotes
+* 2507 Cake.CoreCLR can't handle whitespace in path
+* 2491 Add additional Azure DevOps (TFBuild) properties
+* 2484 Octopus Deploy 2019.1 and Spaces feature
+* 2478 Lock file arguments for NuGet and dotnet restore
+* 2474 TeamCityProvider.BuildProblem method should conform to TeamCity API
+* 2472 Expose ICakeConfiguration (or specific values like tools path) on context
+* 2465 Roundhouse dotnet tool does not run
+* 2463 DoesForEach don't support data context for items functions
+* 2462 Added unit tests for Cake.Core
+* 2459 Add MSBuildPath to NuGetRestoreSettings
+* 2449 ARM64 missing from MSBuild target platform
+* 2445 Add OnError
+* 2433 NugetRestore still using msbuild 15
+* 2429 Add provider name to BuildSystem
+* 2415 Add support for MSBuild options to enable RestoreLockedMode
+* 2393 MethodAliasGenerator doesn't generate parameter attributes
+* 2345 Allow NuGetRestoreSettings to opt out of setting -NonInteractive
+* 2270 Allow to listen and modify redirected standard output of a process
+* 2141 Add Verbosity property to GitVersionSettings
+* 2124 Add Support for IEnumerable tokens on TextTransformationExtensions
+* 2087 Include more detailed exception information when Exception is AggregateException
+* 2026 Support for additional SignTool flags
+* 2019 Clean up some parser tests
+* 1384 Enhancement: Add support for filtering files in Globbing alias
+* 820 Log tools command-line at higher log level (preferably default)
+* 2512 TFBuildPublishCodeCoverageData xml comments minor typo
+* 2025 The tool path for MSpec needs to be changed in the documentation
+
 ### New in 0.32.1 (Released 2019/01/04)
 
 * 2426 Chocolatey pack regression in Cake 0.32.0
@@ -81,7 +125,7 @@
 
 * 2140 DotNetCorePublish does not respect SelfContained DotNetCorePublishSettings property.
 * 2203 Add Octopus Deploy Promote release support.
-* 2095 Add "--skipnontestassemblies" funcionality to CAKE's NUnit3Settings as it exists in original nunit3 test runner.
+* 2095 Add "--skipnontestassemblies" funcionality to Cake's NUnit3Settings as it exists in original NUnit 3 test runner.
 * 2094 Add support for executing a single task without dependencies.
 * 2196 NuGet Repository information not settable in NuGet Pack.
 * 2185 Try to find vswhere.exe on the system if the tool is not registered.
@@ -118,13 +162,13 @@
 ### New in 0.27.0 (Released 2018/04/19)
 
 * 2078 Support expand environment variables in script pre-processor directives
-* 2047 Specify version during Nuget Updating
+* 2047 Specify version during NuGet Updating
 * 2005 Add entries for Setup/Teardown in report
 * 1908 Octopus Deploy tool does not support list-deployments call for octo.exe
 * 2116 Loading Newtonsoft.Json in Cake.CoreCLR throws during assembly loading
 * 2084 Cake does not load dependencies in correct order
 * 2082 Investigate NuGet local V3 cache
-* 2081 Possibility to override default nuget sources
+* 2081 Possibility to override default NuGet sources
 * 2079 Default sources not loaded if nuget_source is empty
 * 2119 DotNetCore Publish misses Force / Self contained / Sources settings
 * 2113 Error when loading tools without internet connection
@@ -187,7 +231,7 @@
 * 1943 Chocolatey package dependencies cannot be set using the ChocolateyPackSettings
 * 1936 Move to signing service v2
 * 1931 Allow passing a nuget.config as environment variable or in cake.config
-* 1924 Set UserAgent for in process nuget
+* 1924 Set UserAgent for in-process NuGet
 * 1922 GitVersion is missing AssemblySemFileVer
 * 1912 Support for DotCover Process Filter
 * 1910 MSBuild property values should escape carriage return and line feed
@@ -208,7 +252,7 @@
 * 1853 The "using static" directive doesn't compile
 * 1843 NuGetContentResolver should not return ref assemblies.
 * 1842 Params in URI pre-processor directives are case sensitive
-* 1838 Dependencies are installed but have no references added when using LoadDependencies=true with in process nuget client
+* 1838 Dependencies are installed but have no references added when using LoadDependencies=true with in process NuGet client
 * 1831 CleanDirectories Throws NullReferenceException When Token Is Null
 * 1815 Exception Message should be shown rather than "One or more errors occurred."
 * 1404 MsBuildSettings.WithProperty does not escape values
@@ -277,7 +321,7 @@
 * 1787 Add opt-out config information to assembly version verification error message
 * 1780 Fix typo in version.cake
 * 1727 Incorrect documentation for XmlPeek Alias
-* 1700 Update nuget license url
+* 1700 Update NuGet license url
 * 1525 Updated examples for DotNetCoreTest
 
 ### New in 0.21.1 (Released 2017/07/15)
@@ -637,7 +681,7 @@
 * Add DotCover Cover support
 * Add SpecFlow support
 * Add Jenkins CI build system support
-* Use V3 Nuget in bootstrapper
+* Use V3 NuGet in bootstrapper
 * Remove logging from task setup/teardown.
 * Update ReleaseNotes.md
 * Removed year from © in readme
@@ -664,7 +708,7 @@
 * Replace #if !UNIX with [WindowsFact]
 * Don't show delegating tasks in summary
 * Task Summary should include skipped tasks
-* Support for nuget packing of project files
+* Support for NuGet packing of project files
 * Add method to get relative paths (for paths)
 * Full Build/Publish Automation for Cake
 * Add GitVersion into build.cake
@@ -724,7 +768,7 @@
 * Got support for .cake files in GitHub.
 * Created a Visual Studio Code extension for Cake.
 * Created a VSTS extension for Cake.
-* Fixed issue with external nugets used directly via #addin directive.
+* Fixed issue with external NuGet packages used directly via #addin directive.
 * DupFinder: Added ability to fail the build on detected issues.
 * InspectCode: Added ability to fail the build on detected issues.
 * TextTransform now handles Regex special characters.

build.cake

@@ -7,7 +7,6 @@
 #addin "nuget:https://api.nuget.org/v3/index.json?package=Cake.Gitter&version=0.10.0"
 
 // Install tools.
-#tool "nuget:https://api.nuget.org/v3/index.json?package=gitreleasemanager&version=0.7.1"
 #tool "nuget:https://api.nuget.org/v3/index.json?package=coveralls.io&version=1.4.2"
 #tool "nuget:https://api.nuget.org/v3/index.json?package=OpenCover&version=4.6.519"
 #tool "nuget:https://api.nuget.org/v3/index.json?package=ReportGenerator&version=4.0.4"
@@ -16,6 +15,7 @@
 // Install .NET Core Global tools.
 #tool "dotnet:https://api.nuget.org/v3/index.json?package=GitVersion.Tool&version=4.0.1-beta1-58"
 #tool "dotnet:https://api.nuget.org/v3/index.json?package=SignClient&version=1.0.82"
+#tool "dotnet:https://api.nuget.org/v3/index.json?package=GitReleaseManager.Tool&version=0.8.0"
 
 // Load other scripts.
 #load "./build/parameters.cake"
@@ -250,7 +250,8 @@ Task("Validate-Version")
          fullFxExe,
          new ProcessSettings {
              Arguments = "--version",
-             RedirectStandardOutput = true
+             RedirectStandardOutput = true,
+             WorkingDirectory = parameters.Paths.Directories.ArtifactsBinFullFx
          },
          out fullFxOutput
      );
@@ -261,7 +262,8 @@ Task("Validate-Version")
          "dotnet",
          new ProcessSettings {
              Arguments = $"\"{coreFxExe}\" --version",
-             RedirectStandardOutput = true
+             RedirectStandardOutput = true,
+             WorkingDirectory = parameters.Paths.Directories.ArtifactsBinNetCore
          },
          out coreFxOutput
      );
@@ -314,7 +316,7 @@ Task("Create-Chocolatey-Packages")
         ChocolateyPack(package.NuspecPath, new ChocolateyPackSettings {
             Version = parameters.Version.SemVersion,
             ReleaseNotes = parameters.ReleaseNotes.Notes.ToArray(),
-            OutputDirectory = parameters.Paths.Directories.NugetRoot,
+            OutputDirectory = parameters.Paths.Directories.NuGetRoot,
             Files = (GetFiles(netFxFullArtifactPath + "/*.*") + GetFiles("./nuspec/*.txt") + GetFiles("./LICENSE"))
                                     .Select(file=>"../" + file.FullPath.Substring(curDirLength))
                                     .Select(file=> new ChocolateyNuSpecContent { Source = file })
@@ -339,7 +341,7 @@ Task("Create-NuGet-Packages")
 
         DotNetCorePack(project.FullPath, new DotNetCorePackSettings {
             Configuration = parameters.Configuration,
-            OutputDirectory = parameters.Paths.Directories.NugetRoot,
+            OutputDirectory = parameters.Paths.Directories.NuGetRoot,
             NoBuild = true,
             NoRestore = true,
             IncludeSymbols = true,
@@ -352,7 +354,7 @@ Task("Create-NuGet-Packages")
         Version = parameters.Version.SemVersion,
         ReleaseNotes = parameters.ReleaseNotes.Notes.ToArray(),
         BasePath = parameters.Paths.Directories.ArtifactsBinFullFx,
-        OutputDirectory = parameters.Paths.Directories.NugetRoot,
+        OutputDirectory = parameters.Paths.Directories.NuGetRoot,
         Symbols = true,
         NoPackageAnalysis = true
     });
@@ -365,7 +367,7 @@ Task("Create-NuGet-Packages")
         Version = parameters.Version.SemVersion,
         ReleaseNotes = parameters.ReleaseNotes.Notes.ToArray(),
         BasePath = netFxFullArtifactPath,
-        OutputDirectory = parameters.Paths.Directories.NugetRoot,
+        OutputDirectory = parameters.Paths.Directories.NuGetRoot,
         Symbols = false,
         NoPackageAnalysis = true,
         Files = GetFiles(netFxFullArtifactPath + "/*")
@@ -379,7 +381,7 @@ Task("Create-NuGet-Packages")
         Version = parameters.Version.SemVersion,
         ReleaseNotes = parameters.ReleaseNotes.Notes.ToArray(),
         BasePath = parameters.Paths.Directories.ArtifactsBinNetCore,
-        OutputDirectory = parameters.Paths.Directories.NugetRoot,
+        OutputDirectory = parameters.Paths.Directories.NuGetRoot,
         Symbols = true,
         NoPackageAnalysis = true
     });
@@ -392,7 +394,7 @@ Task("Create-NuGet-Packages")
         Version = parameters.Version.SemVersion,
         ReleaseNotes = parameters.ReleaseNotes.Notes.ToArray(),
         BasePath = netCoreFullArtifactPath,
-        OutputDirectory = parameters.Paths.Directories.NugetRoot,
+        OutputDirectory = parameters.Paths.Directories.NuGetRoot,
         Symbols = false,
         NoPackageAnalysis = true,
         Files = GetFiles(netCoreFullArtifactPath + "/**/*")
@@ -403,7 +405,7 @@ Task("Create-NuGet-Packages")
 
     DotNetCorePack("./src/Cake/Cake.Tool.csproj", new DotNetCorePackSettings {
         Configuration = parameters.Configuration,
-        OutputDirectory = parameters.Paths.Directories.NugetRoot,
+        OutputDirectory = parameters.Paths.Directories.NuGetRoot,
         IncludeSymbols = true,
         MSBuildSettings = msBuildSettings
     });
@@ -433,7 +435,7 @@ Task("Sign-Binaries")
     var filter = File("./signclient.filter");
 
     // Get the files to sign.
-    var files = GetFiles(string.Concat(parameters.Paths.Directories.NugetRoot, "/", "*.nupkg"))
+    var files = GetFiles(string.Concat(parameters.Paths.Directories.NuGetRoot, "/", "*.nupkg"))
         + parameters.Paths.Files.ZipArtifactPathDesktop
         + parameters.Paths.Files.ZipArtifactPathCoreClr;
 
@@ -471,7 +473,7 @@ Task("Upload-AppVeyor-Artifacts")
 {
     AppVeyor.UploadArtifact(parameters.Paths.Files.ZipArtifactPathDesktop);
     AppVeyor.UploadArtifact(parameters.Paths.Files.ZipArtifactPathCoreClr);
-    foreach(var package in GetFiles(parameters.Paths.Directories.NugetRoot + "/*"))
+    foreach(var package in GetFiles(parameters.Paths.Directories.NuGetRoot + "/*"))
     {
         AppVeyor.UploadArtifact(package);
     }
@@ -542,7 +544,7 @@ Task("Publish-NuGet")
         throw new InvalidOperationException("Could not resolve NuGet API url.");
     }
 
-    foreach(var package in parameters.Packages.Nuget)
+    foreach(var package in parameters.Packages.NuGet)
     {
         // Push the package.
         NuGetPush(package.PackagePath, new NuGetPushSettings {

build.config

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-CAKE_VERSION=0.31.0
-DOTNET_VERSION=2.1.502
+CAKE_VERSION=0.32.1
+DOTNET_VERSION=2.1.505

build/packages.cake

@@ -1,7 +1,7 @@
 public class BuildPackages
 {
     public ICollection<BuildPackage> All { get; private set; }
-    public ICollection<BuildPackage> Nuget { get; private set; }
+    public ICollection<BuildPackage> NuGet { get; private set; }
     public ICollection<BuildPackage> Chocolatey { get; private set; }
 
     public static BuildPackages GetPackages(
@@ -10,14 +10,14 @@ public class BuildPackages
         string[] packageIds,
         string[] chocolateyPackageIds)
     {
-        var toNugetPackage = BuildPackage(nugetRooPath, semVersion);
+        var toNuGetPackage = BuildPackage(nugetRooPath, semVersion);
         var toChocolateyPackage = BuildPackage(nugetRooPath, semVersion, isChocolateyPackage: true);
-        var nugetPackages = packageIds.Select(toNugetPackage).ToArray();
+        var nugetPackages = packageIds.Select(toNuGetPackage).ToArray();
         var chocolateyPackages = chocolateyPackageIds.Select(toChocolateyPackage).ToArray();
 
         return new BuildPackages {
             All = nugetPackages.Union(chocolateyPackages).ToArray(),
-            Nuget = nugetPackages,
+            NuGet = nugetPackages,
             Chocolatey = chocolateyPackages
         };
     }

build/parameters.cake

@@ -74,7 +74,7 @@ public class BuildParameters
         Paths = BuildPaths.GetPaths(context, Configuration, Version.SemVersion);
 
         Packages = BuildPackages.GetPackages(
-            Paths.Directories.NugetRoot,
+            Paths.Directories.NuGetRoot,
             Version.SemVersion,
             new [] { "Cake", "Cake.Core", "Cake.Common", "Cake.Testing", "Cake.CoreCLR", "Cake.NuGet", "Cake.Tool" },
             new [] { "cake.portable" });

build/paths.cake

@@ -87,7 +87,7 @@ public class BuildDirectories
 {
     public DirectoryPath Artifacts { get; }
     public DirectoryPath TestResults { get; }
-    public DirectoryPath NugetRoot { get; }
+    public DirectoryPath NuGetRoot { get; }
     public DirectoryPath ArtifactsBin { get; }
     public DirectoryPath ArtifactsBinFullFx { get; }
     public DirectoryPath ArtifactsBinNetCore { get; }
@@ -108,7 +108,7 @@ public class BuildDirectories
     {
         Artifacts = artifactsDir;
         TestResults = testResultsDir;
-        NugetRoot = nugetRoot;
+        NuGetRoot = nugetRoot;
         ArtifactsBin = artifactsBinDir;
         ArtifactsBinFullFx = artifactsBinFullFx;
         ArtifactsBinNetCore = artifactsBinNetCore;
@@ -117,7 +117,7 @@ public class BuildDirectories
         ToClean = new[] {
             Artifacts,
             TestResults,
-            NugetRoot,
+            NuGetRoot,
             ArtifactsBin,
             ArtifactsBinFullFx,
             ArtifactsBinNetCore,

build/version.cake

@@ -17,7 +17,7 @@ public class BuildVersion
         string semVersion = null;
         string milestone = null;
 
-        if (context.IsRunningOnWindows() && !parameters.SkipGitVersion)
+        if (!parameters.SkipGitVersion)
         {
             context.Information("Calculating Semantic Version");
             if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)

global.json

@@ -3,6 +3,6 @@
         "src"
     ],
     "sdk": {
-        "version": "2.1.502"
+        "version": "2.1.505"
     }
 }

src/Cake.Common.Tests/Fixtures/Build/BitbucketPipelinesInfoFixture.cs

@@ -22,6 +22,9 @@ public BitbucketPipelinesInfoFixture()
             Environment.GetEnvironmentVariable("BITBUCKET_REPO_OWNER").Returns("cakebuild");
             Environment.GetEnvironmentVariable("BITBUCKET_BRANCH").Returns("develop");
             Environment.GetEnvironmentVariable("BITBUCKET_TAG").Returns("BitbucketPipelines");
+
+            // BitbucketPipelines PullRequestInfo
+            Environment.GetEnvironmentVariable("BITBUCKET_PR_ID").Returns("1");
         }
 
         public BitbucketPipelinesEnvironmentInfo CreateEnvironmentInfo()
@@ -33,5 +36,10 @@ public BitbucketPipelinesRepositoryInfo CreateRepositoryInfo()
         {
             return new BitbucketPipelinesRepositoryInfo(Environment);
         }
+
+        public BitbucketPipelinesPullRequestInfo CreatePullRequestInfo()
+        {
+            return new BitbucketPipelinesPullRequestInfo(Environment);
+        }
     }
 }