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/bug-report.yml

@@ -0,0 +1,42 @@
+name: 🐞 Bug report
+description: Report broken functionality.
+labels: [bug]
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      🧐 **Guidelines:**
+
+      - Search through [existing issues](https://github.com/Tyrrrz/CliFx/issues?q=is%3Aissue) first to ensure that this bug has not been reported before.
+      - Write a descriptive title for your issue. Avoid generic or vague titles such as "Something's not working" or "A couple of problems".
+      - Keep your issue focused on one single problem. If you have multiple bug reports, please create separate issues for each of them.
+      - Provide as much context as possible in the details section. Include screenshots, screen recordings, links, references, or anything else you may consider relevant.
+      - If you want to ask a question instead of reporting a bug, please use [discussions](https://github.com/Tyrrrz/CliFx/discussions/new) instead.
+
+- type: input
+  attributes:
+    label: Version
+    description: Which version of CliFx does this bug affect?
+    placeholder: ver X.Y.Z
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Details
+    description: Clear and thorough explanation of the bug.
+    placeholder: I was doing X expecting Y to happen, but Z happened instead.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: Minimum steps required to reproduce the bug.
+    placeholder: |
+      - Step 1
+      - Step 2
+      - Step 3
+  validations:
+    required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +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/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,22 @@
+name: ✨ Feature request
+description: Request a new feature.
+labels: [enhancement]
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      🧐 **Guidelines:**
+
+      - Search through [existing issues](https://github.com/Tyrrrz/CliFx/issues?q=is%3Aissue) first to ensure that this feature has not been requested before.
+      - Write a descriptive title for your issue. Avoid generic or vague titles such as "Some suggestions" or "Ideas for improvement".
+      - Keep your issue focused on one single problem. If you have multiple feature requests, please create separate issues for each of them.
+      - Provide as much context as possible in the details section. Include screenshots, screen recordings, links, references, or anything else you may consider relevant.
+      - If you want to ask a question instead of requesting a feature, please use [discussions](https://github.com/Tyrrrz/CliFx/discussions/new) instead.
+
+- type: textarea
+  attributes:
+    label: Details
+    description: Clear and thorough explanation of the feature you have in mind.
+  validations:
+    required: true

.github/workflows/CD.yml

@@ -1,27 +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 nuget locals all --clear
-          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,30 +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 nuget locals all --clear
-          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,39 @@
+### 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.
+- Added readme file to the package.
+
+### v2.0.4 (24-Apr-2021)
+
+- Fixed an issue where output and error streams in `SystemConsole` defaulted to UTF8 encoding with BOM when the application was running with UTF8 codepage. `ConsoleWriter` will now discard preamble from the specified encoding. This fix brings the behavior of `SystemConsole` in line with .NET's own `System.Console` which also discards preamble for output and error streams.
+- Fixed an issue where help text tried to show default values for parameters and options whose type does not override `ToString()` method.
+- Fixed an issue where help text didn't show default values for parameters and options whose type is an enumerable of nullable enums. (Thanks [@Robert Dailey](https://github.com/rcdailey))
+- Fixed an issue where specific parts of the help text weren't legible in some terminals due to low color resolution. Removed the usage of `ConsoleColor.DarkGray` in help text.
+
+### v2.0.3 (09-Apr-2021)
+
+- Improved help text by showing valid values for non-scalar enum parameters and options. (Thanks [@Robert Dailey](https://github.com/rcdailey))
+
+### v2.0.2 (31-Mar-2021)
+
+- Fixed an issue where having a transitive reference to CliFx sometimes resulted in `SystemConsoleShouldBeAvoidedAnalyzer` throwing `NullReferenceException` during build.
+- Fixed some documentation typos and inconsistencies.
+
+### v2.0.1 (24-Mar-2021)
+
+- Fixed an issue where some exceptions with async stack traces generated on .NET 3.1 or earlier were not parsed and formatted correctly.
+- Fixed an issue where help text applied slightly incorrect formatting when displaying choices for enum-based parameters and properties.
+
 ### v2.0 (21-Mar-2021)
 
 > Note: this major release includes many breaking changes.

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,13 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <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.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
-    <PackageReference Include="xunit" Version="2.4.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,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class CommandMustBeAnnotatedAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new CommandMustBeAnnotatedAnalyzer();
@@ -69,4 +69,3 @@ public class Foo
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/CommandMustImplementInterfaceAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class CommandMustImplementInterfaceAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new CommandMustImplementInterfaceAnalyzer();
@@ -55,4 +55,3 @@ public class Foo
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/GeneralSpecs.cs

@@ -4,8 +4,8 @@ using FluentAssertions;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class GeneralSpecs
 {
     [Fact]
@@ -28,4 +28,3 @@ namespace CliFx.Analyzers.Tests
         diagnosticIds.Should().OnlyHaveUniqueItems();
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustBeInsideCommandAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustBeInsideCommandAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustBeInsideCommandAnalyzer();
@@ -77,4 +77,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveNameOrShortNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveNameOrShortNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveNameOrShortNameAnalyzer();
@@ -83,4 +83,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveUniqueNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveUniqueNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveUniqueNameAnalyzer();
@@ -89,4 +89,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveUniqueShortNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveUniqueShortNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveUniqueShortNameAnalyzer();
@@ -111,4 +111,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveValidConverterAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveValidConverterAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidConverterAnalyzer();
@@ -93,4 +93,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveValidNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveValidNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidNameAnalyzer();
@@ -102,4 +102,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveValidShortNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveValidShortNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidShortNameAnalyzer();
@@ -83,4 +83,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/OptionMustHaveValidValidatorsAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class OptionMustHaveValidValidatorsAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new OptionMustHaveValidValidatorsAnalyzer();
@@ -93,4 +93,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustBeInsideCommandAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustBeInsideCommandAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeInsideCommandAnalyzer();
@@ -77,4 +77,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustBeLastIfNonScalarAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustBeLastIfNonScalarAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeLastIfNonScalarAnalyzer();
@@ -92,4 +92,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustBeSingleIfNonScalarAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustBeSingleIfNonScalarAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustBeSingleIfNonScalarAnalyzer();
@@ -92,4 +92,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustHaveUniqueNameAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustHaveUniqueNameAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveUniqueNameAnalyzer();
@@ -70,4 +70,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustHaveUniqueOrderAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustHaveUniqueOrderAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveUniqueOrderAnalyzer();
@@ -70,4 +70,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustHaveValidConverterAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustHaveValidConverterAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveValidConverterAnalyzer();
@@ -93,4 +93,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/ParameterMustHaveValidValidatorsAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class ParameterMustHaveValidValidatorsAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new ParameterMustHaveValidValidatorsAnalyzer();
@@ -93,4 +93,3 @@ public class MyCommand : ICommand
         Analyzer.Should().NotProduceDiagnostics(code);
     }
 }
-}

CliFx.Analyzers.Tests/SystemConsoleShouldBeAvoidedAnalyzerSpecs.cs

@@ -2,8 +2,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
 
-namespace CliFx.Analyzers.Tests
-{
+namespace CliFx.Analyzers.Tests;
+
 public class SystemConsoleShouldBeAvoidedAnalyzerSpecs
 {
     private static DiagnosticAnalyzer Analyzer { get; } = new SystemConsoleShouldBeAvoidedAnalyzer();
@@ -104,5 +104,23 @@ public class MyCommand : ICommand
         // Act & assert
         Analyzer.Should().NotProduceDiagnostics(code);
     }
+
+    [Fact]
+    public void Analyzer_does_not_report_an_error_if_a_command_does_not_access_SystemConsole()
+    {
+        // Arrange
+        // language=cs
+        const string code = @"
+[Command]
+public class MyCommand : ICommand
+{
+    public ValueTask ExecuteAsync(IConsole console)
+    {
+        return default;
+    }
+}";
+
+        // Act & assert
+        Analyzer.Should().NotProduceDiagnostics(code);
     }
 }

CliFx.Analyzers.Tests/Utils/AnalyzerAssertions.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Reflection;
 using System.Text;
+using Basic.Reference.Assemblies;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 using Microsoft.CodeAnalysis;
@@ -11,8 +11,8 @@ 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>
 {
     protected override string Identifier { get; } = "analyzer";
@@ -58,14 +58,8 @@ namespace CliFx.Analyzers.Tests.Utils
         var compilation = CSharpCompilation.Create(
             "CliFxTests_DynamicAssembly_" + Guid.NewGuid(),
             new[] {ast},
-                new[]
-                {
-                    MetadataReference.CreateFromFile(Assembly.Load("netstandard").Location),
-                    MetadataReference.CreateFromFile(Assembly.Load("System.Runtime").Location),
-                    MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(Console).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(ICommand).Assembly.Location)
-                },
+            ReferenceAssemblies.Net50
+                .Append(MetadataReference.CreateFromFile(typeof(ICommand).Assembly.Location)),
             // DLL to avoid having to define the Main() method
             new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
         );
@@ -171,4 +165,3 @@ namespace CliFx.Analyzers.Tests.Utils
 {
     public static AnalyzerAssertions Should(this DiagnosticAnalyzer analyzer) => new(analyzer);
 }
-}

CliFx.Analyzers/AnalyzerBase.cs

@@ -3,8 +3,8 @@ using CliFx.Analyzers.Utils.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace CliFx.Analyzers
-{
+namespace CliFx.Analyzers;
+
 public abstract class AnalyzerBase : DiagnosticAnalyzer
 {
     public DiagnosticDescriptor SupportedDiagnostic { get; }
@@ -37,4 +37,3 @@ namespace CliFx.Analyzers
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
     }
 }
-}

CliFx.Analyzers/CommandMustBeAnnotatedAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -51,4 +51,3 @@ namespace CliFx.Analyzers
         context.HandleClassDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/CommandMustImplementInterfaceAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -45,4 +45,3 @@ namespace CliFx.Analyzers
         context.HandleClassDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ObjectModel/CommandOptionSymbol.cs

@@ -3,8 +3,8 @@ using Microsoft.CodeAnalysis;
 using System.Linq;
 using CliFx.Analyzers.Utils.Extensions;
 
-namespace CliFx.Analyzers.ObjectModel
-{
+namespace CliFx.Analyzers.ObjectModel;
+
 internal partial class CommandOptionSymbol
 {
     public string? Name { get; }
@@ -80,4 +80,3 @@ namespace CliFx.Analyzers.ObjectModel
     public static bool IsOptionProperty(IPropertySymbol property) =>
         TryGetOptionAttribute(property) is not null;
 }
-}

CliFx.Analyzers/ObjectModel/CommandParameterSymbol.cs

@@ -3,8 +3,8 @@ using System.Linq;
 using CliFx.Analyzers.Utils.Extensions;
 using Microsoft.CodeAnalysis;
 
-namespace CliFx.Analyzers.ObjectModel
-{
+namespace CliFx.Analyzers.ObjectModel;
+
 internal partial class CommandParameterSymbol
 {
     public int Order { get; }
@@ -79,4 +79,3 @@ namespace CliFx.Analyzers.ObjectModel
     public static bool IsParameterProperty(IPropertySymbol property) =>
         TryGetParameterAttribute(property) is not null;
 }
-}

CliFx.Analyzers/ObjectModel/SymbolNames.cs

@@ -1,5 +1,5 @@
-namespace CliFx.Analyzers.ObjectModel
-{
+namespace CliFx.Analyzers.ObjectModel;
+
 internal static class SymbolNames
 {
     public const string CliFxCommandInterface = "CliFx.ICommand";
@@ -12,4 +12,3 @@
     public const string CliFxBindingValidatorInterface = "CliFx.Extensibility.IBindingValidator";
     public const string CliFxBindingValidatorClass = "CliFx.Extensibility.BindingValidator<T>";
 }
-}

CliFx.Analyzers/OptionMustBeInsideCommandAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -22,6 +22,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         if (property.ContainingType.IsAbstract)
             return;
 
@@ -45,4 +48,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveNameOrShortNameAnalyzer.cs

@@ -4,8 +4,8 @@ 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
 {
@@ -37,4 +37,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveUniqueNameAnalyzer.cs

@@ -6,8 +6,8 @@ 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
 {
@@ -23,6 +23,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         var option = CommandOptionSymbol.TryResolve(property);
         if (option is null)
             return;
@@ -59,4 +62,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveUniqueShortNameAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -22,6 +22,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         var option = CommandOptionSymbol.TryResolve(property);
         if (option is null)
             return;
@@ -58,4 +61,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveValidConverterAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -47,4 +47,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveValidNameAnalyzer.cs

@@ -4,8 +4,8 @@ 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
 {
@@ -40,4 +40,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveValidShortNameAnalyzer.cs

@@ -4,8 +4,8 @@ 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
 {
@@ -40,4 +40,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/OptionMustHaveValidValidatorsAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -49,4 +49,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustBeInsideCommandAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -22,6 +22,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         if (property.ContainingType.IsAbstract)
             return;
 
@@ -45,4 +48,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustBeLastIfNonScalarAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -29,6 +29,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         if (IsScalar(property.Type))
             return;
 
@@ -62,4 +65,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustBeSingleIfNonScalarAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -29,6 +29,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         if (!CommandParameterSymbol.IsParameterProperty(property))
             return;
 
@@ -60,4 +63,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustHaveUniqueNameAnalyzer.cs

@@ -6,8 +6,8 @@ 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
 {
@@ -23,6 +23,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         var parameter = CommandParameterSymbol.TryResolve(property);
         if (parameter is null)
             return;
@@ -59,4 +62,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustHaveUniqueOrderAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -22,6 +22,9 @@ namespace CliFx.Analyzers
         PropertyDeclarationSyntax propertyDeclaration,
         IPropertySymbol property)
     {
+        if (property.ContainingType is null)
+            return;
+
         var parameter = CommandParameterSymbol.TryResolve(property);
         if (parameter is null)
             return;
@@ -52,4 +55,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustHaveValidConverterAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -47,4 +47,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/ParameterMustHaveValidValidatorsAnalyzer.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -49,4 +49,3 @@ namespace CliFx.Analyzers
         context.HandlePropertyDeclaration(Analyze);
     }
 }
-}

CliFx.Analyzers/SystemConsoleShouldBeAvoidedAnalyzer.cs

@@ -6,8 +6,8 @@ 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
 {
@@ -27,9 +27,9 @@ namespace CliFx.Analyzers
 
         while (currentNode is MemberAccessExpressionSyntax memberAccess)
         {
-                var symbol = context.SemanticModel.GetSymbolInfo(memberAccess).Symbol;
+            var member = context.SemanticModel.GetSymbolInfo(memberAccess).Symbol;
 
-                if (symbol is not null && symbol.ContainingType.DisplayNameMatches("System.Console"))
+            if (member?.ContainingType?.DisplayNameMatches("System.Console") == true)
             {
                 return memberAccess;
             }
@@ -53,7 +53,8 @@ namespace CliFx.Analyzers
             return;
 
         // Check if IConsole is available in scope as an alternative to System.Console
-            var isConsoleInterfaceAvailable = context.Node
+        var isConsoleInterfaceAvailable = context
+            .Node
             .Ancestors()
             .OfType<MethodDeclarationSyntax>()
             .SelectMany(m => m.ParameterList.Parameters)
@@ -74,4 +75,3 @@ namespace CliFx.Analyzers
         context.RegisterSyntaxNodeAction(Analyze, SyntaxKind.SimpleMemberAccessExpression);
     }
 }
-}

CliFx.Analyzers/Utils/Extensions/RoslynExtensions.cs

@@ -4,16 +4,21 @@ 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
 {
     public static bool DisplayNameMatches(this ISymbol symbol, string name) =>
-            string.Equals(symbol.ToDisplayString(), name, StringComparison.Ordinal);
+        string.Equals(
+            // Fully qualified name, without `global::`
+            symbol.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
+            name,
+            StringComparison.Ordinal
+        );
 
     public static void HandleClassDeclaration(
         this AnalysisContext analysisContext,
-            Action<SyntaxNodeAnalysisContext, ClassDeclarationSyntax, ITypeSymbol> handler)
+        Action<SyntaxNodeAnalysisContext, ClassDeclarationSyntax, ITypeSymbol> analyze)
     {
         analysisContext.RegisterSyntaxNodeAction(ctx =>
         {
@@ -24,13 +29,13 @@ namespace CliFx.Analyzers.Utils.Extensions
             if (type is null)
                 return;
 
-                handler(ctx, classDeclaration, type);
+            analyze(ctx, classDeclaration, type);
         }, SyntaxKind.ClassDeclaration);
     }
 
     public static void HandlePropertyDeclaration(
         this AnalysisContext analysisContext,
-            Action<SyntaxNodeAnalysisContext, PropertyDeclarationSyntax, IPropertySymbol> handler)
+        Action<SyntaxNodeAnalysisContext, PropertyDeclarationSyntax, IPropertySymbol> analyze)
     {
         analysisContext.RegisterSyntaxNodeAction(ctx =>
         {
@@ -41,8 +46,7 @@ namespace CliFx.Analyzers.Utils.Extensions
             if (property is null)
                 return;
 
-                handler(ctx, propertyDeclaration, property);
+            analyze(ctx, propertyDeclaration, property);
         }, SyntaxKind.PropertyDeclaration);
     }
 }
-}

