Version 2.8.0

- **Improved:** Updated to version `2.0.0-rc.1.25451.107` of System.CommandLine.
- **Added:** `MaxWidth`property to `CustomHelpAction`
  and ensure correct `maxWidth` parameter in `CliHelpBuilder` constructor if not specified.

Author: calacayir

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#generateassemblyinfo -->
-    <VersionPrefix>2.7.1</VersionPrefix>
+    <VersionPrefix>2.8.0</VersionPrefix>
     <Product>DotMake Command-Line</Product>
     <Company>DotMake</Company>
     <!-- Copyright is also used for NuGet metadata -->

src/DotMake.CommandLine/CliContext.cs

@@ -209,7 +209,7 @@ private HelpOption GetHelpOptionOrDefault()
                 {
                     Action = new CustomHelpAction
                     {
-                        Builder = new CliHelpBuilder(CliTheme.Default, Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth)
+                        Builder = new CliHelpBuilder(CliTheme.Default)
                     }
                 };
 

src/DotMake.CommandLine/CliHelpBuilder.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.Data.Common;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -28,12 +27,29 @@ public class CliHelpBuilder : HelpBuilder
         /// </summary>
         /// <param name="theme">The theme to use for help output</param>
         /// <param name="maxWidth">The maximum width in characters after which help output is wrapped.</param>
-        public CliHelpBuilder(CliTheme theme, int maxWidth = int.MaxValue)
-            : base(maxWidth)
+        public CliHelpBuilder(CliTheme theme, int maxWidth = -1)
+            : base(EnsureMaxWidth(maxWidth))
         {
             this.theme = theme;
         }
 
+        private static int EnsureMaxWidth(int maxWidth)
+        {
+            if (maxWidth < 0)
+            {
+                try
+                {
+                    return Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth;
+                }
+                catch (Exception)
+                {
+                    return int.MaxValue;
+                }
+            }
+
+            return maxWidth;
+        }
+
         /// <summary>
         /// Gets the theme used by this <see cref="CliHelpBuilder"/>.
         /// </summary>

src/DotMake.CommandLine/CliParser.cs

@@ -68,7 +68,7 @@ internal CliParser(Type definitionType, CliSettings settings = null)
                 {
                     Action = new CustomHelpAction
                     {
-                        Builder = new CliHelpBuilder(settings.Theme, Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth)
+                        Builder = new CliHelpBuilder(settings.Theme)
                     }
                 };
                 rootCommand.Options.Add(helpOption);

src/DotMake.CommandLine/DotMake.CommandLine.csproj

@@ -21,7 +21,9 @@
     <PackageTags>command-line CLI console System.CommandLine declarative attributes parsing command argument option generator</PackageTags>
     <PackageReleaseNotes>
       <![CDATA[
-        - **Fixed:** Foreground color is always white on macOS regardless of theme settings.
+        - **Improved:** Updated to version `2.0.0-rc.1.25451.107` of System.CommandLine.
+        - **Added:** `MaxWidth`property to `CustomHelpAction`
+          and ensure correct `maxWidth` parameter in `CliHelpBuilder` constructor if not specified.
       ]]>
      </PackageReleaseNotes>
   </PropertyGroup>
@@ -30,7 +32,7 @@
 
   <ItemGroup>
     <!-- use exact version match with [] for now as future beta versions can break API -->
-    <PackageReference Include="System.CommandLine" Version="[2.0.0-beta7.25380.108]" />
+    <PackageReference Include="System.CommandLine" Version="[2.0.0-rc.1.25451.107]" />
 
     <!--
       UPDATE: No longer using this as now 2.0.0-beta5.25306.1 is released to official nuget feed.

src/DotMake.CommandLine/Help/CustomHelpAction.cs

@@ -12,13 +12,47 @@ namespace DotMake.CommandLine.Help
     public sealed class CustomHelpAction : SynchronousCommandLineAction
     {
         private HelpBuilder? builder;
+        private int maxWidth = -1;
+
+        /// <summary>
+        /// The maximum width in characters after which help output is wrapped.
+        /// </summary>
+        /// <remarks>It defaults to <see cref="Console.WindowWidth"/> if output is not redirected.</remarks>
+        public int MaxWidth
+        {
+            get
+            {
+                if (maxWidth < 0)
+                {
+                    try
+                    {
+                        maxWidth = Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth;
+                    }
+                    catch (Exception)
+                    {
+                        maxWidth = int.MaxValue;
+                    }
+                }
+
+                return maxWidth;
+            }
+            set
+            {
+                if (value <= 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                }
+
+                maxWidth = value;
+            }
+        }
 
         /// <summary>
         /// Specifies an <see cref="Builder"/> to be used to format help output when help is requested.
         /// </summary>
         public HelpBuilder Builder
         {
-            get => builder ??= new HelpBuilder(Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth);
+            get => builder ??= new HelpBuilder(MaxWidth);
             set => builder = value ?? throw new ArgumentNullException(nameof(value));
         }
 

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(ModuleInitializerAttribute).g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.7.1.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
+// Generated by DotMake.CommandLine.SourceGeneration v2.8.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
 // Generation: 1
 
 #if !NET5_0_OR_GREATER

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(RequiredMemberAttribute).g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.7.1.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
+// Generated by DotMake.CommandLine.SourceGeneration v2.8.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
 // Generation: 1
 
 // Licensed to the .NET Foundation under one or more agreements.

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/ArgumentConverterCliCommandBuilder-3j0trcm.g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.7.1.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
+// Generated by DotMake.CommandLine.SourceGeneration v2.8.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
 // Generation: 1
 
 namespace TestApp.Commands.GeneratedCode

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/CamelCaseCliCommandBuilder-2ntm48g.g.cs

@@ -1,6 +1,6 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.7.1.0
-// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
+// Generated by DotMake.CommandLine.SourceGeneration v2.8.0.0
+// Roslyn (Microsoft.CodeAnalysis) v4.1400.25.41305
 // Generation: 1
 
 namespace TestApp.Commands.CasingConvention.GeneratedCode