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