CliFx.Analyzers/Utils/Extensions/StringExtensions.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace CliFx.Analyzers.Utils.Extensions
-{
+namespace CliFx.Analyzers.Utils.Extensions;
+
 internal static class StringExtensions
 {
     public static string TrimEnd(
@@ -15,4 +15,3 @@ namespace CliFx.Analyzers.Utils.Extensions
         return str;
     }
 }
-}

CliFx.Benchmarks/Benchmarks.CliFx.cs

@@ -4,8 +4,8 @@ using BenchmarkDotNet.Attributes;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 public partial class Benchmarks
 {
     [Command]
@@ -30,4 +30,3 @@ namespace CliFx.Benchmarks
             .Build()
             .RunAsync(Arguments, new Dictionary<string, string>());
 }
-}

CliFx.Benchmarks/Benchmarks.Clipr.cs

@@ -1,8 +1,8 @@
 using BenchmarkDotNet.Attributes;
 using clipr;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 public partial class Benchmarks
 {
     public class CliprCommand
@@ -24,4 +24,3 @@ namespace CliFx.Benchmarks
     [Benchmark(Description = "Clipr")]
     public void ExecuteWithClipr() => CliParser.Parse<CliprCommand>(Arguments).Execute();
 }
-}

CliFx.Benchmarks/Benchmarks.Cocona.cs

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

