Separated usage of logger and setting it

Author: JakeGinnivan

GitVersionCore.Tests/ModuleInitializer.cs

@@ -11,8 +11,6 @@ public static class ModuleInitializer
     /// </summary>
     public static void Initialize()
     {
-        Logger.WriteInfo = s => Trace.WriteLine(s);
-        Logger.WriteError = s => Trace.WriteLine(s);
-        Logger.WriteWarning = s => Trace.WriteLine(s);
+        Logger.SetLoggers(s => Trace.WriteLine(s), s => Trace.WriteLine(s), s => Trace.WriteLine(s));
     }
 }

GitVersionCore/Logger.cs

@@ -4,15 +4,22 @@ namespace GitVersion
 
     public static class Logger
     {
-        public static Action<string> WriteInfo;
-        public static Action<string> WriteWarning;
-        public static Action<string> WriteError;
+        public static Action<string> WriteInfo { get; private set; }
+        public static Action<string> WriteWarning { get; private set; }
+        public static Action<string> WriteError { get; private set; }
 
         static Logger()
         {
             Reset();
         }
 
+        public static void SetLoggers(Action<string> info, Action<string> warn, Action<string> error)
+        {
+            WriteInfo = info;
+            WriteWarning = warn;
+            WriteError = error;
+        }
+
         public static void Reset()
         {
             WriteInfo = s => { throw new Exception("Logger not defined."); };

GitVersionExe.Tests/GitPreparerTests.cs

@@ -11,9 +11,7 @@ public class GitPreparerTests
 {
     public GitPreparerTests()
     {
-        Logger.WriteInfo = s => { };
-        Logger.WriteWarning = s => { };
-        Logger.WriteError = s => { };
+        Logger.SetLoggers(s => { }, s => { }, s => { });
     }
 
     const string DefaultBranchName = "master";

GitVersionExe/Program.cs

@@ -126,9 +126,10 @@ static void ConfigureLogging(Arguments arguments)
                 }
             }
 
-            Logger.WriteInfo = s => writeActions.ForEach(a => a(s));
-            Logger.WriteWarning = s => writeActions.ForEach(a => a(s));
-            Logger.WriteError = s => writeActions.ForEach(a => a(s));
+            Logger.SetLoggers(
+                s => writeActions.ForEach(a => a(s)),
+                s => writeActions.ForEach(a => a(s)),
+                s => writeActions.ForEach(a => a(s)));
         }
 
         static void WriteLogEntry(Arguments arguments, string s)

GitVersionTask.Tests/ModuleInitializer.cs

@@ -11,9 +11,7 @@ public static class ModuleInitializer
     /// </summary>
     public static void Initialize()
     {
-        Logger.WriteInfo = s => Trace.WriteLine(s);
-        Logger.WriteError = s => Trace.WriteLine(s);
-        Logger.WriteWarning = s => Trace.WriteLine(s);
+        Logger.SetLoggers(s => Trace.WriteLine(s), s => Trace.WriteLine(s), s => Trace.WriteLine(s));
     }
 
 }

GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

@@ -35,8 +35,10 @@ public UpdateAssemblyInfo()
             CompileFiles = new ITaskItem[] { };
             logger = new TaskLogger(this);
             fileSystem = new FileSystem();
-            Logger.WriteInfo = this.LogInfo;
-            Logger.WriteWarning = this.LogWarning;
+            Logger.SetLoggers(
+                this.LogInfo,
+                this.LogWarning,
+                s => this.LogError(s));
         }
 
         public override bool Execute()

GitVersionTask/GetVersion.cs

@@ -78,8 +78,10 @@ public GetVersion()
         {
             logger = new TaskLogger(this);
             fileSystem = new FileSystem();
-            Logger.WriteInfo = this.LogInfo;
-            Logger.WriteWarning = this.LogWarning;
+            Logger.SetLoggers(
+                this.LogInfo,
+                this.LogWarning,
+                s => this.LogError(s));
         }
 
         public override bool Execute()

GitVersionTask/WriteVersionInfoToBuildLog.cs

@@ -22,8 +22,10 @@ public WriteVersionInfoToBuildLog()
         {
             logger = new TaskLogger(this);
             fileSystem = new FileSystem();
-            Logger.WriteInfo = this.LogInfo;
-            Logger.WriteWarning = this.LogWarning;
+            Logger.SetLoggers(
+                this.LogInfo,
+                this.LogWarning,
+                s => this.LogError(s));
         }
 
         public override bool Execute()