fix verbosity help information

Author: arturcic

src/GitVersionCore/Logging/ConsoleAppender.cs

@@ -23,23 +23,23 @@ public void WriteTo(LogLevel level, string message)
                     Console.BackgroundColor = backgroundColor;
                     Console.ForegroundColor = foregroundColor;
 
-                    if (level == LogLevel.Error)
+                    if (level == LogLevel.Error || level == LogLevel.Fatal)
                     {
                         Console.Error.Write(message);
                     }
-                    else if (level != LogLevel.None)
+                    else
                     {
                         Console.Write(message);
                     }
                 }
                 finally
                 {
                     Console.ResetColor();
-                    if (level == LogLevel.Error)
+                    if (level == LogLevel.Error || level == LogLevel.Fatal)
                     {
                         Console.Error.WriteLine();
                     }
-                    else if (level != LogLevel.None)
+                    else
                     {
                         Console.WriteLine();
                     }

src/GitVersionCore/Logging/FileAppender.cs

@@ -24,14 +24,11 @@ public void WriteTo(LogLevel level, string message)
         {
             try
             {
-                if (level != LogLevel.None)
-                {
-                    WriteLogEntry(filePath, message);
-                }
+                WriteLogEntry(filePath, message);
             }
             catch (Exception)
             {
-                // 
+                //
             }
         }
 

src/GitVersionCore/Logging/LogExtensions.cs

@@ -65,6 +65,26 @@ public static void Info(this ILog log, Verbosity verbosity, LogAction logAction)
             log?.Write(verbosity, LogLevel.Info, logAction);
         }
 
+        public static void Verbose(this ILog log, string format, params object[] args)
+        {
+            log?.Write(LogLevel.Verbose, format, args);
+        }
+
+        public static void Verbose(this ILog log, Verbosity verbosity, string format, params object[] args)
+        {
+            log?.Write(verbosity, LogLevel.Verbose, format, args);
+        }
+
+        public static void Verbose(this ILog log, LogAction logAction)
+        {
+            log?.Write(LogLevel.Verbose, logAction);
+        }
+
+        public static void Verbose(this ILog log, Verbosity verbosity, LogAction logAction)
+        {
+            log?.Write(verbosity, LogLevel.Verbose, logAction);
+        }
+
         public static void Error(this ILog log, string format, params object[] args)
         {
             log?.Write(LogLevel.Error, format, args);
@@ -168,10 +188,12 @@ public static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
 
         private static readonly IDictionary<LogLevel, Verbosity> VerbosityMaps = new Dictionary<LogLevel, Verbosity>
         {
+            { LogLevel.Verbose, Verbosity.Verbose },
             { LogLevel.Debug, Verbosity.Diagnostic },
             { LogLevel.Info, Verbosity.Normal },
             { LogLevel.Warn, Verbosity.Minimal },
             { LogLevel.Error, Verbosity.Quiet },
+            { LogLevel.Fatal, Verbosity.Quiet },
         };
     }
 }

src/GitVersionCore/Logging/LogLevel.cs

@@ -2,10 +2,11 @@ namespace GitVersion.Logging
 {
     public enum LogLevel
     {
-        None,
+        Fatal,
         Error,
         Warn,
         Info,
+        Verbose,
         Debug
     }
 }

src/GitVersionExe.Tests/HelpWriterTests.cs

@@ -36,6 +36,7 @@ public void AllArgsAreInHelp()
                 { nameof(Arguments.IsVersion), "/version" },
                 { nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
                 { nameof(Arguments.ConfigFile), "/config" },
+                { nameof(Arguments.Verbosity), "/verbosity" },
             };
             string helpText = null;
 

src/GitVersionExe/ArgumentParser.cs

@@ -365,7 +365,7 @@ public Arguments ParseArguments(string[] commandLineArguments)
 
                 if (name.IsSwitch("verbosity"))
                 {
-                    // first try the old version
+                    // first try the old version, this check will be removed in version 6.0.0, making it a breaking change
                     if (Enum.TryParse(value, true, out LogLevel logLevel))
                     {
                         arguments.Verbosity = LogExtensions.GetVerbosityForLevel(logLevel);

src/GitVersionExe/HelpWriter.cs

@@ -80,8 +80,9 @@ All the GitVersion variables are written to 'GitVersion_WixVersion.wxi'.
     /execargs       Arguments for the executable specified by /exec
     /proj           Build a msbuild file, GitVersion variables will be passed as msbuild properties
     /projargs       Additional arguments to pass to msbuild
-    /verbosity      Set Verbosity level (debug, info, warn, error, none). Default is info
-
+    /verbosity      Specifies the amount of information to be displayed.
+                    (Quiet, Minimal, Normal, Verbose, Diagnostic)
+                    Default is Normal
 
 gitversion init     Configuration utility for gitversion
 ";

src/GitVersionTask/MsBuildAppender.cs

@@ -16,14 +16,11 @@ public void WriteTo(LogLevel level, string message)
         {
             try
             {
-                if (level != LogLevel.None)
-                {
-                    WriteLogEntry(level, message);
-                }
+                WriteLogEntry(level, message);
             }
             catch (Exception)
             {
-                // 
+                //
             }
         }
 
@@ -32,15 +29,15 @@ private void WriteLogEntry(LogLevel level, string str)
             var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
             switch (level)
             {
-                case LogLevel.None:
-                    break;
+                case LogLevel.Fatal:
                 case LogLevel.Error:
                     taskLog.LogError(contents);
                     break;
                 case LogLevel.Warn:
                     taskLog.LogWarning(contents);
                     break;
                 case LogLevel.Info:
+                case LogLevel.Verbose:
                 case LogLevel.Debug:
                     taskLog.LogMessage(contents);
                     break;