Merge branch 'hotfix/0.19.2' into main

Author: devlead

ReleaseNotes.md

@@ -1,3 +1,7 @@
+### New on 0.19.2 (Released 2017/04/01)
+
+* 1546 MSBuild Logger Path are not correctly quoted
+
 ### New on 0.19.1 (Released 2017/03/24)
 
 * 1543 VSWhere aliases should return Directory Paths and not File Paths

src/Cake.Common.Tests/Unit/Tools/MSBuild/MSBuildRunnerTests.cs

@@ -846,7 +846,7 @@ public void Should_Append_Logger_To_Process_Arguments()
                 var result = fixture.Run();
 
                 // Then
-                Assert.Equal("/v:normal /target:Build /logger:B,A;C /logger:E,D /logger:F " +
+                Assert.Equal("/v:normal /target:Build /logger:B,\"A\";C /logger:E,\"D\" /logger:\"F\" " +
                              "\"/Working/src/Solution.sln\"", result.Args);
             }
 

src/Cake.Common/Tools/MSBuild/MSBuildRunner.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using Cake.Core;
 using Cake.Core.Diagnostics;
 using Cake.Core.IO;
@@ -126,10 +127,7 @@ private ProcessArgumentBuilder GetArguments(FilePath solution, MSBuildSettings s
             // Got any file loggers?
             if (settings.FileLoggers.Count > 0)
             {
-                var arguments = settings.FileLoggers.Select((logger, index) =>
-                {
-                    return GetLoggerArgument(index, logger);
-                });
+                var arguments = settings.FileLoggers.Select((logger, index) => GetLoggerArgument(index, logger));
 
                 foreach (var argument in arguments)
                 {
@@ -163,20 +161,21 @@ private static string GetLoggerArgument(int index, MSBuildFileLogger logger)
 
         private static string GetLoggerArgument(MSBuildLogger logger)
         {
-            string argument = "/logger:";
+            var argumentBuilder = new StringBuilder("/logger:");
             if (!string.IsNullOrWhiteSpace(logger.Class))
             {
-                argument += string.Format("{0},{1}", logger.Class, logger.Assembly);
-            }
-            else
-            {
-                argument += logger.Assembly;
+                argumentBuilder.Append(logger.Class);
+                argumentBuilder.Append(",");
             }
+
+            argumentBuilder.Append(logger.Assembly.Quote());
+
             if (!string.IsNullOrWhiteSpace(logger.Parameters))
             {
-                argument += string.Concat(";", logger.Parameters);
+                argumentBuilder.Append(";");
+                argumentBuilder.Append(logger.Parameters);
             }
-            return argument;
+            return argumentBuilder.ToString();
         }
 
         private static string GetPlatformName(PlatformTarget platform, bool isSolution)

src/SolutionInfo.cs

@@ -10,7 +10,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[assembly: AssemblyVersion("0.19.1.0")]
-[assembly: AssemblyFileVersion("0.19.1.0")]
-[assembly: AssemblyInformationalVersion("0.19.1-beta.1+1.Branch.hotfix/0.19.1.Sha.a0503c593c4eb2b2beb80b2bc913d0a3cd932c83")]
+[assembly: AssemblyVersion("0.19.2.0")]
+[assembly: AssemblyFileVersion("0.19.2.0")]
+[assembly: AssemblyInformationalVersion("0.19.2-beta.1+2.Branch.hotfix/0.19.2.Sha.058ef5abd76a1513b53e4737e4d3973339c00e7c")]
 [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]