CliFx.Benchmarks/Benchmarks.CommandLineParser.cs

@@ -1,8 +1,8 @@
 using BenchmarkDotNet.Attributes;
 using CommandLine;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 public partial class Benchmarks
 {
     public class CommandLineParserCommand
@@ -27,4 +27,3 @@ namespace CliFx.Benchmarks
             .ParseArguments(Arguments, typeof(CommandLineParserCommand))
             .WithParsed<CommandLineParserCommand>(c => c.Execute());
 }
-}

CliFx.Benchmarks/Benchmarks.McMaster.cs

@@ -1,8 +1,8 @@
 using BenchmarkDotNet.Attributes;
 using McMaster.Extensions.CommandLineUtils;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 public partial class Benchmarks
 {
     public class McMasterCommand
@@ -22,4 +22,3 @@ namespace CliFx.Benchmarks
     [Benchmark(Description = "McMaster.Extensions.CommandLineUtils")]
     public int ExecuteWithMcMaster() => CommandLineApplication.Execute<McMasterCommand>(Arguments);
 }
-}

CliFx.Benchmarks/Benchmarks.PowerArgs.cs

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

CliFx.Benchmarks/Benchmarks.SystemCommandLine.cs

@@ -3,8 +3,8 @@ using System.CommandLine.Invocation;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 public partial class Benchmarks
 {
     public class SystemCommandLineCommand
@@ -41,4 +41,3 @@ namespace CliFx.Benchmarks
     public async Task<int> ExecuteWithSystemCommandLine() =>
         await new SystemCommandLineCommand().ExecuteAsync(Arguments);
 }
