cleanup

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -277,8 +277,10 @@ public void NoWarnOnGitVersionYmlFile()
             SetupConfigFileContent(string.Empty);
 
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => s = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
             {
                 ConfigurationProvider.Provide(repoPath, fileSystem, configFileLocator);
             }

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

@@ -38,8 +38,10 @@ public void WarnOnExistingGitVersionConfigYamlFile(string path)
             SetupConfigFileContent(string.Empty, DefaultConfigFileLocator.ObsoleteFileName, path);
 
             var logOutput = string.Empty;
-            Action<string> action = info => { logOutput = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => logOutput = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
             {
                 configFileLocator.Verify(workingPath, repoPath, fileSystem);
             }
@@ -55,8 +57,10 @@ public void WarnOnAmbiguousConfigFilesAtTheSameProjectRootDirectory(string path)
             SetupConfigFileContent(string.Empty, DefaultConfigFileLocator.DefaultFileName, path);
 
             var logOutput = string.Empty;
-            Action<string> action = info => { logOutput = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => logOutput = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
             {
                 configFileLocator.Verify(workingPath, repoPath, fileSystem);
             }
@@ -86,8 +90,10 @@ public void NoWarnOnGitVersionYmlFile()
             SetupConfigFileContent(string.Empty);
 
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => s = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
             {
                 ConfigurationProvider.Provide(repoPath, fileSystem, configFileLocator);
             }

src/GitVersionCore.Tests/LoggerTest.cs

@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using System;
+using NUnit.Framework;
 using Shouldly;
 using GitVersion.Helpers;
 
@@ -16,8 +15,10 @@ public void LoggerObscuresPassword(string protocol)
             const string username = "username%40domain.com";
             const string password = "password";
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => s = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
                 Logger.WriteInfo($"{protocol}://{username}:{password}@workspace.visualstudio.com/DefaultCollection/_git/CAS");
 
             s.Contains(password).ShouldBe(false);
@@ -27,9 +28,9 @@ public void LoggerObscuresPassword(string protocol)
         public void UsernameWithoutPassword()
         {
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
+            void Action(string info) => s = info;
             const string repoUrl = "http://[email protected]/DefaultCollection/_git/CAS";
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
                 Logger.WriteInfo(repoUrl);
 
             s.Contains(repoUrl).ShouldBe(true);

src/GitVersionCore.Tests/ModuleInitializer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitVersion.Helpers;
 
 namespace GitVersionCore.Tests
@@ -14,10 +14,10 @@ public static class ModuleInitializer
         public static void Initialize()
         {
             Logger.SetLoggers(
-                s => Console.WriteLine(s),
-                s => Console.WriteLine(s),
-                s => Console.WriteLine(s),
-                s => Console.WriteLine(s));
+                Console.WriteLine,
+                Console.WriteLine,
+                Console.WriteLine,
+                Console.WriteLine);
         }
     }
 }

src/GitVersionCore.Tests/NamedConfigFileLocatorTests.cs

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using NUnit.Framework;
 using Shouldly;
@@ -49,8 +48,10 @@ public void NoWarnOnCustomYmlFile()
             SetupConfigFileContent(string.Empty);
 
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
-            using (Logger.AddLoggersTemporarily(action, action, action, action))
+
+            void Action(string info) => s = info;
+
+            using (Logger.AddLoggersTemporarily(Action, Action, Action, Action))
             {
                 ConfigurationProvider.Provide(repoPath, fileSystem, configFileLocator);
             }
@@ -63,7 +64,7 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
             SetupConfigFileContent(string.Empty, path: @"c:\\Unrelated\\path");
 
             var s = string.Empty;
-            Action<string> action = info => { s = info; };
+            void action(string info) => s = info;
             using (Logger.AddLoggersTemporarily(action, action, action, action))
             {
                 ConfigurationProvider.Provide(repoPath, fileSystem, configFileLocator);

src/GitVersionCore/Helpers/Logger.cs

@@ -6,8 +6,8 @@ namespace GitVersion.Helpers
 {
     public static class Logger
     {
-        static readonly Regex ObscurePasswordRegex = new Regex("(https?://)(.+)(:.+@)", RegexOptions.Compiled);
-        static string indent = string.Empty;
+        private static readonly Regex ObscurePasswordRegex = new Regex("(https?://)(.+)(:.+@)", RegexOptions.Compiled);
+        private static string indent = string.Empty;
 
         static Logger()
         {
@@ -23,7 +23,7 @@ public static IDisposable IndentLog(string operationDescription)
         {
             var start = DateTime.Now;
             WriteInfo("Begin: " + operationDescription);
-            indent = indent + "  ";
+            indent += "  ";
             return new ActionDisposable(() =>
             {
                 var length = indent.Length - 2;
@@ -32,17 +32,6 @@ public static IDisposable IndentLog(string operationDescription)
             });
         }
 
-        static Action<string> ObscurePassword(Action<string> info)
-        {
-            void LogAction(string s)
-            {
-                s = ObscurePasswordRegex.Replace(s, "$1$2:*******@");
-                info(s);
-            }
-
-            return LogAction;
-        }
-
         public static void SetLoggers(Action<string> debug, Action<string> info, Action<string> warn, Action<string> error)
         {
             if (debug == null) throw new ArgumentNullException(nameof(debug));
@@ -89,22 +78,33 @@ public static IDisposable AddLoggersTemporarily(Action<string> debug, Action<str
             });
         }
 
-        static Action<string> LogMessage(Action<string> logAction, string level)
+        private static Action<string> ObscurePassword(Action<string> info)
+        {
+            void LogAction(string s)
+            {
+                s = ObscurePasswordRegex.Replace(s, "$1$2:*******@");
+                info(s);
+            }
+
+            return LogAction;
+        }
+
+        private static Action<string> LogMessage(Action<string> logAction, string level)
         {
             return s => logAction(string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2:MM/dd/yy H:mm:ss:ff}] {3}", indent, level, DateTime.Now, s));
         }
 
-        public static void Reset()
+        private static void Reset()
         {
-            WriteDebug = s => { throw new Exception("Debug logger not defined. Attempted to log: " + s); };
-            WriteInfo = s => { throw new Exception("Info logger not defined. Attempted to log: " + s); };
-            WriteWarning = s => { throw new Exception("Warning logger not defined. Attempted to log: " + s); };
-            WriteError = s => { throw new Exception("Error logger not defined. Attempted to log: " + s); };
+            WriteDebug = s => throw new Exception("Debug logger not defined. Attempted to log: " + s);
+            WriteInfo = s => throw new Exception("Info logger not defined. Attempted to log: " + s);
+            WriteWarning = s => throw new Exception("Warning logger not defined. Attempted to log: " + s);
+            WriteError = s => throw new Exception("Error logger not defined. Attempted to log: " + s);
         }
 
-        class ActionDisposable : IDisposable
+        private class ActionDisposable : IDisposable
         {
-            readonly Action action;
+            private readonly Action action;
 
             public ActionDisposable(Action action)
             {