running dotnet msbuild instead of old msbuild

Obsolete Proj, ProjArgs, Exec, ExecArgs

Author: arturcic

src/GitVersionCore/Arguments.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using GitVersion.Configuration;
 using GitVersion.Logging;
@@ -27,9 +28,13 @@ public class Arguments
         public string LogFilePath;
         public string ShowVariable;
 
+        [Obsolete]
         public string Proj;
+        [Obsolete]
         public string ProjArgs;
+        [Obsolete]
         public string Exec;
+        [Obsolete]
         public string ExecArgs;
 
         public bool UpdateWixVersionFile;

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text;
 using GitTools.Testing;
-using GitVersion;
 using NUnit.Framework;
 using Shouldly;
 using GitVersion.Helpers;
@@ -23,20 +22,16 @@ public void RunExecViaCommandLine()
 
             var buildFile = Path.Combine(fixture.RepositoryPath, "RunExecViaCommandLine.csproj");
             File.Delete(buildFile);
-            const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
-  <Target Name=""OutputResults"">
-    <Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
-  </Target>
-</Project>";
-            File.WriteAllText(buildFile, buildFileContent);
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, ExecCommand.BuildTool, "RunExecViaCommandLine.csproj /target:OutputResults");
+
+            File.WriteAllText(buildFile, MsBuildProjectArgTest.TestProject);
+            var exec = "dotnet";
+            var execArgs = "msbuild RunExecViaCommandLine.csproj /target:OutputResults";
+            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, exec, execArgs);
 
             result.ExitCode.ShouldBe(0, result.Log);
             result.Log.ShouldContain("GitVersion_FullSemVer: 1.2.4+1");
         }
 
-
         [Test]
         public void InvalidArgumentsExitCodeShouldNotBeZero()
         {
@@ -79,7 +74,7 @@ public void CheckBuildServerVerbosityConsole(string verbosityArg, string expecte
         [Test]
         public void WorkingDirectoryWithoutGitFolderCrashesWithInformativeMessage()
         {
-            var results = GitVersionHelper.ExecuteIn(System.Environment.SystemDirectory, null, isTeamCity: false, logToFile: false);
+            var results = GitVersionHelper.ExecuteIn(Environment.SystemDirectory, null, isTeamCity: false, logToFile: false);
             results.Output.ShouldContain("Can't find the .git directory in");
         }
 

src/GitVersionExe.Tests/MsBuildProjectArgTest.cs

@@ -8,6 +8,17 @@ namespace GitVersionExe.Tests
     [TestFixture]
     public class MsBuildProjectArgTest
     {
+        public const string TestProject = @"
+<Project Sdk=""Microsoft.NET.Sdk"">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <Target Name=""OutputResults"">
+    <Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)"" Importance=""High""/>
+  </Target>
+</Project>
+";
+
         [Test]
         public void RunsMsBuildProvideViaCommandLineArg()
         {
@@ -17,13 +28,7 @@ public void RunsMsBuildProvideViaCommandLineArg()
 
             var buildFile = Path.Combine(fixture.RepositoryPath, "RunsMsBuildProvideViaCommandLineArg.proj");
             File.Delete(buildFile);
-            const string buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
-  <Target Name=""OutputResults"">
-    <Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
-  </Target>
-</Project>";
-            File.WriteAllText(buildFile, buildFileContent);
+            File.WriteAllText(buildFile, TestProject);
             var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, projectFile: "RunsMsBuildProvideViaCommandLineArg.proj", projectArgs: "/target:OutputResults");
 
             result.ExitCode.ShouldBe(0);

src/GitVersionExe/ExecCommand.cs

@@ -22,7 +22,6 @@ public class ExecCommand : IExecCommand
         private readonly ILog log;
         private readonly IGitVersionCalculator gitVersionCalculator;
         private readonly IOptions<Arguments> options;
-        public static readonly string BuildTool = GetMsBuildToolPath();
 
         public ExecCommand(IFileSystem fileSystem, IBuildServerResolver buildServerResolver, ILog log, IGitVersionCalculator gitVersionCalculator, IOptions<Arguments> options)
         {
@@ -79,55 +78,21 @@ public void Execute()
             if (arguments.UpdateAssemblyInfo)
             {
                 assemblyInfoUpdater.Update();
-            }
-
-            var execRun = RunExecCommandIfNeeded(arguments, arguments.TargetPath, variables, log);
-            var msbuildRun = RunMsBuildIfNeeded(arguments, arguments.TargetPath, variables, log);
-
-            if (!execRun && !msbuildRun)
-            {
                 assemblyInfoUpdater.CommitChanges();
-                //TODO Put warning back
-                //if (!context.CurrentBuildServer.IsRunningInBuildAgent())
-                //{
-                //    Console.WriteLine("WARNING: Not running in build server and /ProjectFile or /Exec arguments not passed");
-                //    Console.WriteLine();
-                //    Console.WriteLine("Run GitVersion.exe /? for help");
-                //}
             }
-        }
 
-        private static string GetMsBuildToolPath()
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return @"c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe";
-            }
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                return "/usr/bin/msbuild";
-            }
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                return "/Library/Frameworks/Mono.framework/Versions/Current/Commands/msbuild";
-            }
-            throw new Exception("MsBuild not found");
+            RunExecCommandIfNeeded(arguments, arguments.TargetPath, variables, log);
+            RunMsBuildIfNeeded(arguments, arguments.TargetPath, variables, log);
         }
-
+        
         private static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables, ILog log)
         {
             if (string.IsNullOrEmpty(args.Proj)) return false;
 
-            log.Info($"Launching build tool {BuildTool} \"{args.Proj}\" {args.ProjArgs}");
-            var results = ProcessHelper.Run(
-                m => log.Info(m), m => log.Error(m),
-                null, BuildTool, $"\"{args.Proj}\" {args.ProjArgs}", workingDirectory,
-                GetEnvironmentalVariables(variables));
-
-            if (results != 0)
-                throw new WarningException("MSBuild execution failed, non-zero return code");
+            args.Exec = "dotnet";
+            args.ExecArgs = $"msbuild \"{args.Proj}\" {args.ProjArgs}";
 
-            return true;
+            return RunExecCommandIfNeeded(args, workingDirectory, variables, log);
         }
 
         private static bool RunExecCommandIfNeeded(Arguments args, string workingDirectory, VersionVariables variables, ILog log)