Update version

Co-authored-by: Alexey Golub <tyrrrrrr@gmail.com>

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: Tyrrrz
-patreon: Tyrrrz
-custom: ['buymeacoffee.com/Tyrrrz', 'tyrrrz.me/donate']

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: 💬 Discord server
+    url: https://discord.gg/2SUWKFnHSm
+    about: Chat with the project community.
   - name: 🗨 Discussions
     url: https://github.com/Tyrrrz/CliFx/discussions/new
     about: Ask and answer questions.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-<!--
-
-**Important:**
-
-Please make sure that there is an existing issue that describes the problem solved by your pull request. If there isn't one, consider creating it first.
-An open issue offers a good place to iron out requirements, discuss possible solutions, and ask questions.
-
-Remember to also:
-
-- Keep your pull request focused and as small as possible. If you want to contribute multiple unrelated changes, please create separate pull requests for them.
-- Follow the coding style and conventions already established by the project. When in doubt about which style to use, ask in the comments to your pull request.
-- If you want to start a discussion regarding a specific change you've made, add a review comment to your own code. This can be used to highlight something important or to seek further input from others.
-
--->
-
-<!-- Please specify the issue addressed by this pull request -->
-Closes #ISSUE_NUMBER

.github/workflows/CD.yml

@@ -1,25 +0,0 @@
-name: CD
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.3
-
-      - name: Install .NET
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 5.0.x
-
-      - name: Pack
-        run: dotnet pack CliFx --configuration Release
-
-      - name: Deploy
-        run: dotnet nuget push CliFx/bin/Release/*.nupkg -s nuget.org -k ${{ secrets.NUGET_TOKEN }}

.github/workflows/CI.yml

@@ -1,28 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.3
-
-      - name: Install .NET
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 5.0.x
-
-      - name: Build & test
-        run: dotnet test --configuration Release --logger GitHubActions
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@v1.0.5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/main.yml

@@ -0,0 +1,11 @@
+name: main
+
+on: [push, pull_request]
+
+jobs:
+  main:
+    uses: Tyrrrz/.github/.github/workflows/NuGet.yml@master
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}

Changelog.md

@@ -1,3 +1,13 @@
+### v2.1 (04-Jan-2022)
+
+- Added `IConsole.Clear()` with corresponding implementations in `SystemConsole`, `FakeConsole`, and `FakeInMemoryConsole`. (Thanks [@Alex Rosenfeld](https://github.com/alexrosenfeld10))
+- Added `IConsole.ReadKey()` with corresponding implementations in `SystemConsole`, `FakeConsole`, and `FakeInMemoryConsole`. (Thanks [@Alex Rosenfeld](https://github.com/alexrosenfeld10))
+- Fixed an issue that caused parameters to appear out of order in the usage format section of the help text. (Thanks [@David Fallah](https://github.com/TAGC))
+
+### v2.0.6 (17-Jul-2021)
+
+- Fixed an issue where an exception thrown via reflection during parameter or option binding resulted in `Exception has been thrown by the target of an invocation` error instead of a more useful message. Such exceptions will now be unwrapped to provide better user experience.
+
 ### v2.0.5 (09-Jul-2021)
 
 - Fixed an issue where calling `IConsole.Output.Encoding.EncodingName` and some other members threw an exception.

CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <CollectCoverage>true</CollectCoverage>
@@ -13,14 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Basic.Reference.Assemblies" Version="1.1.2" />
+    <PackageReference Include="Basic.Reference.Assemblies" Version="1.2.4" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
-    <PackageReference Include="coverlet.msbuild" Version="3.0.3" PrivateAssets="all" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

CliFx.Analyzers.Tests/CommandMustBeAnnotatedAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class CommandMustBeAnnotatedAnalyzerSpecs
 {
-    public class CommandMustBeAnnotatedAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new CommandMustBeAnnotatedAnalyzer();
 
     [Fact]
@@ -68,5 +68,4 @@ public class Foo
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/CommandMustImplementInterfaceAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class CommandMustImplementInterfaceAnalyzerSpecs
 {
-    public class CommandMustImplementInterfaceAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new CommandMustImplementInterfaceAnalyzer();
 
     [Fact]
@@ -54,5 +54,4 @@ public class Foo
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/GeneralSpecs.cs

@@ -4,10 +4,10 @@ using FluentAssertions;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class GeneralSpecs
 {
-    public class GeneralSpecs
-    {
     [Fact]
     public void All_analyzers_have_unique_diagnostic_IDs()
     {
@@ -27,5 +27,4 @@ namespace CliFx.Analyzers.Tests
         // Assert
         diagnosticIds.Should().OnlyHaveUniqueItems();
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustBeInsideCommandAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustBeInsideCommandAnalyzerSpecs
 {
-    public class OptionMustBeInsideCommandAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustBeInsideCommandAnalyzer();
 
     [Fact]
@@ -76,5 +76,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveNameOrShortNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveNameOrShortNameAnalyzerSpecs
 {
-    public class OptionMustHaveNameOrShortNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveNameOrShortNameAnalyzer();
 
     [Fact]
@@ -82,5 +82,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveUniqueNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveUniqueNameAnalyzerSpecs
 {
-    public class OptionMustHaveUniqueNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveUniqueNameAnalyzer();
 
     [Fact]
@@ -88,5 +88,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveUniqueShortNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveUniqueShortNameAnalyzerSpecs
 {
-    public class OptionMustHaveUniqueShortNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveUniqueShortNameAnalyzer();
 
     [Fact]
@@ -110,5 +110,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveValidConverterAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveValidConverterAnalyzerSpecs
 {
-    public class OptionMustHaveValidConverterAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidConverterAnalyzer();
 
     [Fact]
@@ -92,5 +92,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveValidNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveValidNameAnalyzerSpecs
 {
-    public class OptionMustHaveValidNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidNameAnalyzer();
 
     [Fact]
@@ -101,5 +101,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveValidShortNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveValidShortNameAnalyzerSpecs
 {
-    public class OptionMustHaveValidShortNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidShortNameAnalyzer();
 
     [Fact]
@@ -82,5 +82,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/OptionMustHaveValidValidatorsAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class OptionMustHaveValidValidatorsAnalyzerSpecs
 {
-    public class OptionMustHaveValidValidatorsAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidValidatorsAnalyzer();
 
     [Fact]
@@ -92,5 +92,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustBeInsideCommandAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustBeInsideCommandAnalyzerSpecs
 {
-    public class ParameterMustBeInsideCommandAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeInsideCommandAnalyzer();
 
     [Fact]
@@ -76,5 +76,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustBeLastIfNonScalarAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustBeLastIfNonScalarAnalyzerSpecs
 {
-    public class ParameterMustBeLastIfNonScalarAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeLastIfNonScalarAnalyzer();
 
     [Fact]
@@ -91,5 +91,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustBeSingleIfNonScalarAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustBeSingleIfNonScalarAnalyzerSpecs
 {
-    public class ParameterMustBeSingleIfNonScalarAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeSingleIfNonScalarAnalyzer();
 
     [Fact]
@@ -91,5 +91,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustHaveUniqueNameAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustHaveUniqueNameAnalyzerSpecs
 {
-    public class ParameterMustHaveUniqueNameAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveUniqueNameAnalyzer();
 
     [Fact]
@@ -69,5 +69,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustHaveUniqueOrderAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustHaveUniqueOrderAnalyzerSpecs
 {
-    public class ParameterMustHaveUniqueOrderAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveUniqueOrderAnalyzer();
 
     [Fact]
@@ -69,5 +69,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustHaveValidConverterAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustHaveValidConverterAnalyzerSpecs
 {
-    public class ParameterMustHaveValidConverterAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveValidConverterAnalyzer();
 
     [Fact]
@@ -92,5 +92,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/ParameterMustHaveValidValidatorsAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class ParameterMustHaveValidValidatorsAnalyzerSpecs
 {
-    public class ParameterMustHaveValidValidatorsAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveValidValidatorsAnalyzer();
 
     [Fact]
@@ -92,5 +92,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/SystemConsoleShouldBeAvoidedAnalyzerSpecs.cs

@@ -2,10 +2,10 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
+namespace CliFx.Analyzers.Tests;
+
+public class SystemConsoleShouldBeAvoidedAnalyzerSpecs
 {
-    public class SystemConsoleShouldBeAvoidedAnalyzerSpecs
-    {
     private static DiagnosticAnalyzer Analyzer { get; } = new SystemConsoleShouldBeAvoidedAnalyzer();
 
     [Fact]
@@ -123,5 +123,4 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
-    }
 }

CliFx.Analyzers.Tests/Utils/AnalyzerAssertions.cs

@@ -11,10 +11,10 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 
-namespace CliFx.Analyzers.Tests.Utils
+namespace CliFx.Analyzers.Tests.Utils;
+
+internal class AnalyzerAssertions : ReferenceTypeAssertions<DiagnosticAnalyzer, AnalyzerAssertions>
 {
-    internal class AnalyzerAssertions : ReferenceTypeAssertions<DiagnosticAnalyzer, AnalyzerAssertions>
-    {
     protected override string Identifier { get; } = "analyzer";
 
     public AnalyzerAssertions(DiagnosticAnalyzer analyzer)
@@ -159,10 +159,9 @@ namespace CliFx.Analyzers.Tests.Utils
             return new FailReason(buffer.ToString());
         });
     }
-    }
-
-    internal static class AnalyzerAssertionsExtensions
-    {
-        public static AnalyzerAssertions Should(this DiagnosticAnalyzer analyzer) => new(analyzer);
-    }
+}
+
+internal static class AnalyzerAssertionsExtensions
+{
+    public static AnalyzerAssertions Should(this DiagnosticAnalyzer analyzer) => new(analyzer);
 }

CliFx.Analyzers/AnalyzerBase.cs

@@ -3,10 +3,10 @@ using CliFx.Analyzers.Utils.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+public abstract class AnalyzerBase : DiagnosticAnalyzer
 {
-    public abstract class AnalyzerBase : DiagnosticAnalyzer
-    {
     public DiagnosticDescriptor SupportedDiagnostic { get; }
 
     public sealed override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
@@ -36,5 +36,4 @@ namespace CliFx.Analyzers
         context.EnableConcurrentExecution();
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
     }
-    }
 }

CliFx.Analyzers/CommandMustBeAnnotatedAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class CommandMustBeAnnotatedAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CommandMustBeAnnotatedAnalyzer : AnalyzerBase
-    {
     public CommandMustBeAnnotatedAnalyzer()
         : base(
             $"Commands must be annotated with `{SymbolNames.CliFxCommandAttribute}`",
@@ -50,5 +50,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandleClassDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/CommandMustImplementInterfaceAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class CommandMustImplementInterfaceAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class CommandMustImplementInterfaceAnalyzer : AnalyzerBase
-    {
     public CommandMustImplementInterfaceAnalyzer()
         : base(
             $"Commands must implement `{SymbolNames.CliFxCommandInterface}` interface",
@@ -44,5 +44,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandleClassDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ObjectModel/CommandOptionSymbol.cs

@@ -3,10 +3,10 @@ using Microsoft.CodeAnalysis;
 using System.Linq;
 using CliFx.Analyzers.Utils.Extensions;
 
-namespace CliFx.Analyzers.ObjectModel
+namespace CliFx.Analyzers.ObjectModel;
+
+internal partial class CommandOptionSymbol
 {
-    internal partial class CommandOptionSymbol
-    {
     public string? Name { get; }
 
     public char? ShortName { get; }
@@ -26,10 +26,10 @@ namespace CliFx.Analyzers.ObjectModel
         ConverterType = converterType;
         ValidatorTypes = validatorTypes;
     }
-    }
+}
 
-    internal partial class CommandOptionSymbol
-    {
+internal partial class CommandOptionSymbol
+{
     private static AttributeData? TryGetOptionAttribute(IPropertySymbol property) =>
         property
             .GetAttributes()
@@ -79,5 +79,4 @@ namespace CliFx.Analyzers.ObjectModel
 
     public static bool IsOptionProperty(IPropertySymbol property) =>
         TryGetOptionAttribute(property) is not null;
-    }
 }

CliFx.Analyzers/ObjectModel/CommandParameterSymbol.cs

@@ -3,10 +3,10 @@ using System.Linq;
 using CliFx.Analyzers.Utils.Extensions;
 using Microsoft.CodeAnalysis;
 
-namespace CliFx.Analyzers.ObjectModel
+namespace CliFx.Analyzers.ObjectModel;
+
+internal partial class CommandParameterSymbol
 {
-    internal partial class CommandParameterSymbol
-    {
     public int Order { get; }
 
     public string? Name { get; }
@@ -26,10 +26,10 @@ namespace CliFx.Analyzers.ObjectModel
         ConverterType = converterType;
         ValidatorTypes = validatorTypes;
     }
-    }
+}
 
-    internal partial class CommandParameterSymbol
-    {
+internal partial class CommandParameterSymbol
+{
     private static AttributeData? TryGetParameterAttribute(IPropertySymbol property) =>
         property
             .GetAttributes()
@@ -78,5 +78,4 @@ namespace CliFx.Analyzers.ObjectModel
 
     public static bool IsParameterProperty(IPropertySymbol property) =>
         TryGetParameterAttribute(property) is not null;
-    }
 }

CliFx.Analyzers/ObjectModel/SymbolNames.cs

@@ -1,7 +1,7 @@
-namespace CliFx.Analyzers.ObjectModel
+namespace CliFx.Analyzers.ObjectModel;
+
+internal static class SymbolNames
 {
-    internal static class SymbolNames
-    {
     public const string CliFxCommandInterface = "CliFx.ICommand";
     public const string CliFxCommandAttribute = "CliFx.Attributes.CommandAttribute";
     public const string CliFxCommandParameterAttribute = "CliFx.Attributes.CommandParameterAttribute";
@@ -11,5 +11,4 @@
     public const string CliFxBindingConverterClass = "CliFx.Extensibility.BindingConverter<T>";
     public const string CliFxBindingValidatorInterface = "CliFx.Extensibility.IBindingValidator";
     public const string CliFxBindingValidatorClass = "CliFx.Extensibility.BindingValidator<T>";
-    }
 }

CliFx.Analyzers/OptionMustBeInsideCommandAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustBeInsideCommandAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustBeInsideCommandAnalyzer : AnalyzerBase
-    {
     public OptionMustBeInsideCommandAnalyzer()
         : base(
             "Options must be defined inside commands",
@@ -47,5 +47,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveNameOrShortNameAnalyzer.cs

@@ -4,11 +4,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveNameOrShortNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveNameOrShortNameAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveNameOrShortNameAnalyzer()
         : base(
             "Options must have either a name or short name specified",
@@ -36,5 +36,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveUniqueNameAnalyzer.cs

@@ -6,11 +6,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveUniqueNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveUniqueNameAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveUniqueNameAnalyzer()
         : base(
             "Options must have unique names",
@@ -61,5 +61,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveUniqueShortNameAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveUniqueShortNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveUniqueShortNameAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveUniqueShortNameAnalyzer()
         : base(
             "Options must have unique short names",
@@ -60,5 +60,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveValidConverterAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveValidConverterAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveValidConverterAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveValidConverterAnalyzer()
         : base(
             $"Option converters must derive from `{SymbolNames.CliFxBindingConverterClass}`",
@@ -46,5 +46,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveValidNameAnalyzer.cs

@@ -4,11 +4,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveValidNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveValidNameAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveValidNameAnalyzer()
         : base(
             "Options must have valid names",
@@ -39,5 +39,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveValidShortNameAnalyzer.cs

@@ -4,11 +4,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveValidShortNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveValidShortNameAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveValidShortNameAnalyzer()
         : base(
             "Option short names must be letter characters",
@@ -39,5 +39,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/OptionMustHaveValidValidatorsAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class OptionMustHaveValidValidatorsAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class OptionMustHaveValidValidatorsAnalyzer : AnalyzerBase
-    {
     public OptionMustHaveValidValidatorsAnalyzer()
         : base(
             $"Option validators must derive from `{SymbolNames.CliFxBindingValidatorClass}`",
@@ -48,5 +48,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustBeInsideCommandAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustBeInsideCommandAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustBeInsideCommandAnalyzer : AnalyzerBase
-    {
     public ParameterMustBeInsideCommandAnalyzer()
         : base(
             "Parameters must be defined inside commands",
@@ -47,5 +47,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustBeLastIfNonScalarAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustBeLastIfNonScalarAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustBeLastIfNonScalarAnalyzer : AnalyzerBase
-    {
     public ParameterMustBeLastIfNonScalarAnalyzer()
         : base(
             "Parameters of non-scalar types must be last in order",
@@ -64,5 +64,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustBeSingleIfNonScalarAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustBeSingleIfNonScalarAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustBeSingleIfNonScalarAnalyzer : AnalyzerBase
-    {
     public ParameterMustBeSingleIfNonScalarAnalyzer()
         : base(
             "Parameters of non-scalar types are limited to one per command",
@@ -62,5 +62,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustHaveUniqueNameAnalyzer.cs

@@ -6,11 +6,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustHaveUniqueNameAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustHaveUniqueNameAnalyzer : AnalyzerBase
-    {
     public ParameterMustHaveUniqueNameAnalyzer()
         : base(
             "Parameters must have unique names",
@@ -61,5 +61,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustHaveUniqueOrderAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustHaveUniqueOrderAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustHaveUniqueOrderAnalyzer : AnalyzerBase
-    {
     public ParameterMustHaveUniqueOrderAnalyzer()
         : base(
             "Parameters must have unique order",
@@ -54,5 +54,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustHaveValidConverterAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustHaveValidConverterAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustHaveValidConverterAnalyzer : AnalyzerBase
-    {
     public ParameterMustHaveValidConverterAnalyzer()
         : base(
             $"Parameter converters must derive from `{SymbolNames.CliFxBindingConverterClass}`",
@@ -46,5 +46,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/ParameterMustHaveValidValidatorsAnalyzer.cs

@@ -5,11 +5,11 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ParameterMustHaveValidValidatorsAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class ParameterMustHaveValidValidatorsAnalyzer : AnalyzerBase
-    {
     public ParameterMustHaveValidValidatorsAnalyzer()
         : base(
             $"Parameter validators must derive from `{SymbolNames.CliFxBindingValidatorClass}`",
@@ -48,5 +48,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.HandlePropertyDeclaration(Analyze);
     }
-    }
 }

CliFx.Analyzers/SystemConsoleShouldBeAvoidedAnalyzer.cs

@@ -6,11 +6,11 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
+namespace CliFx.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class SystemConsoleShouldBeAvoidedAnalyzer : AnalyzerBase
 {
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class SystemConsoleShouldBeAvoidedAnalyzer : AnalyzerBase
-    {
     public SystemConsoleShouldBeAvoidedAnalyzer()
         : base(
             $"Avoid calling `System.Console` where `{SymbolNames.CliFxConsoleInterface}` is available",
@@ -74,5 +74,4 @@ namespace CliFx.Analyzers
         base.Initialize(context);
         context.RegisterSyntaxNodeAction(Analyze, SyntaxKind.SimpleMemberAccessExpression);
     }
-    }
 }

CliFx.Analyzers/Utils/Extensions/RoslynExtensions.cs

@@ -4,10 +4,10 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers.Utils.Extensions
+namespace CliFx.Analyzers.Utils.Extensions;
+
+internal static class RoslynExtensions
 {
-    internal static class RoslynExtensions
-    {
     public static bool DisplayNameMatches(this ISymbol symbol, string name) =>
         string.Equals(
             // Fully qualified name, without `global::`
@@ -49,5 +49,4 @@ namespace CliFx.Analyzers.Utils.Extensions
             analyze(ctx, propertyDeclaration, property);
         }, SyntaxKind.PropertyDeclaration);
     }
-    }
 }

CliFx.Analyzers/Utils/Extensions/StringExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace CliFx.Analyzers.Utils.Extensions
+namespace CliFx.Analyzers.Utils.Extensions;
+
+internal static class StringExtensions
 {
-    internal static class StringExtensions
-    {
     public static string TrimEnd(
         this string str,
         string sub,
@@ -14,5 +14,4 @@ namespace CliFx.Analyzers.Utils.Extensions
 
         return str;
     }
-    }
 }

CliFx.Benchmarks/Benchmarks.CliFx.cs

@@ -4,10 +4,10 @@ using BenchmarkDotNet.Attributes;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     [Command]
     public class CliFxCommand : ICommand
     {
@@ -29,5 +29,4 @@ namespace CliFx.Benchmarks
             .AddCommand<CliFxCommand>()
             .Build()
             .RunAsync(Arguments, new Dictionary<string, string>());
-    }
 }

CliFx.Benchmarks/Benchmarks.Clipr.cs

@@ -1,10 +1,10 @@
 using BenchmarkDotNet.Attributes;
 using clipr;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class CliprCommand
     {
         [NamedArgument('s', "str")]
@@ -23,5 +23,4 @@ namespace CliFx.Benchmarks
 
     [Benchmark(Description = "Clipr")]
     public void ExecuteWithClipr() => CliParser.Parse<CliprCommand>(Arguments).Execute();
-    }
 }

CliFx.Benchmarks/Benchmarks.Cocona.cs

@@ -1,10 +1,10 @@
 using BenchmarkDotNet.Attributes;
 using Cocona;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class CoconaCommand
     {
         public void Execute(
@@ -20,5 +20,4 @@ namespace CliFx.Benchmarks
 
     [Benchmark(Description = "Cocona")]
     public void ExecuteWithCocona() => CoconaApp.Run<CoconaCommand>(Arguments);
-    }
 }

CliFx.Benchmarks/Benchmarks.CommandLineParser.cs

@@ -1,10 +1,10 @@
 using BenchmarkDotNet.Attributes;
 using CommandLine;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class CommandLineParserCommand
     {
         [Option('s', "str")]
@@ -26,5 +26,4 @@ namespace CliFx.Benchmarks
         new Parser()
             .ParseArguments(Arguments, typeof(CommandLineParserCommand))
             .WithParsed<CommandLineParserCommand>(c => c.Execute());
-    }
 }

CliFx.Benchmarks/Benchmarks.McMaster.cs

@@ -1,10 +1,10 @@
 using BenchmarkDotNet.Attributes;
 using McMaster.Extensions.CommandLineUtils;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class McMasterCommand
     {
         [Option("--str|-s")]
@@ -21,5 +21,4 @@ namespace CliFx.Benchmarks
 
     [Benchmark(Description = "McMaster.Extensions.CommandLineUtils")]
     public int ExecuteWithMcMaster() => CommandLineApplication.Execute<McMasterCommand>(Arguments);
-    }
 }

CliFx.Benchmarks/Benchmarks.PowerArgs.cs

@@ -1,10 +1,10 @@
 using BenchmarkDotNet.Attributes;
 using PowerArgs;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class PowerArgsCommand
     {
         [ArgShortcut("--str"), ArgShortcut("-s")]
@@ -23,5 +23,4 @@ namespace CliFx.Benchmarks
 
     [Benchmark(Description = "PowerArgs")]
     public void ExecuteWithPowerArgs() => Args.InvokeMain<PowerArgsCommand>(Arguments);
-    }
 }

CliFx.Benchmarks/Benchmarks.SystemCommandLine.cs

@@ -3,10 +3,10 @@ using System.CommandLine.Invocation;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+public partial class Benchmarks
 {
-    public partial class Benchmarks
-    {
     public class SystemCommandLineCommand
     {
         public static int ExecuteHandler(string s, int i, bool b) => 0;
@@ -40,5 +40,4 @@ namespace CliFx.Benchmarks
     [Benchmark(Description = "System.CommandLine")]
     public async Task<int> ExecuteWithSystemCommandLine() =>
         await new SystemCommandLineCommand().ExecuteAsync(Arguments);
-    }
 }

CliFx.Benchmarks/Benchmarks.cs

@@ -3,12 +3,12 @@ using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Running;
 
-namespace CliFx.Benchmarks
+namespace CliFx.Benchmarks;
+
+[RankColumn]
+[Orderer(SummaryOrderPolicy.FastestToSlowest)]
+public partial class Benchmarks
 {
-    [RankColumn]
-    [Orderer(SummaryOrderPolicy.FastestToSlowest)]
-    public partial class Benchmarks
-    {
     private static readonly string[] Arguments = {"--str", "hello world", "-i", "13", "-b"};
 
     public static void Main() => BenchmarkRunner.Run<Benchmarks>(
@@ -16,5 +16,4 @@ namespace CliFx.Benchmarks
             .Instance
             .WithOptions(ConfigOptions.DisableOptimizationsValidator)
     );
-    }
 }

CliFx.Benchmarks/CliFx.Benchmarks.csproj

@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="clipr" Version="1.6.1" />
-    <PackageReference Include="Cocona" Version="1.5.0" />
+    <PackageReference Include="Cocona" Version="1.6.0" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
     <PackageReference Include="PowerArgs" Version="3.6.0" />

CliFx.Demo/CliFx.Demo.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

CliFx.Demo/Commands/BookAddCommand.cs

@@ -6,11 +6,11 @@ using CliFx.Demo.Utils;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Commands
+namespace CliFx.Demo.Commands;
+
+[Command("book add", Description = "Add a book to the library.")]
+public partial class BookAddCommand : ICommand
 {
-    [Command("book add", Description = "Add a book to the library.")]
-    public partial class BookAddCommand : ICommand
-    {
     private readonly LibraryProvider _libraryProvider;
 
     [CommandParameter(0, Name = "title", Description = "Book title.")]
@@ -43,10 +43,10 @@ namespace CliFx.Demo.Commands
 
         return default;
     }
-    }
+}
 
-    public partial class BookAddCommand
-    {
+public partial class BookAddCommand
+{
     private static readonly Random Random = new();
 
     private static DateTimeOffset CreateRandomDate() => new(
@@ -66,5 +66,4 @@ namespace CliFx.Demo.Commands
         Random.Next(0, 99),
         Random.Next(0, 9)
     );
-    }
 }

CliFx.Demo/Commands/BookCommand.cs

@@ -5,11 +5,11 @@ using CliFx.Demo.Utils;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Commands
+namespace CliFx.Demo.Commands;
+
+[Command("book", Description = "Retrieve a book from the library.")]
+public class BookCommand : ICommand
 {
-    [Command("book", Description = "Retrieve a book from the library.")]
-    public class BookCommand : ICommand
-    {
     private readonly LibraryProvider _libraryProvider;
 
     [CommandParameter(0, Name = "title", Description = "Title of the book to retrieve.")]
@@ -31,5 +31,4 @@ namespace CliFx.Demo.Commands
 
         return default;
     }
-    }
 }

CliFx.Demo/Commands/BookListCommand.cs

@@ -4,11 +4,11 @@ using CliFx.Demo.Domain;
 using CliFx.Demo.Utils;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Commands
+namespace CliFx.Demo.Commands;
+
+[Command("book list", Description = "List all books in the library.")]
+public class BookListCommand : ICommand
 {
-    [Command("book list", Description = "List all books in the library.")]
-    public class BookListCommand : ICommand
-    {
     private readonly LibraryProvider _libraryProvider;
 
     public BookListCommand(LibraryProvider libraryProvider)
@@ -33,5 +33,4 @@ namespace CliFx.Demo.Commands
 
         return default;
     }
-    }
 }

CliFx.Demo/Commands/BookRemoveCommand.cs

@@ -4,11 +4,11 @@ using CliFx.Demo.Domain;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Commands
+namespace CliFx.Demo.Commands;
+
+[Command("book remove", Description = "Remove a book from the library.")]
+public class BookRemoveCommand : ICommand
 {
-    [Command("book remove", Description = "Remove a book from the library.")]
-    public class BookRemoveCommand : ICommand
-    {
     private readonly LibraryProvider _libraryProvider;
 
     [CommandParameter(0, Name = "title", Description = "Title of the book to remove.")]
@@ -32,5 +32,4 @@ namespace CliFx.Demo.Commands
 
         return default;
     }
-    }
 }

CliFx.Demo/Domain/Book.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace CliFx.Demo.Domain
+namespace CliFx.Demo.Domain;
+
+public class Book
 {
-    public class Book
-    {
     public string Title { get; }
 
     public string Author { get; }
@@ -19,5 +19,4 @@ namespace CliFx.Demo.Domain
         Published = published;
         Isbn = isbn;
     }
-    }
 }

CliFx.Demo/Domain/Isbn.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace CliFx.Demo.Domain
+namespace CliFx.Demo.Domain;
+
+public partial class Isbn
 {
-    public partial class Isbn
-    {
     public int EanPrefix { get; }
 
     public int RegistrationGroup { get; }
@@ -25,10 +25,10 @@ namespace CliFx.Demo.Domain
 
     public override string ToString() =>
         $"{EanPrefix:000}-{RegistrationGroup:00}-{Registrant:00000}-{Publication:00}-{CheckDigit:0}";
-    }
+}
 
-    public partial class Isbn
-    {
+public partial class Isbn
+{
     public static Isbn Parse(string value, IFormatProvider formatProvider)
     {
         var components = value.Split('-', 5, StringSplitOptions.RemoveEmptyEntries);
@@ -41,5 +41,4 @@ namespace CliFx.Demo.Domain
             int.Parse(components[4], formatProvider)
         );
     }
-    }
 }

CliFx.Demo/Domain/Library.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace CliFx.Demo.Domain
+namespace CliFx.Demo.Domain;
+
+public partial class Library
 {
-    public partial class Library
-    {
     public IReadOnlyList<Book> Books { get; }
 
     public Library(IReadOnlyList<Book> books)
@@ -27,10 +27,9 @@ namespace CliFx.Demo.Domain
 
         return new Library(books);
     }
-    }
-
-    public partial class Library
-    {
-        public static Library Empty { get; } = new(Array.Empty<Book>());
-    }
+}
+
+public partial class Library
+{
+    public static Library Empty { get; } = new(Array.Empty<Book>());
 }

CliFx.Demo/Domain/LibraryProvider.cs

@@ -2,10 +2,10 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace CliFx.Demo.Domain
+namespace CliFx.Demo.Domain;
+
+public class LibraryProvider
 {
-    public class LibraryProvider
-    {
     private static string StorageFilePath { get; } = Path.Combine(Directory.GetCurrentDirectory(), "Library.json");
 
     private void StoreLibrary(Library library)
@@ -37,5 +37,4 @@ namespace CliFx.Demo.Domain
         var updatedLibrary = GetLibrary().WithoutBook(book);
         StoreLibrary(updatedLibrary);
     }
-    }
 }

CliFx.Demo/Program.cs

@@ -1,36 +1,25 @@
-using System;
-using System.Threading.Tasks;
+using CliFx;
 using CliFx.Demo.Commands;
 using CliFx.Demo.Domain;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace CliFx.Demo
-{
-    public static class Program
-    {
-        private static IServiceProvider GetServiceProvider()
-        {
-            // We use Microsoft.Extensions.DependencyInjection for injecting dependencies in commands
-            var services = new ServiceCollection();
+// We use Microsoft.Extensions.DependencyInjection for injecting dependencies in commands
+var services = new ServiceCollection();
 
-            // Register services
-            services.AddSingleton<LibraryProvider>();
+// Register services
+services.AddSingleton<LibraryProvider>();
 
-            // Register commands
-            services.AddTransient<BookCommand>();
-            services.AddTransient<BookAddCommand>();
-            services.AddTransient<BookRemoveCommand>();
-            services.AddTransient<BookListCommand>();
+// Register commands
+services.AddTransient<BookCommand>();
+services.AddTransient<BookAddCommand>();
+services.AddTransient<BookRemoveCommand>();
+services.AddTransient<BookListCommand>();
 
-            return services.BuildServiceProvider();
-        }
+var serviceProvider = services.BuildServiceProvider();
 
-        public static async Task<int> Main() =>
-            await new CliApplicationBuilder()
+return await new CliApplicationBuilder()
     .SetDescription("Demo application showcasing CliFx features.")
     .AddCommandsFromThisAssembly()
-                .UseTypeActivator(GetServiceProvider().GetRequiredService)
+    .UseTypeActivator(serviceProvider.GetRequiredService)
     .Build()
     .RunAsync();
-    }
-}

CliFx.Demo/Utils/ConsoleExtensions.cs

@@ -2,10 +2,10 @@
 using CliFx.Demo.Domain;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Utils
+namespace CliFx.Demo.Utils;
+
+internal static class ConsoleExtensions
 {
-    internal static class ConsoleExtensions
-    {
     public static void WriteBook(this ConsoleWriter writer, Book book)
     {
         // Title
@@ -33,5 +33,4 @@ namespace CliFx.Demo.Utils
         using (writer.Console.WithForegroundColor(ConsoleColor.White))
             writer.WriteLine(book.Isbn);
     }
-    }
 }

CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

CliFx.Tests.Dummy/Commands/ConsoleTestCommand.cs

@@ -3,11 +3,11 @@ using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Tests.Dummy.Commands
+namespace CliFx.Tests.Dummy.Commands;
+
+[Command("console-test")]
+public class ConsoleTestCommand : ICommand
 {
-    [Command("console-test")]
-    public class ConsoleTestCommand : ICommand
-    {
     public ValueTask ExecuteAsync(IConsole console)
     {
         var input = console.Input.ReadToEnd();
@@ -20,5 +20,4 @@ namespace CliFx.Tests.Dummy.Commands
 
         return default;
     }
-    }
 }

CliFx.Tests.Dummy/Commands/EnvironmentTestCommand.cs

@@ -2,11 +2,11 @@
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Tests.Dummy.Commands
+namespace CliFx.Tests.Dummy.Commands;
+
+[Command("env-test")]
+public class EnvironmentTestCommand : ICommand
 {
-    [Command("env-test")]
-    public class EnvironmentTestCommand : ICommand
-    {
     [CommandOption("target", EnvironmentVariable = "ENV_TARGET")]
     public string GreetingTarget { get; set; } = "World";
 
@@ -16,5 +16,4 @@ namespace CliFx.Tests.Dummy.Commands
 
         return default;
     }
-    }
 }

CliFx.Tests.Dummy/Program.cs

@@ -1,24 +1,22 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace CliFx.Tests.Dummy
-{
-    // This dummy application is used in tests for scenarios
-    // that require an external process to properly verify.
+namespace CliFx.Tests.Dummy;
+// This dummy application is used in tests for scenarios
+// that require an external process to properly verify.
 
-    public static partial class Program
-    {
+public static partial class Program
+{
     public static Assembly Assembly { get; } = typeof(Program).Assembly;
 
     public static string Location { get; } = Assembly.Location;
-    }
+}
 
-    public static partial class Program
-    {
+public static partial class Program
+{
     public static async Task Main() =>
         await new CliApplicationBuilder()
             .AddCommandsFromThisAssembly()
             .Build()
             .RunAsync();
-    }
 }

CliFx.Tests/ApplicationSpecs.cs

@@ -6,10 +6,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class ApplicationSpecs : SpecsBase
 {
-    public class ApplicationSpecs : SpecsBase
-    {
     public ApplicationSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -82,5 +82,4 @@ namespace CliFx.Tests
         exitCode.Should().NotBe(0);
         stdErr.Should().Contain("not a valid command");
     }
-    }
 }

CliFx.Tests/CancellationSpecs.cs

@@ -6,10 +6,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class CancellationSpecs : SpecsBase
 {
-    public class CancellationSpecs : SpecsBase
-    {
     public CancellationSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -63,5 +63,4 @@ public class Command : ICommand
         exitCode.Should().NotBe(0);
         stdOut.Trim().Should().Be("Cancelled");
     }
-    }
 }

CliFx.Tests/CliFx.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <CollectCoverage>true</CollectCoverage>
@@ -13,15 +13,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Basic.Reference.Assemblies" Version="1.1.2" />
-    <PackageReference Include="CliWrap" Version="3.3.2" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Basic.Reference.Assemblies" Version="1.2.4" />
+    <PackageReference Include="CliWrap" Version="3.3.3" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
-    <PackageReference Include="coverlet.msbuild" Version="3.0.3" PrivateAssets="all" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

CliFx.Tests/ConsoleSpecs.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using System.Threading.Tasks;
+using CliFx.Infrastructure;
 using CliFx.Tests.Utils;
 using CliWrap;
 using CliWrap.Buffered;
@@ -8,10 +11,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class ConsoleSpecs : SpecsBase
 {
-    public class ConsoleSpecs : SpecsBase
-    {
     public ConsoleSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -77,9 +80,9 @@ public class Command : ICommand
         // Assert
         exitCode.Should().Be(0);
 
-            Console.OpenStandardInput().Should().NotBe(FakeConsole.Input.BaseStream);
-            Console.OpenStandardOutput().Should().NotBe(FakeConsole.Output.BaseStream);
-            Console.OpenStandardError().Should().NotBe(FakeConsole.Error.BaseStream);
+        Console.OpenStandardInput().Should().NotBeSameAs(FakeConsole.Input.BaseStream);
+        Console.OpenStandardOutput().Should().NotBeSameAs(FakeConsole.Output.BaseStream);
+        Console.OpenStandardError().Should().NotBeSameAs(FakeConsole.Error.BaseStream);
 
         Console.ForegroundColor.Should().NotBe(ConsoleColor.DarkMagenta);
         Console.BackgroundColor.Should().NotBe(ConsoleColor.DarkMagenta);
@@ -135,5 +138,21 @@ public class Command : ICommand
         stdOut.Trim().Should().Be("Hello world");
         stdErr.Trim().Should().Be("Hello world");
     }
+
+    [Fact]
+    public void Console_does_not_emit_preamble_when_used_with_encoding_that_has_it()
+    {
+        // Arrange
+        using var buffer = new MemoryStream();
+        using var consoleWriter = new ConsoleWriter(FakeConsole, buffer, Encoding.UTF8);
+
+        // Act
+        consoleWriter.Write("Hello world");
+        consoleWriter.Flush();
+
+        var output = consoleWriter.Encoding.GetString(buffer.ToArray());
+
+        // Assert
+        output.Should().Be("Hello world");
     }
 }

CliFx.Tests/ConversionSpecs.cs

@@ -6,10 +6,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class ConversionSpecs : SpecsBase
 {
-    public class ConversionSpecs : SpecsBase
-    {
     public ConversionSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -946,5 +946,47 @@ public class Command : ICommand
         exitCode.Should().NotBe(0);
         stdErr.Should().Contain("Hello world");
     }
+
+    [Fact]
+    public async Task Parameter_or_option_value_conversion_fails_if_the_static_parse_method_throws()
+    {
+        // Arrange
+        var commandType = DynamicCommandBuilder.Compile(
+            // language=cs
+            @"
+public class CustomType
+{
+    public string Value { get; }
+    
+    private CustomType(string value) => Value = value;
+    
+    public static CustomType Parse(string value) => throw new Exception(""Hello world"");
+}
+
+[Command]
+public class Command : ICommand
+{
+    [CommandOption('f')]
+    public CustomType Foo { get; set; }
+    
+    public ValueTask ExecuteAsync(IConsole console) => default;
+}
+");
+        var application = new CliApplicationBuilder()
+            .AddCommand(commandType)
+            .UseConsole(FakeConsole)
+            .Build();
+
+        // Act
+        var exitCode = await application.RunAsync(
+            new[] {"-f", "bar"},
+            new Dictionary<string, string>()
+        );
+
+        var stdErr = FakeConsole.ReadErrorString();
+
+        // Assert
+        exitCode.Should().NotBe(0);
+        stdErr.Should().Contain("Hello world");
     }
 }

CliFx.Tests/DirectivesSpecs.cs

@@ -10,10 +10,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class DirectivesSpecs : SpecsBase
 {
-    public class DirectivesSpecs : SpecsBase
-    {
     public DirectivesSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -108,5 +108,4 @@ public class Command : ICommand
             "ENV_KIL", "=", "\"world\""
         );
     }
-    }
 }

CliFx.Tests/EnvironmentSpecs.cs

@@ -10,10 +10,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class EnvironmentSpecs : SpecsBase
 {
-    public class EnvironmentSpecs : SpecsBase
-    {
     public EnvironmentSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -256,5 +256,4 @@ public class Command : ICommand
         // Assert
         result.StandardOutput.Trim().Should().Be("Hello Mars!");
     }
-    }
 }

CliFx.Tests/ErrorReportingSpecs.cs

@@ -7,10 +7,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class ErrorReportingSpecs : SpecsBase
 {
-    public class ErrorReportingSpecs : SpecsBase
-    {
     public ErrorReportingSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -201,5 +201,4 @@ public class Command : ICommand
         stdOut.Should().Contain("This will be in help text");
         stdErr.Trim().Should().Be("Something went wrong");
     }
-    }
 }

CliFx.Tests/HelpTextSpecs.cs

@@ -7,10 +7,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class HelpTextSpecs : SpecsBase
 {
-    public class HelpTextSpecs : SpecsBase
-    {
     public HelpTextSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -371,6 +371,57 @@ public class Command : ICommand
         );
     }
 
+    // https://github.com/Tyrrrz/CliFx/issues/117
+    [Fact]
+    public async Task Help_text_shows_usage_format_which_lists_all_parameters_in_specified_order()
+    {
+        // Arrange
+        var commandType = DynamicCommandBuilder.Compile(
+            // language=cs
+            @"
+// Base members appear last in reflection order
+public abstract class CommandBase : ICommand
+{
+    [CommandParameter(0)]
+    public string Foo { get; set; }
+
+    public abstract ValueTask ExecuteAsync(IConsole console);
+}
+
+[Command]
+public class Command : CommandBase
+{
+    [CommandParameter(2)]
+    public IReadOnlyList<string> Baz { get; set; }
+
+    [CommandParameter(1)]
+    public string Bar { get; set; }
+    
+    public override ValueTask ExecuteAsync(IConsole console) => default;
+}
+");
+
+        var application = new CliApplicationBuilder()
+            .AddCommand(commandType)
+            .UseConsole(FakeConsole)
+            .Build();
+
+        // Act
+        var exitCode = await application.RunAsync(
+            new[] { "--help" },
+            new Dictionary<string, string>()
+        );
+
+        var stdOut = FakeConsole.ReadOutputString();
+
+        // Assert
+        exitCode.Should().Be(0);
+        stdOut.Should().ContainAllInOrder(
+            "USAGE",
+            "<foo>", "<bar>", "<baz...>"
+        );
+    }
+
     [Fact]
     public async Task Help_text_shows_usage_format_which_lists_all_required_options()
     {
@@ -964,5 +1015,4 @@ public class SecondCommandSecondChildCommand : ICommand
         exitCode.Should().Be(0);
         stdOut.Trim().Should().Be("v6.9");
     }
-    }
 }

CliFx.Tests/OptionBindingSpecs.cs

@@ -7,10 +7,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class OptionBindingSpecs : SpecsBase
 {
-    public class OptionBindingSpecs : SpecsBase
-    {
     public OptionBindingSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -704,5 +704,4 @@ public class Command : ICommand
         exitCode.Should().NotBe(0);
         stdErr.Should().Contain("expects a single argument, but provided with multiple");
     }
-    }
 }

CliFx.Tests/ParameterBindingSpecs.cs

@@ -6,10 +6,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class ParameterBindingSpecs : SpecsBase
 {
-    public class ParameterBindingSpecs : SpecsBase
-    {
     public ParameterBindingSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -229,5 +229,4 @@ public class Command : ICommand
         exitCode.Should().NotBe(0);
         stdErr.Should().Contain("Unexpected parameter(s)");
     }
-    }
 }

CliFx.Tests/RoutingSpecs.cs

@@ -6,10 +6,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class RoutingSpecs : SpecsBase
 {
-    public class RoutingSpecs : SpecsBase
-    {
     public RoutingSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -182,5 +182,4 @@ public class NamedChildCommand : ICommand
         exitCode.Should().Be(0);
         stdOut.Trim().Should().Be("cmd child");
     }
-    }
 }

CliFx.Tests/SpecsBase.cs

@@ -3,10 +3,10 @@ using CliFx.Infrastructure;
 using CliFx.Tests.Utils.Extensions;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public abstract class SpecsBase : IDisposable
 {
-    public abstract class SpecsBase : IDisposable
-    {
     public ITestOutputHelper TestOutput { get; }
 
     public FakeInMemoryConsole FakeConsole { get; } = new();
@@ -19,5 +19,4 @@ namespace CliFx.Tests
         FakeConsole.DumpToTestOutput(TestOutput);
         FakeConsole.Dispose();
     }
-    }
 }

CliFx.Tests/TypeActivationSpecs.cs

@@ -7,10 +7,10 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
+namespace CliFx.Tests;
+
+public class TypeActivationSpecs : SpecsBase
 {
-    public class TypeActivationSpecs : SpecsBase
-    {
     public TypeActivationSpecs(ITestOutputHelper testOutput)
         : base(testOutput)
     {
@@ -161,5 +161,4 @@ public class Command : ICommand
         exitCode.Should().NotBe(0);
         stdErr.Should().Contain("Failed to create an instance of type");
     }
-    }
 }

CliFx.Tests/Utils/DynamicCommandBuilder.cs

@@ -8,20 +8,20 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 
-namespace CliFx.Tests.Utils
+namespace CliFx.Tests.Utils;
+
+// This class uses Roslyn to compile commands dynamically.
+//
+// It allows us to collocate commands with tests more
+// easily, which helps a lot when reasoning about them.
+// Unfortunately, this comes at a cost of static typing,
+// but this is still a worthwhile trade off.
+//
+// Maybe one day C# will allow declaring classes inside
+// methods and doing this will no longer be necessary.
+// Language proposal: https://github.com/dotnet/csharplang/discussions/130
+internal static class DynamicCommandBuilder
 {
-    // This class uses Roslyn to compile commands dynamically.
-    //
-    // It allows us to collocate commands with tests more
-    // easily, which helps a lot when reasoning about them.
-    // Unfortunately, this comes at a cost of static typing,
-    // but this is still a worthwhile trade off.
-    //
-    // Maybe one day C# will allow declaring classes inside
-    // methods and doing this will no longer be necessary.
-    // Language proposal: https://github.com/dotnet/csharplang/discussions/130
-    internal static class DynamicCommandBuilder
-    {
     public static IReadOnlyList<Type> CompileMany(string sourceCode)
     {
         // Get default system namespaces
@@ -106,13 +106,13 @@ namespace CliFx.Tests.Utils
         // Return all defined commands
         var commandTypes = generatedAssembly
             .GetTypes()
-                .Where(t => t.IsAssignableTo(typeof(ICommand)))
+            .Where(t => t.IsAssignableTo(typeof(ICommand)) && !t.IsAbstract)
             .ToArray();
 
         if (commandTypes.Length <= 0)
         {
             throw new InvalidOperationException(
-                    "There are no command definitions in the provide source code."
+                "There are no command definitions in the provided source code."
             );
         }
 
@@ -126,11 +126,10 @@ namespace CliFx.Tests.Utils
         if (commandTypes.Count > 1)
         {
             throw new InvalidOperationException(
-                    "There are more than one command definitions in the provide source code."
+                "There are more than one command definitions in the provided source code."
             );
         }
 
         return commandTypes.Single();
     }
-    }
 }

CliFx.Tests/Utils/Extensions/AssertionExtensions.cs

@@ -1,24 +1,22 @@
 using System;
 using System.Collections.Generic;
 using FluentAssertions;
-using FluentAssertions.Collections;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-namespace CliFx.Tests.Utils.Extensions
+namespace CliFx.Tests.Utils.Extensions;
+
+internal static class AssertionExtensions
 {
-    internal static class AssertionExtensions
-    {
-        public static AndConstraint<StringCollectionAssertions> ConsistOfLines(
+    public static void ConsistOfLines(
         this StringAssertions assertions,
         IEnumerable<string> lines)
     {
         var actualLines = assertions.Subject.Split(new[] {'\n', '\r'}, StringSplitOptions.RemoveEmptyEntries);
-
-            return actualLines.Should().Equal(lines);
+        actualLines.Should().Equal(lines);
     }
 
-        public static AndConstraint<StringCollectionAssertions> ConsistOfLines(
+    public static void ConsistOfLines(
         this StringAssertions assertions,
         params string[] lines) =>
         assertions.ConsistOfLines((IEnumerable<string>) lines);
@@ -50,5 +48,4 @@ namespace CliFx.Tests.Utils.Extensions
         this StringAssertions assertions,
         params string[] values) =>
         assertions.ContainAllInOrder((IEnumerable<string>) values);
-    }
 }

CliFx.Tests/Utils/Extensions/ConsoleExtensions.cs

@@ -1,10 +1,10 @@
 using CliFx.Infrastructure;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests.Utils.Extensions
+namespace CliFx.Tests.Utils.Extensions;
+
+internal static class ConsoleExtensions
 {
-    internal static class ConsoleExtensions
-    {
     public static void DumpToTestOutput(this FakeInMemoryConsole console, ITestOutputHelper testOutputHelper)
     {
         testOutputHelper.WriteLine("[*] Captured standard output:");
@@ -13,5 +13,4 @@ namespace CliFx.Tests.Utils.Extensions
         testOutputHelper.WriteLine("[*] Captured standard error:");
         testOutputHelper.WriteLine(console.ReadErrorString());
     }
-    }
 }

CliFx.Tests/Utils/NoOpCommand.cs

@@ -2,11 +2,10 @@
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Tests.Utils
+namespace CliFx.Tests.Utils;
+
+[Command]
+public class NoOpCommand : ICommand
 {
-    [Command]
-    public class NoOpCommand : ICommand
-    {
     public ValueTask ExecuteAsync(IConsole console) => default;
-    }
 }

CliFx/ApplicationConfiguration.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 
-namespace CliFx
+namespace CliFx;
+
+/// <summary>
+/// Configuration of an application.
+/// </summary>
+public class ApplicationConfiguration
 {
-    /// <summary>
-    /// Configuration of an application.
-    /// </summary>
-    public class ApplicationConfiguration
-    {
     /// <summary>
     /// Command types defined in this application.
     /// </summary>
@@ -35,5 +35,4 @@ namespace CliFx
         IsDebugModeAllowed = isDebugModeAllowed;
         IsPreviewModeAllowed = isPreviewModeAllowed;
     }
-    }
 }

CliFx/ApplicationMetadata.cs

@@ -1,10 +1,10 @@
-namespace CliFx
+namespace CliFx;
+
+/// <summary>
+/// Metadata associated with an application.
+/// </summary>
+public class ApplicationMetadata
 {
-    /// <summary>
-    /// Metadata associated with an application.
-    /// </summary>
-    public class ApplicationMetadata
-    {
     /// <summary>
     /// Application title.
     /// </summary>
@@ -39,5 +39,4 @@
         Version = version;
         Description = description;
     }
-    }
 }

CliFx/Attributes/CommandAttribute.cs

@@ -1,13 +1,13 @@
 using System;
 
-namespace CliFx.Attributes
+namespace CliFx.Attributes;
+
+/// <summary>
+/// Annotates a type that defines a command.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+public sealed class CommandAttribute : Attribute
 {
-    /// <summary>
-    /// Annotates a type that defines a command.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-    public sealed class CommandAttribute : Attribute
-    {
     /// <summary>
     /// Command's name.
     /// </summary>
@@ -39,5 +39,4 @@ namespace CliFx.Attributes
     public CommandAttribute()
     {
     }
-    }
 }

CliFx/Attributes/CommandOptionAttribute.cs

@@ -1,14 +1,14 @@
 using System;
 using CliFx.Extensibility;
 
-namespace CliFx.Attributes
+namespace CliFx.Attributes;
+
+/// <summary>
+/// Annotates a property that defines a command option.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class CommandOptionAttribute : Attribute
 {
-    /// <summary>
-    /// Annotates a property that defines a command option.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class CommandOptionAttribute : Attribute
-    {
     /// <summary>
     /// Option name.
     /// </summary>
@@ -96,5 +96,4 @@ namespace CliFx.Attributes
         : this(null, (char?) shortName)
     {
     }
-    }
 }

CliFx/Attributes/CommandParameterAttribute.cs

@@ -1,14 +1,14 @@
 using System;
 using CliFx.Extensibility;
 
-namespace CliFx.Attributes
+namespace CliFx.Attributes;
+
+/// <summary>
+/// Annotates a property that defines a command parameter.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class CommandParameterAttribute : Attribute
 {
-    /// <summary>
-    /// Annotates a property that defines a command parameter.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class CommandParameterAttribute : Attribute
-    {
     /// <summary>
     /// Parameter order.
     /// </summary>
@@ -63,5 +63,4 @@ namespace CliFx.Attributes
     {
         Order = order;
     }
-    }
 }

CliFx/CliApplication.cs

@@ -11,13 +11,13 @@ using CliFx.Schema;
 using CliFx.Utils;
 using CliFx.Utils.Extensions;
 
-namespace CliFx
+namespace CliFx;
+
+/// <summary>
+/// Command line application facade.
+/// </summary>
+public class CliApplication
 {
-    /// <summary>
-    /// Command line application facade.
-    /// </summary>
-    public class CliApplication
-    {
     /// <summary>
     /// Application metadata.
     /// </summary>
@@ -237,5 +237,4 @@ namespace CliFx
             .Skip(1) // first element is the file path
             .ToArray()
     );
-    }
 }