调整目录结构。 🍲

Author: PopeyeZhong

upgrading/.shared/Deployer.cs

@@ -44,7 +44,7 @@ public static partial class Deployer
 	/// <summary>表示部署器程序的目录名。</summary>
 	public static readonly string DIRECTORY = ".deployer";
 	/// <summary>表示部署器程序的文件名。</summary>
-	public static readonly string FILENAME = OperatingSystem.IsWindows() ? "deployer.exe" : "deployer";
+	public static readonly string FILENAME = OperatingSystem.IsWindows() ? $"Zongsoft.Upgrading.Deployer.exe" : "Zongsoft.Upgrading.Deployer";
 	#endregion
 
 	#region 公共属性
@@ -58,15 +58,15 @@ public static partial class Deployer
 	public static bool HasDeployment() => HasDeployment(out _);
 	public static bool HasDeployment(out FileInfo file)
 	{
-		file = new FileInfo(Path.Combine(Application.ApplicationPath, Configurator.FileName));
+		file = new FileInfo(Path.Combine(Application.ApplicationPath, Deployment.FileName));
 
 		if(file.Exists)
 		{
-			using var configurator = Configurator.Load(file.FullName, false);
+			using var deployment = Deployment.Load(file.FullName, false);
 
-			if(configurator != null)
+			if(deployment != null)
 			{
-				var filePath = Path.Combine(configurator.Packages, ".version");
+				var filePath = Path.Combine(deployment.Packages, ".version");
 
 				if(File.Exists(filePath))
 				{
@@ -85,18 +85,18 @@ public static bool HasDeployment(out FileInfo file)
 	#endregion
 
 	/// <summary>提供部署器相关配置功能的类。</summary>
-	public sealed class Configurator : IDisposable
+	public sealed class Deployment : IDisposable
 	{
 		#region 常量定义
-		internal const string FileName = ".deploy";
+		internal const string FileName = ".deployment";
 		#endregion
 
 		#region 私有变量
 		private FileStream _stream;
 		#endregion
 
 		#region 私有构造
-		private Configurator(FileStream stream, string manifest, string packages)
+		private Deployment(FileStream stream, string manifest, string packages)
 		{
 			_stream = stream;
 			this.Manifest = manifest;
@@ -120,7 +120,7 @@ public void Dispose()
 		#endregion
 
 		#region 静态方法
-		public static Configurator Load(string path, bool exclusive)
+		public static Deployment Load(string path, bool exclusive)
 		{
 			if(string.IsNullOrEmpty(path) || !File.Exists(path))
 				return null;
@@ -168,7 +168,7 @@ public static Configurator Load(string path, bool exclusive)
 					stream.Dispose();
 			}
 
-			return string.IsNullOrEmpty(manifest) || string.IsNullOrEmpty(packages) ? null : new Configurator(exclusive ? stream : null, manifest, packages);
+			return string.IsNullOrEmpty(manifest) || string.IsNullOrEmpty(packages) ? null : new Deployment(exclusive ? stream : null, manifest, packages);
 		}
 
 		public static string Save(string manifest, string packages, string directory = null)

upgrading/client/Upgrader.cs

@@ -58,7 +58,7 @@ public static async ValueTask<bool> UpgradeAsync(string channel, CancellationTok
 			return false;
 
 		//创建本次升级的部署文件文件
-		return Deployer.Configurator.Save(info.FilePath, Path.GetDirectoryName(version)) != null;
+		return Deployer.Deployment.Save(info.FilePath, Path.GetDirectoryName(version)) != null;
 	}
 
 	public static void Deploy()

upgrading/upgrader/.dockerignore upgrading/deployer/.dockerignoreupgrading/upgrader/.dockerignore renamed to upgrading/deployer/.dockerignore

@@ -47,17 +47,17 @@ public static void Deploy(Argument argument)
 			return;
 
 		//获取部署配置信息并以排他性的锁定部署文件
-		using var configurator = GetConfigurator(argument);
-		if(configurator == null)
+		using var deployment = GetDeployment(argument);
+		if(deployment == null)
 			return;
 
 		//如果部署包源目录不存在则退出
-		var packages = new DirectoryInfo(configurator.Packages);
+		var packages = new DirectoryInfo(deployment.Packages);
 		if(!packages.Exists)
 			return;
 
 		//如果升级清单加载失败则退出
-		var manifest = Manifest.Load(configurator.Manifest);
+		var manifest = Manifest.Load(deployment.Manifest);
 		if(manifest == null || manifest.IsEmpty)
 			return;
 
@@ -77,7 +77,7 @@ public static void Deploy(Argument argument)
 	#endregion
 
 	#region 私有方法
-	private static Configurator GetConfigurator(Argument argument)
+	private static Deployment GetDeployment(Argument argument)
 	{
 		var deployment = argument.Deployment;
 
@@ -88,7 +88,7 @@ private static Configurator GetConfigurator(Argument argument)
 
 			try
 			{
-				return Configurator.Load(deployment, true);
+				return Deployment.Load(deployment, true);
 			}
 			catch(Exception ex)
 			{