From ab5544d2a796f123649b369ff0f731d11edda966 Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Fri, 27 Jun 2025 10:34:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=A1=8C=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DebUOS/Packaging.DebUOS.Tool/Options.cs                   | 2 +-
 DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj | 3 +++
 DebUOS/Packaging.DebUOS.Tool/Program.cs                   | 3 ++-
 DebUOS/Packaging.DebUOS/Packaging.DebUOS.csproj           | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/DebUOS/Packaging.DebUOS.Tool/Options.cs b/DebUOS/Packaging.DebUOS.Tool/Options.cs
index a45d0d0..9f75a04 100644
--- a/DebUOS/Packaging.DebUOS.Tool/Options.cs
+++ b/DebUOS/Packaging.DebUOS.Tool/Options.cs
@@ -1,4 +1,4 @@
-using dotnetCampus.Cli;
+using DotNetCampus.Cli.Compiler;
 
 namespace Packaging.DebUOS.Tool;
 
diff --git a/DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj b/DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj
index 5ea62c3..d455ce5 100644
--- a/DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj
+++ b/DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj
@@ -29,4 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="dotnetCampus.CommandLine" Version="4.0.0-alpha04" />
+  </ItemGroup>
 </Project>
diff --git a/DebUOS/Packaging.DebUOS.Tool/Program.cs b/DebUOS/Packaging.DebUOS.Tool/Program.cs
index 6036235..892a612 100644
--- a/DebUOS/Packaging.DebUOS.Tool/Program.cs
+++ b/DebUOS/Packaging.DebUOS.Tool/Program.cs
@@ -2,7 +2,8 @@
 
 using System.Reflection;
 using System.Text;
-using dotnetCampus.Cli;
+using DotNetCampus.Cli;
+using DotNetCampus.Cli.Compiler;
 using dotnetCampus.Configurations.Core;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/DebUOS/Packaging.DebUOS/Packaging.DebUOS.csproj b/DebUOS/Packaging.DebUOS/Packaging.DebUOS.csproj
index 1fde0ad..19a68c0 100644
--- a/DebUOS/Packaging.DebUOS/Packaging.DebUOS.csproj
+++ b/DebUOS/Packaging.DebUOS/Packaging.DebUOS.csproj
@@ -12,7 +12,6 @@
   <ItemGroup>
     <!-- BoncyCastle and SharpZipLib are included in the lib\ folder in the Packaging.Targets package (see below), so we don't need an
          explicit dependency on them, either -->
-    <PackageReference Include="dotnetCampus.CommandLine" Version="3.3.1" />
     <PackageReference Include="dotnetCampus.Configurations" Version="1.6.12" />
 
     <PackageReference Include="dotnetCampus.MSBuildUtils.Source" Version="1.1.1-alpha01">

From 8f03f6dca0dd20c1b77fb5ab2f79824636455e9c Mon Sep 17 00:00:00 2001
From: lindexi <lindexi_gd@163.com>
Date: Fri, 27 Jun 2025 10:41:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=BA=E8=A1=8C?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DebUOS/Packaging.DebUOS.Tool/Options.cs | 6 ++++++
 DebUOS/Packaging.DebUOS.Tool/Program.cs | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/DebUOS/Packaging.DebUOS.Tool/Options.cs b/DebUOS/Packaging.DebUOS.Tool/Options.cs
index 9f75a04..356a43e 100644
--- a/DebUOS/Packaging.DebUOS.Tool/Options.cs
+++ b/DebUOS/Packaging.DebUOS.Tool/Options.cs
@@ -22,4 +22,10 @@ public class Options
 
     [Option('o', "Output", Description = "Output path", LocalizableDescription = "输出的 deb 文件路径")]
     public string? OutputPath { set; get; }
+
+    /// <summary>
+    /// 是否强行使用 UTF-8 编码作为控制台输出
+    /// </summary>
+    [Option()]
+    public bool? ForceUtf8ConsoleOutput { get; init; }
 }
diff --git a/DebUOS/Packaging.DebUOS.Tool/Program.cs b/DebUOS/Packaging.DebUOS.Tool/Program.cs
index 892a612..f5df754 100644
--- a/DebUOS/Packaging.DebUOS.Tool/Program.cs
+++ b/DebUOS/Packaging.DebUOS.Tool/Program.cs
@@ -14,6 +14,11 @@
 
 var options = CommandLine.Parse(args).As<Options>();
 
+if (options.ForceUtf8ConsoleOutput is true)
+{
+    Console.OutputEncoding = Encoding.UTF8;
+}
+
 var loggerFactory = LoggerFactory.Create(builder =>
 {
     builder.AddConsole(loggerOptions => loggerOptions.FormatterName = MSBuildFormatter.FormatterName);