-}

CliFx.Benchmarks/Benchmarks.cs

@@ -3,8 +3,8 @@ using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Running;
 
-namespace CliFx.Benchmarks
-{
+namespace CliFx.Benchmarks;
+
 [RankColumn]
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 public partial class Benchmarks
@@ -14,7 +14,6 @@ namespace CliFx.Benchmarks
     public static void Main() => BenchmarkRunner.Run<Benchmarks>(
         DefaultConfig
             .Instance
-                .With(ConfigOptions.DisableOptimizationsValidator)
+            .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.0" />
+    <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,12 +2,12 @@
 
   <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="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

CliFx.Demo/Commands/BookAddCommand.cs

@@ -6,8 +6,8 @@ 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
 {
@@ -67,4 +67,3 @@ namespace CliFx.Demo.Commands
         Random.Next(0, 9)
     );
 }
-}

CliFx.Demo/Commands/BookCommand.cs

@@ -5,8 +5,8 @@ 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
 {
@@ -32,4 +32,3 @@ namespace CliFx.Demo.Commands
         return default;
     }
 }
-}

CliFx.Demo/Commands/BookListCommand.cs

@@ -4,8 +4,8 @@ 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
 {
@@ -34,4 +34,3 @@ namespace CliFx.Demo.Commands
         return default;
     }
 }
