Merge pull request #166 from dotnet-campus/t/lindexi/ExecuteCommand

允许对执行命令进行过滤，解决执行命令输出乱码

Author: walterlv

DotNETBuild/Utils/DotNetBuildTools_/DotNetBuildTool.cs

@@ -1,4 +1,7 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+
 using dotnetCampus.Configurations;
 using Microsoft.Extensions.Logging;
 
@@ -41,9 +44,10 @@ protected DotNetBuildTool(IAppConfigurator appConfigurator, ILogger logger = nul
         /// <param name="arguments"></param>
         /// <param name="workingDirectory">默认将使用当前进程工作路径</param>
         /// <param name="needAutoLogOutput">是否实时输出</param>
+        /// <param name="processStartInfoFilter">用于对输入过程的过滤。如设置编码等</param>
         /// <returns></returns>
         protected ProcessResult ExecuteProcessCommand(string exeName, string arguments,
-            string workingDirectory = "", bool needAutoLogOutput = true)
+            string workingDirectory = "", bool needAutoLogOutput = true, Action<ProcessStartInfo>? processStartInfoFilter = null)
         {
             Logger.LogInformation($"{exeName} {arguments}");
 
@@ -61,7 +65,7 @@ protected ProcessResult ExecuteProcessCommand(string exeName, string arguments,
                         Logger.LogWarning(message);
                     }
                 }
-            });
+            }, processStartInfoFilter);
             Logger.LogInformation($"ExitCode: {result.ExitCode}");
 
             return result;

DotNETBuild/Utils/ProcessRunner_/ProcessRunner.cs

@@ -17,9 +17,10 @@ public static class ProcessRunner
         /// <param name="arguments"></param>
         /// <param name="workingDirectory"></param>
         /// <param name="onReceivedOutput">当收到进程输出触发</param>
+        /// <param name="processStartInfoFilter">用于对输入过程的过滤。如设置编码等</param>
         /// <returns></returns>
         public static ProcessResult ExecuteCommand(string exeName, string arguments,
-            string workingDirectory = "", Action<ProcessOutputInfo>? onReceivedOutput = null)
+            string workingDirectory = "", Action<ProcessOutputInfo>? onReceivedOutput = null, Action<ProcessStartInfo>? processStartInfoFilter = null)
         {
             var processStartInfo = new ProcessStartInfo
             {
@@ -38,6 +39,8 @@ public static ProcessResult ExecuteCommand(string exeName, string arguments,
                 //StandardOutputEncoding = Encoding.UTF8
             };
 
+            processStartInfoFilter?.Invoke(processStartInfo);
+
             var processOutputInfoList = new List<ProcessOutputInfo>();
 
             var process = new Process();
@@ -80,5 +83,6 @@ public static ProcessResult ExecuteCommand(string exeName, string arguments,
             processOutputInfoList.TrimExcess();
             return new ProcessResult(exitCode, processOutputInfoList);
         }
+
     }
 }