diff --git a/ExecuteCommandStudy.Core/AppUtility.cs b/ExecuteCommandStudy.Core/AppUtility.cs
deleted file mode 100644
index c1bf68a..0000000
--- a/ExecuteCommandStudy.Core/AppUtility.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Reflection;
-
-
-namespace ExecuteCommandStudy.Core
-{
- /// <summary>
- /// 应用工具类
- /// </summary>
- public class AppUtility
- {
- /// <summary>
- /// 获取应用运行时各种路径
- /// </summary>
- /// <returns></returns>
- public static IDictionary<string,(string desc,string? path)> GetApplicationPaths()
- {
- var pathDic = new Dictionary<string, (string desc, string? path)>()
- {
- //当前运行的exe的完整路径，包含exe文件名，只用于WinForm
- {"Application.ExecutablePath",("程序集基完整路径(仅WinForm)", "Application.ExecutablePath 只适用于WinForm") },
-
- //程序的启动路径：只用于WinForm
- {"Application.StartupPath",("程序集启动路径(仅WinForm)", "Application.StartupPath 只适用于WinForm") },
-
- //当前执行的exe或启动项目的路径，通过AppContext
- {"AppContext.BaseDirectory",("执行或启动路径",AppContext.BaseDirectory) },
-
- //当前执行的exe的目录，不包含exe名，使用AppDomain
- {"AppDomain.CurrentDomain.BaseDirectory",("程序集解析程序用于探测程序集的基目录",AppDomain.CurrentDomain.BaseDirectory) },
-
- //程序安装或启动基目录 包含应用程序的目录的名称
- {"AppDomain.CurrentDomain.SetupInformation.ApplicationBase",("程序安装或启动基目录",AppDomain.CurrentDomain.SetupInformation.ApplicationBase) },
-
- //当前进程的主模块路径，包含exe名
- {"Process.GetCurrentProcess().MainModule.FileName",("当前进程的主模块路径",Process.GetCurrentProcess()?.MainModule?.FileName) },
-
- //环境变量：用户当前工作目录的完整限定路径
- {"Environment.CurrentDirectory",("用户当前工作目录的完整限定路径",Environment.CurrentDirectory) },
-
- //环境变量：当前exe的完整路径，包含exe名，通过命令行参数
- {"Environment.GetCommandLineArgs()[0]",("当前exe的完整路径",Environment.GetCommandLineArgs()[0]) },
-
- //当前工作目录的路径（可变）
- {"Directory.GetCurrentDirectory",("当前工作目录的路径（可变）",Directory.GetCurrentDirectory()) },
-
- //当前Assembly的加载路径，包含dll或exe名
- {"Assembly.GetExecutingAssembly().Location",("当前Assembly的加载路径",Assembly.GetExecutingAssembly().Location) },
-
- //入口程序集的路径
- {"Assembly.GetEntryAssembly().Location",("入口程序集的路径",Assembly.GetEntryAssembly()?.Location) },
- };
-
- return pathDic;
- }
- }
-}
diff --git a/ExecuteCommandStudy.Core/DotnetCommondUtility.cs b/ExecuteCommandStudy.Core/DotnetCommondUtility.cs
deleted file mode 100644
index 4da692c..0000000
--- a/ExecuteCommandStudy.Core/DotnetCommondUtility.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ExecuteCommandStudy.Core
-{
- /// <summary>
- /// dotnet命令行工具类
- /// </summary>
- public static class DotnetCommondUtility
- {
- /// <summary>
- /// 执行dotnet命令
- /// </summary>
- /// <param name="command">命令</param>
- /// <param name="argument">命令参数</param>
- /// <param name="newWindow">新窗口执行命令</param>
- /// <returns>命令行输出文本</returns>
- public static string ExecuteCommand(string command, string argument = "", bool newWindow = false)
- {
- string output = "";
-
- try
- {
- if (newWindow)
- {
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "pwsh.exe",
- Arguments = $" Start-Process -FilePath 'dotnet' -ArgumentList '{command}','{argument}'",
- //RedirectStandardOutput = true,
- //StandardOutputEncoding = Encoding.UTF8,
- //RedirectStandardError = true,
- //StandardErrorEncoding = Encoding.UTF8,
- //RedirectStandardInput = false,
- //StandardInputEncoding = Encoding.UTF8,
- UseShellExecute = true,
- CreateNoWindow = false,
- };
-
-
- Process process = new Process()
- {
- StartInfo = startInfo,
- };
-
- process.Start();
-
- output = "命令已在新窗口执行！";
- }
- else
- {
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "dotnet",
- Arguments = $"{command} {argument}",
- RedirectStandardOutput = true,
- StandardOutputEncoding = Encoding.UTF8,
- RedirectStandardError = true,
- StandardErrorEncoding = Encoding.UTF8,
- //RedirectStandardInput = false,
- //StandardInputEncoding = Encoding.UTF8,
-
- //启用内核模式时，不能重定向输出
- UseShellExecute = false,
-
- //不创建新窗口
- CreateNoWindow = false,
- };
-
- Process process = new Process()
- {
- StartInfo = startInfo,
- };
-
- //处理输出
- process.OutputDataReceived += (sender, args) =>
- {
- if (!string.IsNullOrEmpty(args.Data))
- {
- output += args.Data;
- }
- };
-
- process.Start();
-
- //开始异步读取输出
- process.BeginOutputReadLine();
-
- //等待里程结束
- process.WaitForExit();
- }
- }
- catch (Exception ex)
- {
- output = $"An error occurred: {ex.Message}";
- }
-
- return output;
- }
-
- /// <summary>
- /// 新窗口启动WebApp项目
- /// </summary>
- /// <param name="startFile">包含全路径的WebApp项目</param>
- /// <param name="args">命令参数</param>
- /// <returns></returns>
- public static string RunWebApp(string startFile, params string[] args)
- {
- string output = "";
-
- try
- {
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "powershell.exe",
- Arguments = $"Start-Process -FilePath '{startFile}' -ArgumentList '{string.Join(" ", args)}' ",
- UseShellExecute = true,
- CreateNoWindow = false,
- };
-
-
- Process process = new Process()
- {
- StartInfo = startInfo,
- };
-
- process.Start();
-
- output = "已在新窗口中启动WebApp项目。如果已有实例在运行或者执行异常，则窗口会自动关闭；否则新窗口一直存在,直到手动关闭！";
-
- }
- catch (Exception ex)
- {
- output = $"An error occurred: {ex.Message}";
- }
-
- return output;
- }
-
- /// <summary>
- /// 停止WebAPI项目
- /// </summary>
- /// <param name="startFile">包含全路径的可执行文件</param>
- /// <returns></returns>
- public static string SopWebApp()
- {
- string output = "";
-
- try
- {
- string projectAndMutexName = "xxxxxxx";
-
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "powershell.exe",
- Arguments = $"Stop-Process -Name '{projectAndMutexName}'",
- UseShellExecute = false,
- CreateNoWindow = true,
- RedirectStandardOutput = true,
- StandardOutputEncoding = Encoding.UTF8,
- };
-
-
- Process process = new Process()
- {
- StartInfo = startInfo,
- };
-
- process.Start();
-
- process.WaitForExit();
-
- output = process.StandardOutput.ReadToEnd();
-
- }
- catch (Exception ex)
- {
- output = $"An error occurred: {ex.Message}";
- }
-
- return output;
- }
- }
-}
diff --git a/ExecuteCommandStudy.Core/StartupUtility.cs b/ExecuteCommandStudy.Core/StartupUtility.cs
deleted file mode 100644
index 2de8295..0000000
--- a/ExecuteCommandStudy.Core/StartupUtility.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ExecuteCommandStudy.Core
-{
- /// <summary>
- /// 启动工具类
- /// </summary>
- public static class StartupUtility
- {
- /// <summary>
- /// 启动webapi项目
- /// (出现webapi项目启动命令行窗口)
- /// </summary>
- public static void StartWebApiProject()
- {
- string projectAndMutexName = "xxx";
-
- //webapi项目不在运行状态则启动webapi项目
- if (webAppIsRunningByMutex() == false)
- {
- //VS项目根目录
- string vsProjectPath = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory)!.Parent!.Parent!.Parent!.Parent!.FullName;
-
- //webapi项目根项目
- string webApiProjectPath = Path.Combine(vsProjectPath, projectAndMutexName);
-
- //启动命令信息
- var prossInfo = new System.Diagnostics.ProcessStartInfo("dotnet", $"run --project {webApiProjectPath}")
- {
- UseShellExecute = true,
- CreateNoWindow = false,
- RedirectStandardOutput = false
- };
-
- //启动
- System.Diagnostics.Process.Start(prossInfo);
- }
-
- //由进程名判断
- //bool webAppIsRunningByProcessName()
- //{
- // return Process.GetProcessesByName(projectAndMutexName).ToList().Count == 0;
- //}
-
- //由互斥锁判断
- bool webAppIsRunningByMutex()
- {
- bool createdResult = true;
-
- //创建互斥锁
- using (var mutex = new Mutex(true, projectAndMutexName, out createdResult))
- {
- if (createdResult)
- {
- mutex.ReleaseMutex();
- }
- }
-
- //互斥锁是否创建成功
- return !createdResult;
- }
-
- }
-
- /// <summary>
- /// 关闭webapi项目
- /// </summary>
- public static void ExitWebApiProject()
- {
- string projectAndMutexName = WebApiConfigManager.GetWebApiConfigOption().CurrentValue.WebAppMutexName;
-
- //webapi为运行状态则关闭
- if (webAppIsRunningByMutex())
- {
- var webApiProcess = System.Diagnostics.Process.GetProcessesByName(projectAndMutexName);
-
- if (webApiProcess != null && webApiProcess.Length>0)
- {
- webApiProcess[0].Kill();
- }
- }
-
- //由进程名判断
- //bool webAppIsRunningByProcessName()
- //{
- // return Process.GetProcessesByName(projectAndMutexName).ToList().Count == 0;
- //}
-
- //由互斥锁判断
- bool webAppIsRunningByMutex()
- {
- bool createdResult = true;
-
- //创建互斥锁
- using (var mutex = new Mutex(true, projectAndMutexName, out createdResult))
- {
- if (createdResult)
- {
- mutex.ReleaseMutex();
- }
- }
-
- //互斥锁是否创建成功
- return !createdResult;
- }
- }
- }
-}
diff --git a/ExecuteCommandStudy.Core/Utils1.cs b/ExecuteCommandStudy.Core/Utils1.cs
deleted file mode 100644
index 1282fc0..0000000
--- a/ExecuteCommandStudy.Core/Utils1.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-namespace ExecuteCommandStudy.Core
-{
- public static class Utils1
- {
- static void A()
- {
- ProcessStartInfo startInfo = new ProcessStartInfo();
- startInfo.FileName = "cmd.exe";
- startInfo.Arguments = "/u /k dotnet exec c:\\Users\\ruyu\\Desktop\\HttpClientStudy\\Docs\\Publish\\HttpClientStudy.WebApp\\HttpClientStudy.WebApp.dll";
- startInfo.UseShellExecute = false;
- startInfo.CreateNoWindow = false;
-
- Process.Start(startInfo);
- }
-
- /// <summary>
- /// 启动WebApi程序
- /// </summary>
- /// <param name="exePathAndName">带相对或绝对路径的可执行文件</param>
- /// <param name="args">应用程序参数</param>
- static string B(string exePathAndName, params string[] args)
- {
- string executedMessage = string.Empty;
- try
- {
- if (!Path.IsPathRooted(exePathAndName))
- {
- exePathAndName = Path.GetFullPath(exePathAndName, Environment.CurrentDirectory);
- }
-
- if (!File.Exists(exePathAndName))
- {
- executedMessage = $"可执行文件[{exePathAndName}]不存在";
- return executedMessage;
- }
-
- ProcessStartInfo startInfo = new ProcessStartInfo();
- startInfo.FileName = exePathAndName;
- startInfo.Arguments = string.Join(" ", args);
-
- //未知原因：只有 UseShellExecute 设置为 true 时，CreateNoWindow参数才有效，新窗口执行才实际有效。
- startInfo.UseShellExecute = true;
-
- //true时不创建新窗口，false才是创建新窗口
- startInfo.CreateNoWindow = false;
-
- //启动进程
- using (Process process = new Process() { StartInfo = startInfo })
- {
- process.Start();
- }
-
- executedMessage = $"程序[{exePathAndName}]已在新的命令行窗口执行。如果未出现新命令行窗口，可能是程序错误造成窗口闪现！";
- }
- catch (Exception ex)
- {
- executedMessage = $"启动程序[{exePathAndName}]出现异常：[{ex.Message}]";
- }
- finally
- {
-
- }
-
- return executedMessage;
- }
-
- static void PowerShell()
- {
- // 创建新的进程开始信息
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "powershell.exe",
- Arguments = $"Start-Process powershell -ArgumentList '-noexit','-command','dotnet c:\\Users\\ruyu\\Desktop\\HttpClientStudy\\Docs\\Publish\\HttpClientStudy.WebApp\\HttpClientStudy.WebApp.dll'",
-
- UseShellExecute = false,
- RedirectStandardOutput = false,
- CreateNoWindow = false // 设置为false以在新窗口中打开
- };
-
- try
- {
- // 使用启动信息创建并启动进程
- using (Process process = new Process() { StartInfo = startInfo })
- {
- process.Start();
- }
- }
- catch (Exception e)
- {
- Console.WriteLine("An error occurred: " + e.Message);
- }
- }
-
- static void RunExe()
- {
- // PowerShell();
-
- var webapiExe = "c:\\Users\\ruyu\\Desktop\\HttpClientStudy\\Docs\\Publish\\HttpClientStudy.WebApp\\HttpClientStudy.WebApp.exe";
-
- // 创建新的进程开始信息
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = "powershell.exe",
- Arguments = $"Start-Process {webapiExe} -ArgumentList '-noexit'",
-
- UseShellExecute = false,
- RedirectStandardOutput = false,
- CreateNoWindow = false // 设置为false以在新窗口中打开
- };
-
- try
- {
- // 使用启动信息创建并启动进程
- using (Process process = new Process() { StartInfo = startInfo })
- {
- process.Start();
- }
- }
- catch (Exception e)
- {
- Console.WriteLine("An error occurred: " + e.Message);
- }
- }
-
- /// <summary>
- /// 运行WebApi发布程序
- /// </summary>
- /// <returns></returns>
- public static string RunWebApiExeFile(string exeFile, bool stayWindows = false, params string[] args)
- {
- string executedMessage = string.Empty;
- try
- {
- if (!Path.IsPathRooted(exeFile))
- {
- exeFile = Path.GetFullPath(exeFile, Environment.CurrentDirectory);
- }
-
- if (!File.Exists(exeFile))
- {
- executedMessage = $"可执行文件[{exeFile}]不存在";
- return executedMessage;
- }
-
- string fileName = Path.GetFileNameWithoutExtension(exeFile);
-
- string stayWindowsArg = stayWindows ? "/k" : "/c";
-
- string systemShell = "cmd.exe";
-
- string webApiArgs = $"{stayWindowsArg} start \"{fileName}\" {exeFile} {string.Join(" ", args)}";
-
- ProcessStartInfo startInfo = new ProcessStartInfo()
- {
- FileName = systemShell,
- Arguments = webApiArgs,
-
- //未知原因：只有 UseShellExecute 设置为 true 时，CreateNoWindow参数才有效，新窗口执行才实际有效。
- UseShellExecute = true,
-
- //true时不创建新窗口，false才是创建新窗口
- CreateNoWindow = false,
- };
-
-
- //启动进程
- using (Process process = new Process() { StartInfo = startInfo })
- {
- process.Start();
- }
-
- executedMessage = $"程序[{exeFile}]已在新的命令行窗口执行。如果未出现新命令行窗口，可能是程序错误造成窗口闪现！";
- }
- catch (Exception ex)
- {
- executedMessage = $"启动程序[{exeFile}]出现异常：[{ex.Message}]";
- }
- finally
- {
-
- }
-
- return executedMessage;
- }
- }
-}
diff --git a/ExecuteCommandStudy.Test/GlobalUsing.cs b/ExecuteCommandStudy.Test/GlobalUsing.cs
new file mode 100644
index 0000000..b3a7cca
--- /dev/null
+++ b/ExecuteCommandStudy.Test/GlobalUsing.cs
@@ -0,0 +1,9 @@
+global using System;
+
+global using System.Text;
+global using System.Diagnostics;
+
+global using Xunit;
+global using Xunit.Sdk;
+global using Xunit.Extensions;
+global using Xunit.Abstractions;
\ No newline at end of file
diff --git a/ExecuteCommandStudy.Test/UnitTest1.cs b/ExecuteCommandStudy.Test/UnitTest1.cs
deleted file mode 100644
index 5abdffa..0000000
--- a/ExecuteCommandStudy.Test/UnitTest1.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace ExecuteCommandStudy.Test
-{
- public class UnitTest1
- {
- [Fact]
- public void Test1()
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/ExecuteCommandStudy.Test/UseXunti.cs b/ExecuteCommandStudy.Test/UseXunti.cs
new file mode 100644
index 0000000..68ceb33
--- /dev/null
+++ b/ExecuteCommandStudy.Test/UseXunti.cs
@@ -0,0 +1,10 @@
+namespace ExecuteCommandStudy.Test;
+
+public class UseXunti
+{
+ [Fact]
+ public void Test1()
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/ExecuteCommandStudy.sln b/ExecuteCommandStudy.sln
index d5e671e..b223aba 100644
--- a/ExecuteCommandStudy.sln
+++ b/ExecuteCommandStudy.sln
@@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35013.160
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExecuteCommandStudy.CApp", "ExecuteCommandStudy.CApp\ExecuteCommandStudy.CApp.csproj", "{05C727B6-7A38-476D-8D6C-62A26B7BEF3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecuteCommandStudy.CApp", "ExecuteCommandStudy.CApp\ExecuteCommandStudy.CApp.csproj", "{05C727B6-7A38-476D-8D6C-62A26B7BEF3D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExecuteCommandStudy.Test", "ExecuteCommandStudy.Test\ExecuteCommandStudy.Test.csproj", "{DD1D2861-2D56-4279-81DA-447ADF1A3343}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecuteCommandStudy.Test", "ExecuteCommandStudy.Test\ExecuteCommandStudy.Test.csproj", "{DD1D2861-2D56-4279-81DA-447ADF1A3343}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExecuteCommandStudy.Core", "ExecuteCommandStudy.Core\ExecuteCommandStudy.Core.csproj", "{F2AF0EC2-D892-4079-8306-D974A1757F34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecuteCommandStudy.Core", "ExecuteCommandStudy.Core\ExecuteCommandStudy.Core.csproj", "{F2AF0EC2-D892-4079-8306-D974A1757F34}"
EndProject
Global
GlobalSection(ExtensibilityGlobals) = postSolution