-}

CliFx.Demo/Commands/BookRemoveCommand.cs

@@ -4,8 +4,8 @@ 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
 {
@@ -33,4 +33,3 @@ namespace CliFx.Demo.Commands
         return default;
     }
 }
-}

CliFx.Demo/Domain/Book.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace CliFx.Demo.Domain
-{
+namespace CliFx.Demo.Domain;
+
 public class Book
 {
     public string Title { get; }
@@ -20,4 +20,3 @@ namespace CliFx.Demo.Domain
         Isbn = isbn;
     }
 }
-}

CliFx.Demo/Domain/Isbn.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace CliFx.Demo.Domain
-{
+namespace CliFx.Demo.Domain;
+
 public partial class Isbn
 {
     public int EanPrefix { get; }
@@ -42,4 +42,3 @@ namespace CliFx.Demo.Domain
         );
     }
 }
-}

CliFx.Demo/Domain/Library.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace CliFx.Demo.Domain
-{
+namespace CliFx.Demo.Domain;
+
 public partial class Library
 {
     public IReadOnlyList<Book> Books { get; }
@@ -33,4 +33,3 @@ namespace CliFx.Demo.Domain
 {
     public static Library Empty { get; } = new(Array.Empty<Book>());
 }
-}

CliFx.Demo/Domain/LibraryProvider.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace CliFx.Demo.Domain
-{
+namespace CliFx.Demo.Domain;
+
 public class LibraryProvider
 {
     private static string StorageFilePath { get; } = Path.Combine(Directory.GetCurrentDirectory(), "Library.json");
@@ -21,7 +21,7 @@ namespace CliFx.Demo.Domain
 
         var data = File.ReadAllText(StorageFilePath);
 
-            return JsonConvert.DeserializeObject<Library>(data);
+        return JsonConvert.DeserializeObject<Library>(data) ?? Library.Empty;
     }
 
     public Book? TryGetBook(string title) => GetLibrary().Books.FirstOrDefault(b => b.Title == title);
@@ -38,4 +38,3 @@ namespace CliFx.Demo.Domain
         StoreLibrary(updatedLibrary);
     }
 }
