code cleanup

Author: arturcic

src/GitVersionTask.MsBuild/GitVersionTaskBase.cs

@@ -1,14 +1,13 @@
 using GitVersionTask.MsBuild;
 using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 namespace GitVersion.MSBuildTask
 {
     public abstract class GitVersionTaskBase : ITask
     {
         protected GitVersionTaskBase()
         {
-            this.Log = new TaskLoggingHelper(this);
+            Log = new TaskLoggingHelper(this);
         }
 
         [Required]

src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs

@@ -1,13 +1,13 @@
 // This code originally copied and adapted from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/TaskImplementation.cs
 
+
+using System.IO;
+using System.Reflection;
 #if NET472
 using System;
 using System.Collections.Generic;
 #endif
 
-using System.IO;
-using System.Reflection;
-
 namespace GitVersion.MSBuildTask.LibGit2Sharp
 {
     public class LibGit2SharpLoader

src/GitVersionTask.MsBuild/PlatformAbstraction/Native/NativeMethods.Windows.cs

@@ -34,10 +34,8 @@ internal static string RtlGetVersion()
                 {
                     return $"{osvi.dwMajorVersion}.{osvi.dwMinorVersion}.{osvi.dwBuildNumber}";
                 }
-                else
-                {
-                    return null;
-                }
+
+                return null;
             }
         }
     }

src/GitVersionTask.MsBuild/PlatformAbstraction/Native/PlatformApis.cs

@@ -64,13 +64,11 @@ private static string GetDarwinVersion()
                 // it is OS X 10.0
                 return "10.0";
             }
-            else
-            {
-                // Mac OS X 10.1 mapped to Darwin 5.x, and the mapping continues that way
-                // So just subtract 4 from the Darwin version.
-                // https://en.wikipedia.org/wiki/Darwin_%28operating_system%29
-                return $"10.{version.Major - 4}";
-            }
+
+            // Mac OS X 10.1 mapped to Darwin 5.x, and the mapping continues that way
+            // So just subtract 4 from the Darwin version.
+            // https://en.wikipedia.org/wiki/Darwin_%28operating_system%29
+            return $"10.{version.Major - 4}";
         }
 
         private static string GetFreeBSDVersion()

src/GitVersionTask.MsBuild/PlatformAbstraction/RuntimeEnvironment.cs

@@ -73,11 +73,13 @@ private static string GetWindowsProductVersion()
                 {
                     return "7";
                 }
-                else if (ver.Minor == 2)
+
+                if (ver.Minor == 2)
                 {
                     return "8";
                 }
-                else if (ver.Minor == 3)
+
+                if (ver.Minor == 3)
                 {
                     return "81";
                 }

src/GitVersionTask.MsBuild/TaskLoggingHelper.cs

@@ -1,6 +1,6 @@
-using Microsoft.Build.Framework;
 using System;
 using System.Text;
+using Microsoft.Build.Framework;
 
 namespace GitVersionTask.MsBuild
 {
@@ -217,7 +217,7 @@ public void LogWarningFromException(Exception exception, bool showStackTrace)
 
             if (showStackTrace)
             {
-                message += System.Environment.NewLine + exception.StackTrace;
+                message += Environment.NewLine + exception.StackTrace;
             }
 
             LogWarning(message);
@@ -333,13 +333,13 @@ public void LogErrorFromException(Exception exception, bool showStackTrace, bool
 
             string message;
 
-            if (!showDetail && (System.Environment.GetEnvironmentVariable("MSBUILDDIAGNOSTICS") == null)) // This env var is also used in ToolTask
+            if (!showDetail && (Environment.GetEnvironmentVariable("MSBUILDDIAGNOSTICS") == null)) // This env var is also used in ToolTask
             {
                 message = exception.Message;
 
                 if (showStackTrace)
                 {
-                    message += System.Environment.NewLine + exception.StackTrace;
+                    message += Environment.NewLine + exception.StackTrace;
                 }
             }
             else

src/GitVersionTask.MsBuild/TaskProxy.cs

@@ -12,7 +12,7 @@ public static class TaskProxy
         public static Func<UpdateAssemblyInfo, bool> UpdateAssemblyInfo;
         public static Func<WriteVersionInfoToBuildLog, bool> WriteVersionInfoToBuildLog;
 
-        public static Exception InitialiseException = null;
+        public static Exception InitialiseException;
         static TaskProxy()
         {
             try

src/GitVersionTask/GitVersionTasks.cs

@@ -3,7 +3,6 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.MSBuildTask.Tasks;
-using Microsoft.Build.Framework;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;