Merge pull request #172 from dotnet-campus/t/lindexi/CommandLine

更新命令行库和约定默认编码

Author: walterlv

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; }
+
+    /// <summary>
+    /// 是否强行使用 UTF-8 编码作为控制台输出
+    /// </summary>
+    [Option()]
+    public bool? ForceUtf8ConsoleOutput { get; init; }
 }

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>

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<Options>();
 
+if (options.ForceUtf8ConsoleOutput is true)
+{
+    Console.OutputEncoding = Encoding.UTF8;
+}
+
 var loggerFactory = LoggerFactory.Create(builder =>
 {
     builder.AddConsole(loggerOptions => loggerOptions.FormatterName = MSBuildFormatter.FormatterName);

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">