-}

CliFx.Demo/Program.cs

@@ -1,15 +1,8 @@
-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();
 
@@ -22,15 +15,11 @@ namespace CliFx.Demo
 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,8 +2,8 @@
 using CliFx.Demo.Domain;
 using CliFx.Infrastructure;
 
-namespace CliFx.Demo.Utils
-{
+namespace CliFx.Demo.Utils;
+
 internal static class ConsoleExtensions
 {
     public static void WriteBook(this ConsoleWriter writer, Book book)
@@ -34,4 +34,3 @@ namespace CliFx.Demo.Utils
             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,8 +3,8 @@ 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
 {
@@ -21,4 +21,3 @@ namespace CliFx.Tests.Dummy.Commands
         return default;
     }
 }
-}

CliFx.Tests.Dummy/Commands/EnvironmentTestCommand.cs

@@ -2,8 +2,8 @@
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace CliFx.Tests.Dummy.Commands
-{
+namespace CliFx.Tests.Dummy.Commands;
+
 [Command("env-test")]
 public class EnvironmentTestCommand : ICommand
 {
@@ -17,4 +17,3 @@ namespace CliFx.Tests.Dummy.Commands
         return default;
     }
 }
-}

CliFx.Tests.Dummy/Program.cs

@@ -1,8 +1,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace CliFx.Tests.Dummy
-{
+namespace CliFx.Tests.Dummy;
 // This dummy application is used in tests for scenarios
 // that require an external process to properly verify.
 
@@ -21,4 +20,3 @@ namespace CliFx.Tests.Dummy
             .Build()
             .RunAsync();
 }
-}

CliFx.Tests/ApplicationSpecs.cs

@@ -6,8 +6,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class ApplicationSpecs : SpecsBase
 {
     public ApplicationSpecs(ITestOutputHelper testOutput)
@@ -83,4 +83,3 @@ namespace CliFx.Tests
         stdErr.Should().Contain("not a valid command");
     }
 }
-}

