调整启动器。 🏮

Author: PopeyeZhong

upgrading/deployer/Deployer.Deploy.cs

@@ -72,7 +72,7 @@ public static void Deploy(Argument argument)
 		Helper.Replicate(packages, root);
 
 		//启动宿主程序
-		Launcher.Launch(root, argument);
+		Launcher.Launch(deployment, argument);
 	}
 	#endregion
 

upgrading/deployer/ILauncher.cs

@@ -42,8 +42,6 @@ public interface ILauncher
 	string Name { get; }
 
 	/// <summary>启动宿主应用程序。</summary>
-	/// <param name="root">宿主应用程序的根目录。</param>
 	/// <param name="argument">部署器的调用参数。</param>
-	/// <returns>如果启动成功则返回真(<c>True</c>)，否则返回假(<c>False</c>)。</returns>
-	bool Launch(string root, Deployer.Argument argument);
+	void Launch(Deployer.Argument argument);
 }

upgrading/deployer/Launcher.Daemon.cs

@@ -32,6 +32,7 @@
  */
 
 using System;
+using System.IO;
 using System.Diagnostics;
 
 namespace Zongsoft.Upgrading;
@@ -41,9 +42,8 @@ partial class Launcher
 	private sealed class DaemonLauncher : ILauncher
 	{
 		public string Name => "Daemon";
-		public bool Launch(string root, Deployer.Argument argument)
+		public void Launch(Deployer.Argument argument)
 		{
-			return false;
 		}
 	}
 }

upgrading/deployer/Launcher.Default.cs

@@ -32,6 +32,7 @@
  */
 
 using System;
+using System.IO;
 using System.Diagnostics;
 
 namespace Zongsoft.Upgrading;
@@ -41,9 +42,16 @@ partial class Launcher
 	private sealed class DefaultLauncher : ILauncher
 	{
 		public string Name => string.Empty;
-		public bool Launch(string root, Deployer.Argument argument)
+		public void Launch(Deployer.Argument argument)
 		{
-			return false;
+			var info = new ProcessStartInfo(argument.AppPath)
+			{
+				WindowStyle = ProcessWindowStyle.Normal,
+				WorkingDirectory = Path.GetDirectoryName(argument.AppPath),
+			};
+
+			//启动升级部署器程序
+			Process.Start(info);
 		}
 	}
 }

upgrading/deployer/Launcher.Web.cs

@@ -32,6 +32,7 @@
  */
 
 using System;
+using System.IO;
 using System.Diagnostics;
 
 namespace Zongsoft.Upgrading;
@@ -41,9 +42,8 @@ partial class Launcher
 	private sealed class WebLauncher : ILauncher
 	{
 		public string Name => "Web";
-		public bool Launch(string root, Deployer.Argument argument)
+		public void Launch(Deployer.Argument argument)
 		{
-			return false;
 		}
 	}
 }

upgrading/deployer/Launcher.cs

@@ -32,6 +32,7 @@
  */
 
 using System;
+using System.IO;
 using System.Collections.Generic;
 
 namespace Zongsoft.Upgrading;
@@ -65,22 +66,29 @@ static Launcher()
 	#endregion
 
 	#region 公共方法
-	public static bool Launch(string root, Deployer.Argument argument)
+	public static void Launch(Deployer.Deployment deployment, Deployer.Argument argument)
 	{
-		if(string.IsNullOrEmpty(root) || argument == null)
-			return false;
+		if(argument == null || deployment == null)
+			return;
 
 		try
 		{
+			//根据宿主应用类型获取对应的启动器
 			if(_launchers.TryGetValue(argument.AppType ?? string.Empty, out var launcher))
-				return launcher.Launch(root, argument);
+				launcher.Launch(argument);
 			else
-				return Default.Launch(root, argument);
+				Default.Launch(argument);
+
+			//释放部署文件(解除排他性锁)
+			deployment.Dispose();
+
+			//删除部署文件
+			if(File.Exists(argument.Deployment))
+				File.Delete(argument.Deployment);
 		}
 		catch(Exception ex)
 		{
 			Zongsoft.Diagnostics.Logging.GetLogging<Program>().Error(ex);
-			return false;
 		}
 	}
 	#endregion