Merge branch 'release/0.16.0'

Author: matkoch

CHANGELOG.md

@@ -6,6 +6,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [0.16.0] / 2019-01-30
+- Changed setting of default working directory for process invocations
+- Changed `Logger.Log` to `Logger.Normal`
+- Added `NukeBuild.Execute` overload without default target
+- Added `ContinueOnFailure` and `AssuredAfterFailure` as target definition methods
+- Added `AbsolutePath` extensions for `GlobDirectories/Files`
+- Added `AggregateException` handling to show number as prefix when flattening
+- Added `AnsiColorOutputSink` for Bitrise, TeamCity, Travis, TeamServices
+- Added `ProjectModelTasks.ParseProject` based on `Microsoft.Build` packages
+- Added `LocalExecutableAttribute`
+- Added `degreeOfParallelism` and `completeOnError` for combinatorial invocations
+- Added `[Tool].[Tool]Logger` as settable field for custom logging
+- Added `VerbosityMappingAttribute`
+- Added format-property map for CLI tasks
+- Fixed `EnsureCleanDirectory` to only clean instead of delete and recreate
+- Fixed `TeamCityOutputSink` to not report errors as build problems
+- Fixed `SolutionAttribute` to resolve first by constructor argument
+- Fixed `Xunit2ParallelOption` to use lower-case text
+
 ## [0.15.0] / 2019-01-16
 - Changed `OnlyWhen` to `OnlyWhenStatic` and `OnlyWhenDynamic`
 - Changed `graph` parameter to `plan`
@@ -268,7 +287,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added CLT tasks for Git
 - Fixed background color in console output
 
-[vNext]: https://github.com/nuke-build/common/compare/0.15.0...HEAD
+[vNext]: https://github.com/nuke-build/common/compare/0.16.0...HEAD
+[0.16.0]: https://github.com/nuke-build/common/compare/0.15.0...0.16.0
 [0.15.0]: https://github.com/nuke-build/common/compare/0.14.1...0.15.0
 [0.14.1]: https://github.com/nuke-build/common/compare/0.14.0...0.14.1
 [0.14.0]: https://github.com/nuke-build/common/compare/0.13.0...0.14.0

build/Build.cs

@@ -1,4 +1,4 @@
-// Copyright 2018 Maintainers of NUKE.
+// Copyright 2018 Maintainers of NUKE.
 // Distributed under the MIT License.
 // https://github.com/nuke-build/nuke/blob/master/LICENSE
 
@@ -24,11 +24,11 @@
 using static Nuke.Common.Tools.InspectCode.InspectCodeTasks;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
-using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.Tools.Slack.SlackTasks;
 
 // ReSharper disable HeapView.DelegateAllocation
 