CliFx.Tests/CancellationSpecs.cs

@@ -6,8 +6,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class CancellationSpecs : SpecsBase
 {
     public CancellationSpecs(ITestOutputHelper testOutput)
@@ -64,4 +64,3 @@ public class Command : ICommand
         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,14 +13,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.3.1" />
-    <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.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <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,8 +11,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class ConsoleSpecs : SpecsBase
 {
     public ConsoleSpecs(ITestOutputHelper 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,8 +6,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class ConversionSpecs : SpecsBase
 {
     public ConversionSpecs(ITestOutputHelper 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,8 +10,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class DirectivesSpecs : SpecsBase
 {
     public DirectivesSpecs(ITestOutputHelper testOutput)
@@ -109,4 +109,3 @@ public class Command : ICommand
         );
     }
 }
-}

CliFx.Tests/EnvironmentSpecs.cs

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

CliFx.Tests/ErrorReportingSpecs.cs

@@ -7,8 +7,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class ErrorReportingSpecs : SpecsBase
 {
     public ErrorReportingSpecs(ITestOutputHelper testOutput)
@@ -202,4 +202,3 @@ public class Command : ICommand
         stdErr.Trim().Should().Be("Something went wrong");
     }
 }
-}

CliFx.Tests/HelpTextSpecs.cs

@@ -7,8 +7,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class HelpTextSpecs : SpecsBase
 {
     public HelpTextSpecs(ITestOutputHelper 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()
     {
@@ -577,6 +628,96 @@ public class Command : ICommand
         );
     }
 
+    [Fact]
+    public async Task Help_text_shows_all_valid_values_for_non_scalar_enum_parameters_and_options()
+    {
+        // Arrange
+        var commandType = DynamicCommandBuilder.Compile(
+            // language=cs
+            @"
+public enum CustomEnum { One, Two, Three }
+
+[Command]
+public class Command : ICommand
+{
+    [CommandParameter(0)]
+    public IReadOnlyList<CustomEnum> Foo { get; set; }
+
+    [CommandOption(""bar"")]
+    public IReadOnlyList<CustomEnum> Bar { get; set; }
+
+    public 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(
+            "PARAMETERS",
+            "foo", "Choices:", "One", "Two", "Three",
+            "OPTIONS",
+            "--bar", "Choices:", "One", "Two", "Three"
+        );
+    }
+
+    [Fact]
+    public async Task Help_text_shows_all_valid_values_for_nullable_enum_parameters_and_options()
+    {
+        // Arrange
+        var commandType = DynamicCommandBuilder.Compile(
+            // language=cs
+            @"
+public enum CustomEnum { One, Two, Three }
+
+[Command]
+public class Command : ICommand
+{
+    [CommandParameter(0)]
+    public CustomEnum? Foo { get; set; }
+
+    [CommandOption(""bar"")]
+    public IReadOnlyList<CustomEnum?> Bar { get; set; }
+
+    public 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(
+            "PARAMETERS",
+            "foo", "Choices:", "One", "Two", "Three",
+            "OPTIONS",
+            "--bar", "Choices:", "One", "Two", "Three"
+        );
+    }
+
     [Fact]
     public async Task Help_text_shows_environment_variables_for_options_that_have_them_configured_as_fallback()
     {
@@ -875,4 +1016,3 @@ public class SecondCommandSecondChildCommand : ICommand
         stdOut.Trim().Should().Be("v6.9");
     }
 }
-}

CliFx.Tests/OptionBindingSpecs.cs

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

CliFx.Tests/ParameterBindingSpecs.cs

@@ -6,8 +6,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class ParameterBindingSpecs : SpecsBase
 {
     public ParameterBindingSpecs(ITestOutputHelper testOutput)
@@ -230,4 +230,3 @@ public class Command : ICommand
         stdErr.Should().Contain("Unexpected parameter(s)");
     }
 }
-}

CliFx.Tests/RoutingSpecs.cs

@@ -6,8 +6,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class RoutingSpecs : SpecsBase
 {
     public RoutingSpecs(ITestOutputHelper testOutput)
@@ -183,4 +183,3 @@ public class NamedChildCommand : ICommand
         stdOut.Trim().Should().Be("cmd child");
     }
 }
-}

CliFx.Tests/SpecsBase.cs

