(proj) cleanup NET472 consts

Author: arturcic

src/GitVersionCore/LibGitExtensions.cs

@@ -4,6 +4,7 @@ namespace GitVersion
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Runtime.InteropServices;
     using System.Text;
     using GitVersion.Helpers;
     using LibGit2Sharp;
@@ -61,9 +62,9 @@ public static GitObject PeeledTarget(this Tag tag)
         {
             var target = tag.Target;
 
-            while (target is TagAnnotation)
+            while (target is TagAnnotation annotation)
             {
-                target = ((TagAnnotation)(target)).Target;
+                target = annotation.Target;
             }
             return target;
         }
@@ -143,11 +144,11 @@ public static void DumpGraph(this IRepository repository, Action<string> writer
             DumpGraph(repository.Info.Path, writer, maxCommits);
         }
 
-
         public static void DumpGraph(string workingDirectory, Action<string> writer = null, int? maxCommits = null)
         {
-            var output = new StringBuilder();
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return;
 
+            var output = new StringBuilder();
             try
             {
                 ProcessHelper.Run(

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -94,14 +94,17 @@ public void WorkingDirectoryWithoutGitFolderCrashesWithInformativeMessage()
     public void WorkingDirectoryDoesNotExistCrashesWithInformativeMessage()
     {
         var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
-        var gitVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");
+        var executable = PathHelper.GetExecutable();
+
         var output = new StringBuilder();
+        var args = PathHelper.GetExecutableArgs(workingDirectory);
+
         var exitCode = ProcessHelper.Run(
             s => output.AppendLine(s),
             s => output.AppendLine(s),
             null,
-            gitVersion,
-            workingDirectory,
+            executable,
+            args,
             PathHelper.GetCurrentDirectory());
 
         exitCode.ShouldNotBe(0);

src/GitVersionExe.Tests/GitVersionHelper.cs

@@ -29,10 +29,10 @@ public static ExecutionResults ExecuteIn(string workingDirectory, string argumen
 
     static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
     {
-        var gitVersion = Path.Combine(PathHelper.GetCurrentDirectory(), "GitVersion.exe");
+        var executable = PathHelper.GetExecutable();
         var output = new StringBuilder();
 
-        Console.WriteLine("Executing: {0} {1}", gitVersion, arguments);
+        Console.WriteLine("Executing: {0} {1}", executable, arguments);
         Console.WriteLine();
         var environmentalVariables =
             new[]
@@ -47,9 +47,11 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
 
         try
         {
+            var args = PathHelper.GetExecutableArgs(arguments.ToString());
+
             exitCode = ProcessHelper.Run(
                 s => output.AppendLine(s), s => output.AppendLine(s), null,
-                gitVersion, arguments.ToString(), arguments.WorkingDirectory,
+                executable, args, arguments.WorkingDirectory,
                 environmentalVariables);
         }
         catch (Exception exception)

src/GitVersionExe.Tests/Helpers/PathHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Reflection;
 
@@ -9,8 +9,31 @@ public static string GetCurrentDirectory()
         return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
     }
 
+    public static string GetExecutable()
+    {
+#if NET472
+        var executable = Path.Combine(GetExeDirectory(), "GitVersion.exe");
+#else
+        var executable = "dotnet";
+#endif
+        return executable;
+    }
+
+    public static string GetExecutableArgs(string args)
+    {
+#if !NET472
+        args = $"{Path.Combine(GetExeDirectory(), "GitVersion.dll")} {args}";
+#endif
+        return args;
+    }
+
     public static string GetTempPath()
     {
         return Path.Combine(GetCurrentDirectory(), "TestRepositories", Guid.NewGuid().ToString());
     }
-}
+
+    private static string GetExeDirectory()
+    {
+        return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("GitVersionExe.Tests", "GitVersionExe");
+    }
+}

src/GitVersionExe/Program.cs

@@ -77,13 +77,11 @@ static int VerifyArgumentsAndRun()
                 }
 
                 ConfigureLogging(arguments);
-#if NET472
                 if (arguments.Diag)
                 {
                     Logger.WriteInfo("Dumping commit graph: ");
                     LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);
                 }
-#endif
                 if (!Directory.Exists(arguments.TargetPath))
                 {
                     Logger.WriteWarning($"The working directory '{arguments.TargetPath}' does not exist.");
@@ -131,9 +129,7 @@ static int VerifyArgumentsAndRun()
 
                     try
                     {
-#if NET472
                         LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);
-#endif
                     }
                     catch (Exception dumpGraphException)
                     {
@@ -173,10 +169,7 @@ static void ConfigureLogging(Arguments arguments)
                     var logFile = new FileInfo(logFileFullPath);
 
                     // NOTE: logFile.Directory will be null if the path is i.e. C:\logfile.log. @asbjornu
-                    if (logFile.Directory != null)
-                    {
-                        logFile.Directory.Create();
-                    }
+                    logFile.Directory?.Create();
 
                     using (logFile.CreateText())
                     {

src/GitVersionExe/SpecifiedArgumentRunner.cs

@@ -67,12 +67,9 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 {
                     assemblyInfoUpdater.Update();
                 }
-                var execRun = false;
-                var msbuildRun = false;
-#if NET472
-                execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);
-                msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);
-#endif
+
+                var execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);
+                var msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);
 
                 if (!execRun && !msbuildRun)
                 {
@@ -87,11 +84,8 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 }
             }
         }
-#if NET472
         static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)
         {
-
-
             if (string.IsNullOrEmpty(args.Proj)) return false;
 
             Logger.WriteInfo($"Launching build tool {BuildTool} \"{args.Proj}\" {args.ProjArgs}");
@@ -105,8 +99,6 @@ static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionV
 
             return true;
         }
-
-
         static bool RunExecCommandIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)
         {
             if (string.IsNullOrEmpty(args.Exec)) return false;
@@ -122,7 +114,6 @@ static bool RunExecCommandIfNeeded(Arguments args, string workingDirectory, Vers
 
             return true;
         }
-#endif
         static KeyValuePair<string, string>[] GetEnvironmentalVariables(VersionVariables variables)
         {
             return variables