+// [DotNetVerbosityMapping]
 partial class Build : NukeBuild
 {
     public static int Main() => Execute<Build>(x => x.Pack);
@@ -59,7 +59,7 @@ partial class Build : NukeBuild
         .Before(Restore)
         .Executes(() =>
         {
-            DeleteDirectories(GlobDirectories(SourceDirectory, "*/bin", "*/obj"));
+            SourceDirectory.GlobDirectories("*/bin", "*/obj").ForEach(DeleteDirectory);
             EnsureCleanDirectory(OutputDirectory);
         });
 
@@ -131,13 +131,14 @@ from framework in project.GetMSBuildProject().GetTargetFrameworks()
         .DependsOn(Compile)
         .Executes(() =>
         {
-            Solution.GetProjects("*.Tests")
-                .ForEach(x => DotNetTest(s => s
-                    .SetProjectFile(x)
-                    .SetConfiguration(Configuration)
-                    .EnableNoBuild()
-                    .SetLogger("trx")
-                    .SetResultsDirectory(OutputDirectory)));
+            DotNetTest(s => s
+                .SetConfiguration(Configuration)
+                .EnableNoBuild()
+                .SetLogger("trx")
+                .SetResultsDirectory(OutputDirectory)
+                .CombineWith(
+                    Solution.GetProjects("*.Tests"), (cs, v) => cs
+                        .SetProjectFile(v)));
         });
 
     Target Analysis => _ => _
@@ -166,13 +167,15 @@ from framework in project.GetMSBuildProject().GetTargetFrameworks()
                         GitRepository.Branch.StartsWithOrdinalIgnoreCase(HotfixBranchPrefix))
         .Executes(() =>
         {
-            GlobFiles(OutputDirectory, "*.nupkg").NotEmpty()
-                .Where(x => !x.EndsWith(".symbols.nupkg"))
-                .ForEach(x => DotNetNuGetPush(s => s
-                    .SetTargetPath(x)
+            DotNetNuGetPush(s => s
                     .SetSource(Source)
                     .SetSymbolSource(SymbolSource)
-                    .SetApiKey(ApiKey)));
+                    .SetApiKey(ApiKey)
+                    .CombineWith(
+                        OutputDirectory.GlobFiles("*.nupkg").NotEmpty(), (cs, v) => cs
+                            .SetTargetPath(v)),
+                degreeOfParallelism: 5,
+                completeOnFailure: true);
 
             if (GitRepository.Branch.EqualsOrdinalIgnoreCase(MasterBranch))
             {

build/specifications/DotNet.json

@@ -13,7 +13,7 @@
   "name": "DotNet",
   "officialUrl": "https://docs.microsoft.com/en-us/dotnet/core/tools/",
   "pathExecutable": "dotnet",
-  "logLevelParsing": true,
+  "customLogger": true,
   "tasks": [
     {
       "help": "The <c>dotnet test</c> command is used to execute unit tests in a given project. Unit tests are console application projects that have dependencies on the unit test framework (for example, MSTest, NUnit, or xUnit) and the dotnet test runner for the unit testing framework. These are packaged as NuGet packages and are restored as ordinary dependencies for the project.",

build/specifications/SignTool.json

@@ -218,7 +218,7 @@
           {
             "name": "AuthenticodeDigestSignPassUnmodified",
             "type": "string",
-            "format": "dmdf {value}",
+            "format": "/dmdf {value}",
             "help": "When used with the <c>/dlib</c> option, passes the file's contents to the AuthenticodeDigestSign function without modification."
           },
           {

build/specifications/SonarScanner.json

@@ -65,6 +65,27 @@
             "format": "/d:sonar.verbose={value}",
             "help": "Sets the logging verbosity to detailed. Add this argument before sending logs for troubleshooting."
           },
+          {
+            "name": "VSTestReports",
+            "type": "List<string>",
+            "format": "/d:sonar.cs.vstest.reportsPaths={value}",
+            "separator": ",",
+            "help": "Comma separated list of VSTest report files to include."
+          },
+          {
+            "name": "NUnitTestReports",
+            "type": "List<string>",
+            "format": "/d:sonar.cs.nunit.reportsPaths={value}",
+            "separator": ",",
+            "help": "Comma separated list of NUnit report files to include."
+          },
+          {
+            "name": "XUnitTestReports",
+            "type": "List<string>",
+            "format": "/d:sonar.cs.xunit.reportsPaths={value}",
+            "separator": ",",
+            "help": "Comma separated list of xUnit report files to include."
+          },
           {
             "name": "CoverageExclusions",
             "type": "List<string>",

build/specifications/Unity.json

@@ -325,7 +325,6 @@
     {
       "name": "UnityBaseSettings",
       "extensionMethods": true,
-      "argumentConstruction": true,
       "properties": [
         {
           "name": "LogFile",

build/specifications/Xunit.json

@@ -181,10 +181,10 @@
     {
       "name": "Xunit2ParallelOption",
       "values": [
-        "None",
-        "Collections",
-        "Assemblies",
-        "All"
+        "none",
+        "collections",
+        "assemblies",
+        "all"
       ]
     },
     {

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.300"
+    "version": "2.2.101"
   }
 }

source/Directory.Build.props

@@ -16,9 +16,9 @@
     <Authors>Matthias Koch, Sebastian Karasek</Authors>
     <Copyright>Copyright $([System.DateTime]::Now.Year) Maintainers of NUKE</Copyright>
     <PackageTags>build automation continuous-integration tools orchestration</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://nuke.build</PackageProjectUrl>
     <RepositoryUrl>https://github.com/nuke-build/nuke</RepositoryUrl>
-    <PackageLicenseUrl>https://github.com/nuke-build/nuke/blob/master/LICENSE</PackageLicenseUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/nuke-build/nuke/master/icon.png</PackageIconUrl>
   </PropertyGroup>
 

source/Nuke.CodeGeneration/Generators/DataClassGenerator.cs

@@ -18,7 +18,7 @@ public static class DataClassGenerator
     {
         public static void Run(DataClass dataClass, ToolWriter toolWriter)
         {
-            if (dataClass.ArgumentConstruction)
+            if (dataClass.IsToolSettingsClass)
             {
                 foreach (var property in dataClass.Properties)
                 {
@@ -40,7 +40,7 @@ public static void Run(DataClass dataClass, ToolWriter toolWriter)
                 .WriteLine($"public partial class {dataClass.Name} : {baseType}")
                 .WriteBlock(w => w
                     .WriteToolPath()
-                    .WriteLogLevelParser()
+                    .WriteLogger()
                     .ForEach(dataClass.Properties, WritePropertyDeclaration)
                     .WriteConfigureArguments())
                 .WriteLine("#endregion");
@@ -88,14 +88,14 @@ private static DataClassWriter WriteToolPath(this DataClassWriter writer)
                 .WriteLine($"public override string ToolPath => base.ToolPath ?? {resolver};");
         }
 
-        private static DataClassWriter WriteLogLevelParser(this DataClassWriter writer)
+        private static DataClassWriter WriteLogger(this DataClassWriter writer)
         {
-            var tool = writer.DataClass.Tool;
-            if (!tool.LogLevelParsing)
+            if (!writer.DataClass.IsToolSettingsClass)
                 return writer;
-
-            var logLevelParser = $"{tool.GetClassName()}.ParseLogLevel";
-            return writer.WriteLine($"protected override Func<string, LogLevel> LogLevelParser => {logLevelParser};");
+            
+            var tool = writer.DataClass.Tool;
+            var logger = $"{tool.GetClassName()}.{tool.Name}Logger";
+            return writer.WriteLine($"public override Action<OutputType, string> CustomLogger => {logger};");
         }
 
         private static void WritePropertyDeclaration(DataClassWriter writer, Property property)