@@ -3,8 +3,8 @@ using CliFx.Infrastructure;
 using CliFx.Tests.Utils.Extensions;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public abstract class SpecsBase : IDisposable
 {
     public ITestOutputHelper TestOutput { get; }
@@ -20,4 +20,3 @@ namespace CliFx.Tests
         FakeConsole.Dispose();
     }
 }
-}

CliFx.Tests/TypeActivationSpecs.cs

@@ -7,8 +7,8 @@ using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests
-{
+namespace CliFx.Tests;
+
 public class TypeActivationSpecs : SpecsBase
 {
     public TypeActivationSpecs(ITestOutputHelper testOutput)
@@ -162,4 +162,3 @@ public class Command : ICommand
         stdErr.Should().Contain("Failed to create an instance of type");
     }
 }
-}

CliFx.Tests/Utils/DynamicCommandBuilder.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using Basic.Reference.Assemblies;
 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
@@ -60,16 +61,9 @@ namespace CliFx.Tests.Utils
         var compilation = CSharpCompilation.Create(
             "CliFxTests_DynamicAssembly_" + Guid.NewGuid(),
             new[] {ast},
-                new[]
-                {
-                    MetadataReference.CreateFromFile(Assembly.Load("netstandard").Location),
-                    MetadataReference.CreateFromFile(Assembly.Load("System.Runtime").Location),
-                    MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(Console).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(Enumerable).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(DynamicCommandBuilder).Assembly.Location),
-                    MetadataReference.CreateFromFile(typeof(ICommand).Assembly.Location)
-                },
+            ReferenceAssemblies.Net50
+                .Append(MetadataReference.CreateFromFile(typeof(ICommand).Assembly.Location))
+                .Append(MetadataReference.CreateFromFile(typeof(DynamicCommandBuilder).Assembly.Location)),
             // DLL to avoid having to define the Main() method
             new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
         );
@@ -112,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."
             );
         }
 
@@ -132,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
 {
-        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);
@@ -51,4 +49,3 @@ namespace CliFx.Tests.Utils.Extensions
         params string[] values) =>
         assertions.ContainAllInOrder((IEnumerable<string>) values);
 }
-}

CliFx.Tests/Utils/Extensions/ConsoleExtensions.cs

@@ -1,8 +1,8 @@
 using CliFx.Infrastructure;
 using Xunit.Abstractions;
 
-namespace CliFx.Tests.Utils.Extensions
-{
+namespace CliFx.Tests.Utils.Extensions;
+
 internal static class ConsoleExtensions
 {
     public static void DumpToTestOutput(this FakeInMemoryConsole console, ITestOutputHelper testOutputHelper)
@@ -14,4 +14,3 @@ namespace CliFx.Tests.Utils.Extensions
         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
 {
     public ValueTask ExecuteAsync(IConsole console) => default;
 }
-}

CliFx/ApplicationConfiguration.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 
-namespace CliFx
-{
+namespace CliFx;
+
 /// <summary>
 /// Configuration of an application.
 /// </summary>
@@ -36,4 +36,3 @@ namespace CliFx
         IsPreviewModeAllowed = isPreviewModeAllowed;
     }
 }
-}

CliFx/ApplicationMetadata.cs

@@ -1,5 +1,5 @@
-namespace CliFx
-{
+namespace CliFx;
+
 /// <summary>
 /// Metadata associated with an application.
 /// </summary>
@@ -16,7 +16,7 @@
     public string ExecutableName { get; }
 
     /// <summary>
-        /// Application version text.
+    /// Application version.
     /// </summary>
     public string Version { get; }
 
@@ -40,4 +40,3 @@
         Description = description;
     }
 }
-}

CliFx/Attributes/CommandAttribute.cs

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

CliFx/Attributes/CommandOptionAttribute.cs

@@ -1,13 +1,13 @@
 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 class CommandOptionAttribute : Attribute
+public sealed class CommandOptionAttribute : Attribute
 {
     /// <summary>
     /// Option name.
@@ -97,4 +97,3 @@ namespace CliFx.Attributes
     {
     }
 }
-}

CliFx/Attributes/CommandParameterAttribute.cs

@@ -1,13 +1,13 @@
 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 class CommandParameterAttribute : Attribute
+public sealed class CommandParameterAttribute : Attribute
 {
     /// <summary>
     /// Parameter order.
@@ -64,4 +64,3 @@ namespace CliFx.Attributes
         Order = order;
     }
 }
-}