added MsBuildAppender for logger

Author: arturcic

src/GitVersionCore/GitVersionCalculator.cs

@@ -65,21 +65,6 @@ public VersionVariables CalculateVersionVariables()
             return GetCachedGitVersionInfo(arguments.TargetBranch, arguments.CommitId, arguments.OverrideConfig, arguments.NoCache);
         }
 
-        public bool TryCalculateVersionVariables(out VersionVariables versionVariables)
-        {
-            try
-            {
-                versionVariables = CalculateVersionVariables();
-                return true;
-            }
-            catch (Exception ex)
-            {
-                log.Warning("Could not determine assembly version: " + ex);
-                versionVariables = null;
-                return false;
-            }
-        }
-
         private string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch, bool isDynamicRepository)
         {
             if (buildServer == null)

src/GitVersionCore/IGitVersionCalculator.cs

@@ -5,6 +5,5 @@ namespace GitVersion
     public interface IGitVersionCalculator
     {
         VersionVariables CalculateVersionVariables();
-        bool TryCalculateVersionVariables(out VersionVariables versionVariables);
     }
 }

src/GitVersionCore/Logging/FileAppender.cs

@@ -1,12 +1,10 @@
 using System;
 using System.IO;
-using System.Threading;
 
 namespace GitVersion.Logging
 {
     public class FileAppender : ILogAppender
     {
-        private static readonly ReaderWriterLock Locker = new ReaderWriterLock();
         private readonly string filePath;
 
         public FileAppender(string filePath)

src/GitVersionTask/GitVersionTaskExecutor.cs

@@ -25,7 +25,7 @@ public GitVersionTaskExecutor(IFileSystem fileSystem, ILog log, IBuildServerReso
 
         public void GetVersion(GetVersion task)
         {
-            gitVersionCalculator.TryCalculateVersionVariables(out var versionVariables);
+            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var outputType = typeof(GetVersion);
             foreach (var variable in versionVariables)
             {
@@ -38,7 +38,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
             FileHelper.DeleteTempFiles();
             FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
 
-            gitVersionCalculator.TryCalculateVersionVariables(out var versionVariables);
+            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
 
             task.AssemblyInfoTempFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
@@ -50,7 +50,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
 
         public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
         {
-            gitVersionCalculator.TryCalculateVersionVariables(out var versionVariables);
+            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
 
             task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
@@ -62,7 +62,7 @@ public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
         {
             var logger = task.Log;
 
-            gitVersionCalculator.TryCalculateVersionVariables(out var versionVariables);
+            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
             var buildServer = buildServerResolver.Resolve();
             if (buildServer != null)
             {

src/GitVersionTask/GitVersionTasks.cs

@@ -1,6 +1,7 @@
 using System;
 using GitVersion.Exceptions;
 using GitVersion.Extensions;
+using GitVersion.Logging;
 using GitVersion.MSBuildTask.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -24,6 +25,8 @@ private static bool ExecuteGitVersionTask<T>(T task, Action<IGitVersionTaskExecu
             try
             {
                 var sp = BuildServiceProvider(task);
+                var log = sp.GetService<ILog>();
+                log.AddLogAppender(new MsBuildAppender(taskLog));
                 var gitVersionTaskExecutor = sp.GetService<IGitVersionTaskExecutor>();
 
                 action(gitVersionTaskExecutor);

src/GitVersionTask/MsBuildAppender.cs

@@ -0,0 +1,52 @@
+using System;
+using Microsoft.Build.Utilities;
+
+namespace GitVersion.Logging
+{
+    public class MsBuildAppender : ILogAppender
+    {
+        private readonly TaskLoggingHelper taskLog;
+
+        public MsBuildAppender(TaskLoggingHelper taskLog)
+        {
+            this.taskLog = taskLog;
+        }
+
+        public void WriteTo(LogLevel level, string message)
+        {
+            try
+            {
+                if (level != LogLevel.None)
+                {
+                    WriteLogEntry(level, message);
+                }
+            }
+            catch (Exception)
+            {
+                // 
+            }
+        }
+
+        private void WriteLogEntry(LogLevel level, string str)
+        {
+            var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}\r\n";
+            switch (level)
+            {
+                case LogLevel.None:
+                    break;
+                case LogLevel.Error:
+                    taskLog.LogError(contents);
+                    break;
+                case LogLevel.Warn:
+                    taskLog.LogWarning(contents);
+                    break;
+                case LogLevel.Info:
+                case LogLevel.Debug:
+                    taskLog.LogMessage(contents);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(level), level, null);
+            }
+        }
+    }
+}