Merge branch 'hotfix/0.23.3'

Author: matkoch

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [0.23.3] / 2019-11-02
+- Fixed separator in Azure Pipelines service messages
+
 ## [0.23.2] / 2019-11-02
 - Fixed ensuring of existing directory for generation of configuration files
 - Fixed packaging of `MSBuildTaskRunner` in `Nuke.Common`
@@ -449,7 +452,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.23.2...HEAD
+[vNext]: https://github.com/nuke-build/common/compare/0.23.3...HEAD
+[0.23.3]: https://github.com/nuke-build/common/compare/0.23.2...0.23.3
 [0.23.2]: https://github.com/nuke-build/common/compare/0.23.1...0.23.2
 [0.23.1]: https://github.com/nuke-build/common/compare/0.23.0...0.23.1
 [0.23.0]: https://github.com/nuke-build/common/compare/0.22.2...0.23.0

build/Build.cs

@@ -195,8 +195,9 @@ from framework in project.GetTargetFrameworks()
 
             OutputDirectory.GlobFiles("*.trx")
                 .ForEach(x => AzurePipelines?.PublishTestResults(
-                    new[] { x.ToString() },
-                    $"{Path.GetFileNameWithoutExtension(x)} ({AzurePipelines.StageDisplayName})"));
+                    type: "VSTest",
+                    title: $"{Path.GetFileNameWithoutExtension(x)} ({AzurePipelines.StageDisplayName})",
+                    files: new[] { x.ToString() }));
         });
 
     string CoverageReportDirectory => OutputDirectory / "coverage-report";

source/Nuke.Common/CI/AzurePipelines/AzurePipelines.cs

@@ -139,12 +139,12 @@ public void LogWarning(
         }
 
         public void PublishTestResults(
-            IEnumerable<string> files,
             string title,
+            string type,
+            IEnumerable<string> files,
             bool? mergeResults = null,
             string platform = null,
             string configuration = null,
-            string type = null,
             bool? publishRunAttachments = null)
         {
             WriteCommand(
@@ -155,7 +155,7 @@ public void PublishTestResults(
                     .AddKeyValue("mergeResults", mergeResults)
                     .AddKeyValue("platform", platform)
                     .AddKeyValue("config", configuration)
-                    .AddKeyValue("runTitle", title)
+                    .AddKeyValue("runTitle", title.SingleQuote())
                     .AddKeyValue("publishRunAttachments", publishRunAttachments));
         }
 
@@ -193,22 +193,19 @@ public void WriteCommand(
             string message = null,
             Func<IDictionary<string, object>, IDictionary<string, object>> dictionaryConfigurator = null)
         {
-            var escapedTokens = new[] { command };
-
-            if (dictionaryConfigurator != null)
-            {
-                escapedTokens = escapedTokens.Concat(dictionaryConfigurator
+            var escapedTokens =
+                dictionaryConfigurator?
                     .Invoke(new Dictionary<string, object>())
                     .Where(x => x.Value != null)
-                    .Select(x => $"{x.Key}={EscapeValue(x.Value.ToString())}")).ToArray();
-            }
+                    .Select(x => $"{x.Key}={EscapeValue(x.Value.ToString())}").ToArray()
+                ?? new string[0];
 
-            Write(escapedTokens, message);
+            Write(command, escapedTokens, message);
         }
 
-        private void Write(string[] escapedTokens, [CanBeNull] string message)
+        private void Write(string command, string[] escapedTokens, [CanBeNull] string message)
         {
-            _messageSink.Invoke($"##vso[{escapedTokens.JoinSpace()}]{EscapeMessage(message)}");
+            _messageSink.Invoke($"##vso[{command} {escapedTokens.Join(";")}]{EscapeMessage(message)}");
         }
 
         private string EscapeMessage([CanBeNull] string data)