spectreconsole · patriksvensson · May 14, 2022 · May 14, 2022 · May 14, 2022 · May 14, 2022
diff --git a/build.cake b/build.cake
@@ -58,6 +58,12 @@ Task("Test")
         NoBuild = true,
     });
 
+    DotNetTest("./test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj", new DotNetTestSettings {
+        Configuration = configuration,
+        NoRestore = true,
+        NoBuild = true,
+    });
+
     DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings {
         Configuration = configuration,
         NoRestore = true,

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.1.0",
+      "version": "2.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/examples/Cli/Demo/Demo.csproj b/examples/Cli/Demo/Demo.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\..\src\Spectre.Console.Cli\Spectre.Console.Cli.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Examples.sln b/examples/Examples.sln
@@ -75,6 +75,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.ImageSharp"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paths", "Console\Paths\Paths.csproj", "{65CB00B0-A3AE-4E8F-A990-4C8C1A232FE2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Cli", "..\src\Spectre.Console.Cli\Spectre.Console.Cli.csproj", "{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -493,6 +495,18 @@ Global
 		{65CB00B0-A3AE-4E8F-A990-4C8C1A232FE2}.Release|x64.Build.0 = Release|Any CPU
 		{65CB00B0-A3AE-4E8F-A990-4C8C1A232FE2}.Release|x86.ActiveCfg = Release|Any CPU
 		{65CB00B0-A3AE-4E8F-A990-4C8C1A232FE2}.Release|x86.Build.0 = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|x64.Build.0 = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -506,6 +520,7 @@ Global
 		{DD8EC1B0-F50C-44E4-8399-2D560F95E572} = {2571F1BD-6556-4F96-B27B-B6190E1BF13A}
 		{0C58FB17-F60A-47AB-84BF-961EC8C06AE6} = {2571F1BD-6556-4F96-B27B-B6190E1BF13A}
 		{A127CE7D-A5A7-4745-9809-EBD7CB12CEE7} = {2571F1BD-6556-4F96-B27B-B6190E1BF13A}
+		{EFAADF6A-C77D-41EC-83F5-BBB4FFC5A6D7} = {2571F1BD-6556-4F96-B27B-B6190E1BF13A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3EE724C5-CAB4-410D-AC63-8D4260EF83ED}

diff --git a/examples/Shared/Shared.csproj b/examples/Shared/Shared.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Spectre.Console.Cli\Spectre.Console.Cli.csproj" />
     <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
   </ItemGroup>
 

diff --git a/...i/Annotations/CommandArgumentAttribute.cs → ...i/Annotations/CommandArgumentAttribute.cs b/...i/Annotations/CommandArgumentAttribute.cs → ...i/Annotations/CommandArgumentAttribute.cs
diff --git a/...Cli/Annotations/CommandOptionAttribute.cs → ...Cli/Annotations/CommandOptionAttribute.cs b/...Cli/Annotations/CommandOptionAttribute.cs → ...Cli/Annotations/CommandOptionAttribute.cs
diff --git a/...Annotations/PairDeconstructorAttribute.cs → ...Annotations/PairDeconstructorAttribute.cs b/...Annotations/PairDeconstructorAttribute.cs → ...Annotations/PairDeconstructorAttribute.cs
diff --git a/...notations/ParameterValidationAttribute.cs → ...notations/ParameterValidationAttribute.cs b/...notations/ParameterValidationAttribute.cs → ...notations/ParameterValidationAttribute.cs
diff --git a/...ations/ParameterValueProviderAttribute.cs → ...ations/ParameterValueProviderAttribute.cs b/...ations/ParameterValueProviderAttribute.cs → ...ations/ParameterValueProviderAttribute.cs
diff --git a/src/Spectre.Console/Cli/AsyncCommand.cs → src/Spectre.Console.Cli/AsyncCommand.cs b/src/Spectre.Console/Cli/AsyncCommand.cs → src/Spectre.Console.Cli/AsyncCommand.cs
diff --git a/src/Spectre.Console/Cli/AsyncCommandOfT.cs → src/Spectre.Console.Cli/AsyncCommandOfT.cs b/src/Spectre.Console/Cli/AsyncCommandOfT.cs → src/Spectre.Console.Cli/AsyncCommandOfT.cs
diff --git a/src/Spectre.Console/Cli/CaseSensitivity.cs → src/Spectre.Console.Cli/CaseSensitivity.cs b/src/Spectre.Console/Cli/CaseSensitivity.cs → src/Spectre.Console.Cli/CaseSensitivity.cs
diff --git a/src/Spectre.Console/Cli/Command.cs → src/Spectre.Console.Cli/Command.cs b/src/Spectre.Console/Cli/Command.cs → src/Spectre.Console.Cli/Command.cs
diff --git a/src/Spectre.Console/Cli/CommandApp.cs → src/Spectre.Console.Cli/CommandApp.cs b/src/Spectre.Console/Cli/CommandApp.cs → src/Spectre.Console.Cli/CommandApp.cs
diff --git a/...pectre.Console/Cli/CommandAppException.cs → ...pectre.Console.Cli/CommandAppException.cs b/...pectre.Console/Cli/CommandAppException.cs → ...pectre.Console.Cli/CommandAppException.cs
diff --git a/src/Spectre.Console/Cli/CommandAppOfT.cs → src/Spectre.Console.Cli/CommandAppOfT.cs b/src/Spectre.Console/Cli/CommandAppOfT.cs → src/Spectre.Console.Cli/CommandAppOfT.cs
diff --git a/...sole/Cli/CommandConfigurationException.cs → ...sole.Cli/CommandConfigurationException.cs b/...sole/Cli/CommandConfigurationException.cs → ...sole.Cli/CommandConfigurationException.cs
diff --git a/src/Spectre.Console/Cli/CommandContext.cs → src/Spectre.Console.Cli/CommandContext.cs b/src/Spectre.Console/Cli/CommandContext.cs → src/Spectre.Console.Cli/CommandContext.cs
diff --git a/src/Spectre.Console/Cli/CommandOfT.cs → src/Spectre.Console.Cli/CommandOfT.cs b/src/Spectre.Console/Cli/CommandOfT.cs → src/Spectre.Console.Cli/CommandOfT.cs
diff --git a/...re.Console/Cli/CommandParameterContext.cs → ...re.Console.Cli/CommandParameterContext.cs b/...re.Console/Cli/CommandParameterContext.cs → ...re.Console.Cli/CommandParameterContext.cs
diff --git a/...ctre.Console/Cli/CommandParseException.cs → ...ctre.Console.Cli/CommandParseException.cs b/...ctre.Console/Cli/CommandParseException.cs → ...ctre.Console.Cli/CommandParseException.cs
diff --git a/...re.Console/Cli/CommandRuntimeException.cs → ...re.Console.Cli/CommandRuntimeException.cs b/...re.Console/Cli/CommandRuntimeException.cs → ...re.Console.Cli/CommandRuntimeException.cs
diff --git a/src/Spectre.Console/Cli/CommandSettings.cs → src/Spectre.Console.Cli/CommandSettings.cs b/src/Spectre.Console/Cli/CommandSettings.cs → src/Spectre.Console.Cli/CommandSettings.cs
diff --git a/...e.Console/Cli/CommandTemplateException.cs → ...e.Console.Cli/CommandTemplateException.cs b/...e.Console/Cli/CommandTemplateException.cs → ...e.Console.Cli/CommandTemplateException.cs
diff --git a/...tre.Console/Cli/ConfiguratorExtensions.cs → ...tre.Console.Cli/ConfiguratorExtensions.cs b/...tre.Console/Cli/ConfiguratorExtensions.cs → ...tre.Console.Cli/ConfiguratorExtensions.cs
diff --git a/...ectre.Console/Cli/EmptyCommandSettings.cs → ...ectre.Console.Cli/EmptyCommandSettings.cs b/...ectre.Console/Cli/EmptyCommandSettings.cs → ...ectre.Console.Cli/EmptyCommandSettings.cs
diff --git a/src/Spectre.Console/Cli/FlagValue.cs → src/Spectre.Console.Cli/FlagValue.cs b/src/Spectre.Console/Cli/FlagValue.cs → src/Spectre.Console.Cli/FlagValue.cs
diff --git a/src/Spectre.Console/Cli/ICommand.cs → src/Spectre.Console.Cli/ICommand.cs b/src/Spectre.Console/Cli/ICommand.cs → src/Spectre.Console.Cli/ICommand.cs
diff --git a/src/Spectre.Console/Cli/ICommandApp.cs → src/Spectre.Console.Cli/ICommandApp.cs b/src/Spectre.Console/Cli/ICommandApp.cs → src/Spectre.Console.Cli/ICommandApp.cs
diff --git a/...pectre.Console/Cli/ICommandAppSettings.cs → ...pectre.Console.Cli/ICommandAppSettings.cs b/...pectre.Console/Cli/ICommandAppSettings.cs → ...pectre.Console.Cli/ICommandAppSettings.cs
diff --git a/...ectre.Console/Cli/ICommandConfigurator.cs → ...ectre.Console.Cli/ICommandConfigurator.cs b/...ectre.Console/Cli/ICommandConfigurator.cs → ...ectre.Console.Cli/ICommandConfigurator.cs
diff --git a/...pectre.Console/Cli/ICommandInterceptor.cs → ...pectre.Console.Cli/ICommandInterceptor.cs b/...pectre.Console/Cli/ICommandInterceptor.cs → ...pectre.Console.Cli/ICommandInterceptor.cs
diff --git a/...Spectre.Console/Cli/ICommandLimiterOfT.cs → ...Spectre.Console.Cli/ICommandLimiterOfT.cs b/...Spectre.Console/Cli/ICommandLimiterOfT.cs → ...Spectre.Console.Cli/ICommandLimiterOfT.cs
diff --git a/src/Spectre.Console/Cli/ICommandOfT.cs → src/Spectre.Console.Cli/ICommandOfT.cs b/src/Spectre.Console/Cli/ICommandOfT.cs → src/Spectre.Console.Cli/ICommandOfT.cs
diff --git a/...ctre.Console/Cli/ICommandParameterInfo.cs → ...ctre.Console.Cli/ICommandParameterInfo.cs b/...ctre.Console/Cli/ICommandParameterInfo.cs → ...ctre.Console.Cli/ICommandParameterInfo.cs
diff --git a/src/Spectre.Console/Cli/IConfigurator.cs → src/Spectre.Console.Cli/IConfigurator.cs b/src/Spectre.Console/Cli/IConfigurator.cs → src/Spectre.Console.Cli/IConfigurator.cs
diff --git a/src/Spectre.Console/Cli/IConfiguratorOfT.cs → src/Spectre.Console.Cli/IConfiguratorOfT.cs b/src/Spectre.Console/Cli/IConfiguratorOfT.cs → src/Spectre.Console.Cli/IConfiguratorOfT.cs
diff --git a/src/Spectre.Console/Cli/IFlagValue.cs → src/Spectre.Console.Cli/IFlagValue.cs b/src/Spectre.Console/Cli/IFlagValue.cs → src/Spectre.Console.Cli/IFlagValue.cs
diff --git a/...pectre.Console/Cli/IRemainingArguments.cs → ...pectre.Console.Cli/IRemainingArguments.cs b/...pectre.Console/Cli/IRemainingArguments.cs → ...pectre.Console.Cli/IRemainingArguments.cs
diff --git a/src/Spectre.Console/Cli/ITypeRegistrar.cs → src/Spectre.Console.Cli/ITypeRegistrar.cs b/src/Spectre.Console/Cli/ITypeRegistrar.cs → src/Spectre.Console.Cli/ITypeRegistrar.cs
diff --git a/...tre.Console/Cli/ITypeRegistrarFrontend.cs → ...tre.Console.Cli/ITypeRegistrarFrontend.cs b/...tre.Console/Cli/ITypeRegistrarFrontend.cs → ...tre.Console.Cli/ITypeRegistrarFrontend.cs
diff --git a/src/Spectre.Console/Cli/ITypeResolver.cs → src/Spectre.Console.Cli/ITypeResolver.cs b/src/Spectre.Console/Cli/ITypeResolver.cs → src/Spectre.Console.Cli/ITypeResolver.cs
diff --git a/...ernal/Binding/CommandConstructorBinder.cs → ...ernal/Binding/CommandConstructorBinder.cs b/...ernal/Binding/CommandConstructorBinder.cs → ...ernal/Binding/CommandConstructorBinder.cs
diff --git a/...Internal/Binding/CommandPropertyBinder.cs → ...Internal/Binding/CommandPropertyBinder.cs b/...Internal/Binding/CommandPropertyBinder.cs → ...Internal/Binding/CommandPropertyBinder.cs
diff --git a/...li/Internal/Binding/CommandValueBinder.cs → ...li/Internal/Binding/CommandValueBinder.cs b/...li/Internal/Binding/CommandValueBinder.cs → ...li/Internal/Binding/CommandValueBinder.cs
diff --git a/...li/Internal/Binding/CommandValueLookup.cs → ...li/Internal/Binding/CommandValueLookup.cs b/...li/Internal/Binding/CommandValueLookup.cs → ...li/Internal/Binding/CommandValueLookup.cs
diff --git a/.../Internal/Binding/CommandValueResolver.cs → .../Internal/Binding/CommandValueResolver.cs b/.../Internal/Binding/CommandValueResolver.cs → .../Internal/Binding/CommandValueResolver.cs
diff --git a/...ole/Cli/Internal/Collections/IMultiMap.cs → ...ole.Cli/Internal/Collections/IMultiMap.cs b/...ole/Cli/Internal/Collections/IMultiMap.cs → ...ole.Cli/Internal/Collections/IMultiMap.cs
diff --git a/...sole/Cli/Internal/Collections/MultiMap.cs → ...sole.Cli/Internal/Collections/MultiMap.cs b/...sole/Cli/Internal/Collections/MultiMap.cs → ...sole.Cli/Internal/Collections/MultiMap.cs
diff --git a/...tre.Console/Cli/Internal/CommandBinder.cs → ...tre.Console.Cli/Internal/CommandBinder.cs b/...tre.Console/Cli/Internal/CommandBinder.cs → ...tre.Console.Cli/Internal/CommandBinder.cs
diff --git a/...e.Console/Cli/Internal/CommandExecutor.cs → ...e.Console.Cli/Internal/CommandExecutor.cs b/...e.Console/Cli/Internal/CommandExecutor.cs → ...e.Console.Cli/Internal/CommandExecutor.cs
diff --git a/...ectre.Console/Cli/Internal/CommandPart.cs → ...ectre.Console.Cli/Internal/CommandPart.cs b/...ectre.Console/Cli/Internal/CommandPart.cs → ...ectre.Console.Cli/Internal/CommandPart.cs
diff --git a/....Console/Cli/Internal/CommandSuggestor.cs → ....Console.Cli/Internal/CommandSuggestor.cs b/....Console/Cli/Internal/CommandSuggestor.cs → ....Console.Cli/Internal/CommandSuggestor.cs
diff --git a/....Console/Cli/Internal/CommandValidator.cs → ....Console.Cli/Internal/CommandValidator.cs b/....Console/Cli/Internal/CommandValidator.cs → ....Console.Cli/Internal/CommandValidator.cs
diff --git a/...e/Cli/Internal/Commands/ExplainCommand.cs → ...e.Cli/Internal/Commands/ExplainCommand.cs b/...e/Cli/Internal/Commands/ExplainCommand.cs → ...e.Cli/Internal/Commands/ExplainCommand.cs
diff --git a/...e/Cli/Internal/Commands/VersionCommand.cs → ...e.Cli/Internal/Commands/VersionCommand.cs b/...e/Cli/Internal/Commands/VersionCommand.cs → ...e.Cli/Internal/Commands/VersionCommand.cs
diff --git a/...le/Cli/Internal/Commands/XmlDocCommand.cs → ...le.Cli/Internal/Commands/XmlDocCommand.cs b/...le/Cli/Internal/Commands/XmlDocCommand.cs → ...le.Cli/Internal/Commands/XmlDocCommand.cs
diff --git a/src/Spectre.Console/Cli/Internal/Composer.cs → src/Spectre.Console.Cli/Internal/Composer.cs b/src/Spectre.Console/Cli/Internal/Composer.cs → src/Spectre.Console.Cli/Internal/Composer.cs
diff --git a/...le/Cli/Internal/Composition/Activators.cs → ...le.Cli/Internal/Composition/Activators.cs b/...le/Cli/Internal/Composition/Activators.cs → ...le.Cli/Internal/Composition/Activators.cs
diff --git a/...rnal/Composition/ComponentRegistration.cs → ...rnal/Composition/ComponentRegistration.cs b/...rnal/Composition/ComponentRegistration.cs → ...rnal/Composition/ComponentRegistration.cs
diff --git a/...Internal/Composition/ComponentRegistry.cs → ...Internal/Composition/ComponentRegistry.cs b/...Internal/Composition/ComponentRegistry.cs → ...Internal/Composition/ComponentRegistry.cs
diff --git a/...ernal/Composition/DefaultTypeRegistrar.cs → ...ernal/Composition/DefaultTypeRegistrar.cs b/...ernal/Composition/DefaultTypeRegistrar.cs → ...ernal/Composition/DefaultTypeRegistrar.cs
diff --git a/...ternal/Composition/DefaultTypeResolver.cs → ...ternal/Composition/DefaultTypeResolver.cs b/...ternal/Composition/DefaultTypeResolver.cs → ...ternal/Composition/DefaultTypeResolver.cs
diff --git a/...ernal/Configuration/CommandAppSettings.cs → ...ernal/Configuration/CommandAppSettings.cs b/...ernal/Configuration/CommandAppSettings.cs → ...ernal/Configuration/CommandAppSettings.cs
diff --git a/...rnal/Configuration/CommandConfigurator.cs → ...rnal/Configuration/CommandConfigurator.cs b/...rnal/Configuration/CommandConfigurator.cs → ...rnal/Configuration/CommandConfigurator.cs
diff --git a/...rnal/Configuration/ConfigurationHelper.cs → ...rnal/Configuration/ConfigurationHelper.cs b/...rnal/Configuration/ConfigurationHelper.cs → ...rnal/Configuration/ConfigurationHelper.cs
diff --git a/...li/Internal/Configuration/Configurator.cs → ...li/Internal/Configuration/Configurator.cs b/...li/Internal/Configuration/Configurator.cs → ...li/Internal/Configuration/Configurator.cs
diff --git a/...Internal/Configuration/ConfiguratorOfT.cs → ...Internal/Configuration/ConfiguratorOfT.cs b/...Internal/Configuration/ConfiguratorOfT.cs → ...Internal/Configuration/ConfiguratorOfT.cs
diff --git a/...ternal/Configuration/ConfiguredCommand.cs → ...ternal/Configuration/ConfiguredCommand.cs b/...ternal/Configuration/ConfiguredCommand.cs → ...ternal/Configuration/ConfiguredCommand.cs
diff --git a/.../Internal/Configuration/IConfiguration.cs → .../Internal/Configuration/IConfiguration.cs b/.../Internal/Configuration/IConfiguration.cs → .../Internal/Configuration/IConfiguration.cs
diff --git a/.../Internal/Configuration/TemplateParser.cs → .../Internal/Configuration/TemplateParser.cs b/.../Internal/Configuration/TemplateParser.cs → .../Internal/Configuration/TemplateParser.cs
diff --git a/...i/Internal/Configuration/TemplateToken.cs → ...i/Internal/Configuration/TemplateToken.cs b/...i/Internal/Configuration/TemplateToken.cs → ...i/Internal/Configuration/TemplateToken.cs
diff --git a/...ternal/Configuration/TemplateTokenizer.cs → ...ternal/Configuration/TemplateTokenizer.cs b/...ternal/Configuration/TemplateTokenizer.cs → ...ternal/Configuration/TemplateTokenizer.cs
diff --git a/...Spectre.Console/Cli/Internal/Constants.cs → ...Spectre.Console.Cli/Internal/Constants.cs b/...Spectre.Console/Cli/Internal/Constants.cs → ...Spectre.Console.Cli/Internal/Constants.cs
diff --git a/.../Cli/Internal/DefaultPairDeconstructor.cs → ....Cli/Internal/DefaultPairDeconstructor.cs b/.../Cli/Internal/DefaultPairDeconstructor.cs → ....Cli/Internal/DefaultPairDeconstructor.cs
diff --git a/...e.Console/Cli/Internal/DelegateCommand.cs → ...e.Console.Cli/Internal/DelegateCommand.cs b/...e.Console/Cli/Internal/DelegateCommand.cs → ...e.Console.Cli/Internal/DelegateCommand.cs
diff --git a/...tions/CommandLineParseExceptionFactory.cs → ...tions/CommandLineParseExceptionFactory.cs b/...tions/CommandLineParseExceptionFactory.cs → ...tions/CommandLineParseExceptionFactory.cs
diff --git a/...ns/CommandLineTemplateExceptionFactory.cs → ...ns/CommandLineTemplateExceptionFactory.cs b/...ns/CommandLineTemplateExceptionFactory.cs → ...ns/CommandLineTemplateExceptionFactory.cs
diff --git a/...ernal/Extensions/AnsiConsoleExtensions.cs → ...ernal/Extensions/AnsiConsoleExtensions.cs b/...ernal/Extensions/AnsiConsoleExtensions.cs → ...ernal/Extensions/AnsiConsoleExtensions.cs
diff --git a/...l/Extensions/CaseSensitivityExtensions.cs → ...l/Extensions/CaseSensitivityExtensions.cs b/...l/Extensions/CaseSensitivityExtensions.cs → ...l/Extensions/CaseSensitivityExtensions.cs
diff --git a/...Cli/Internal/Extensions/ListExtensions.cs → ...Cli/Internal/Extensions/ListExtensions.cs b/...Cli/Internal/Extensions/ListExtensions.cs → ...Cli/Internal/Extensions/ListExtensions.cs
diff --git a/...i/Internal/Extensions/StringExtensions.cs → ...i/Internal/Extensions/StringExtensions.cs b/...i/Internal/Extensions/StringExtensions.cs → ...i/Internal/Extensions/StringExtensions.cs
diff --git a/...Cli/Internal/Extensions/TypeExtensions.cs → ...Cli/Internal/Extensions/TypeExtensions.cs b/...Cli/Internal/Extensions/TypeExtensions.cs → ...Cli/Internal/Extensions/TypeExtensions.cs
diff --git a/...nal/Extensions/TypeRegistrarExtensions.cs → ...nal/Extensions/TypeRegistrarExtensions.cs b/...nal/Extensions/TypeRegistrarExtensions.cs → ...nal/Extensions/TypeRegistrarExtensions.cs
diff --git a/...ternal/Extensions/XmlElementExtensions.cs → ...ternal/Extensions/XmlElementExtensions.cs b/...ternal/Extensions/XmlElementExtensions.cs → ...ternal/Extensions/XmlElementExtensions.cs
diff --git a/...pectre.Console/Cli/Internal/HelpWriter.cs → ...pectre.Console.Cli/Internal/HelpWriter.cs b/...pectre.Console/Cli/Internal/HelpWriter.cs → ...pectre.Console.Cli/Internal/HelpWriter.cs
diff --git a/...onsole/Cli/Internal/IPairDeconstructor.cs → ...onsole.Cli/Internal/IPairDeconstructor.cs b/...onsole/Cli/Internal/IPairDeconstructor.cs → ...onsole.Cli/Internal/IPairDeconstructor.cs
diff --git a/...Cli/Internal/Modelling/CommandArgument.cs → ...Cli/Internal/Modelling/CommandArgument.cs b/...Cli/Internal/Modelling/CommandArgument.cs → ...Cli/Internal/Modelling/CommandArgument.cs
diff --git a/...l/Modelling/CommandContainerExtensions.cs → ...l/Modelling/CommandContainerExtensions.cs b/...l/Modelling/CommandContainerExtensions.cs → ...l/Modelling/CommandContainerExtensions.cs
diff --git a/...ole/Cli/Internal/Modelling/CommandInfo.cs → ...ole.Cli/Internal/Modelling/CommandInfo.cs b/...ole/Cli/Internal/Modelling/CommandInfo.cs → ...ole.Cli/Internal/Modelling/CommandInfo.cs
diff --git a/...ternal/Modelling/CommandInfoExtensions.cs → ...ternal/Modelling/CommandInfoExtensions.cs b/...ternal/Modelling/CommandInfoExtensions.cs → ...ternal/Modelling/CommandInfoExtensions.cs
diff --git a/...le/Cli/Internal/Modelling/CommandModel.cs → ...le.Cli/Internal/Modelling/CommandModel.cs b/...le/Cli/Internal/Modelling/CommandModel.cs → ...le.Cli/Internal/Modelling/CommandModel.cs
diff --git a/...Internal/Modelling/CommandModelBuilder.cs → ...Internal/Modelling/CommandModelBuilder.cs b/...Internal/Modelling/CommandModelBuilder.cs → ...Internal/Modelling/CommandModelBuilder.cs
diff --git a/...ternal/Modelling/CommandModelValidator.cs → ...ternal/Modelling/CommandModelValidator.cs b/...ternal/Modelling/CommandModelValidator.cs → ...ternal/Modelling/CommandModelValidator.cs
diff --git a/...e/Cli/Internal/Modelling/CommandOption.cs → ...e.Cli/Internal/Modelling/CommandOption.cs b/...e/Cli/Internal/Modelling/CommandOption.cs → ...e.Cli/Internal/Modelling/CommandOption.cs
diff --git a/...li/Internal/Modelling/CommandParameter.cs → ...li/Internal/Modelling/CommandParameter.cs b/...li/Internal/Modelling/CommandParameter.cs → ...li/Internal/Modelling/CommandParameter.cs
diff --git a/...nal/Modelling/CommandParameterComparer.cs → ...nal/Modelling/CommandParameterComparer.cs b/...nal/Modelling/CommandParameterComparer.cs → ...nal/Modelling/CommandParameterComparer.cs
diff --git a/...i/Internal/Modelling/ICommandContainer.cs → ...i/Internal/Modelling/ICommandContainer.cs b/...i/Internal/Modelling/ICommandContainer.cs → ...i/Internal/Modelling/ICommandContainer.cs
diff --git a/...e/Cli/Internal/Modelling/ParameterKind.cs → ...e.Cli/Internal/Modelling/ParameterKind.cs b/...e/Cli/Internal/Modelling/ParameterKind.cs → ...e.Cli/Internal/Modelling/ParameterKind.cs
diff --git a/...nsole/Cli/Internal/Parsing/CommandTree.cs → ...nsole.Cli/Internal/Parsing/CommandTree.cs b/...nsole/Cli/Internal/Parsing/CommandTree.cs → ...nsole.Cli/Internal/Parsing/CommandTree.cs
diff --git a/...Internal/Parsing/CommandTreeExtensions.cs → ...Internal/Parsing/CommandTreeExtensions.cs b/...Internal/Parsing/CommandTreeExtensions.cs → ...Internal/Parsing/CommandTreeExtensions.cs
diff --git a/...Cli/Internal/Parsing/CommandTreeParser.cs → ...Cli/Internal/Parsing/CommandTreeParser.cs b/...Cli/Internal/Parsing/CommandTreeParser.cs → ...Cli/Internal/Parsing/CommandTreeParser.cs
diff --git a/...ernal/Parsing/CommandTreeParserContext.cs → ...ernal/Parsing/CommandTreeParserContext.cs b/...ernal/Parsing/CommandTreeParserContext.cs → ...ernal/Parsing/CommandTreeParserContext.cs
diff --git a/...ternal/Parsing/CommandTreeParserResult.cs → ...ternal/Parsing/CommandTreeParserResult.cs b/...ternal/Parsing/CommandTreeParserResult.cs → ...ternal/Parsing/CommandTreeParserResult.cs
diff --git a/.../Cli/Internal/Parsing/CommandTreeToken.cs → ....Cli/Internal/Parsing/CommandTreeToken.cs b/.../Cli/Internal/Parsing/CommandTreeToken.cs → ....Cli/Internal/Parsing/CommandTreeToken.cs
diff --git a/...nternal/Parsing/CommandTreeTokenStream.cs → ...nternal/Parsing/CommandTreeTokenStream.cs b/...nternal/Parsing/CommandTreeTokenStream.cs → ...nternal/Parsing/CommandTreeTokenStream.cs
diff --git a/.../Internal/Parsing/CommandTreeTokenizer.cs → .../Internal/Parsing/CommandTreeTokenizer.cs b/.../Internal/Parsing/CommandTreeTokenizer.cs → .../Internal/Parsing/CommandTreeTokenizer.cs
diff --git a/...al/Parsing/CommandTreeTokenizerContext.cs → ...al/Parsing/CommandTreeTokenizerContext.cs b/...al/Parsing/CommandTreeTokenizerContext.cs → ...al/Parsing/CommandTreeTokenizerContext.cs
diff --git a/...nternal/Parsing/MappedCommandParameter.cs → ...nternal/Parsing/MappedCommandParameter.cs b/...nternal/Parsing/MappedCommandParameter.cs → ...nternal/Parsing/MappedCommandParameter.cs
diff --git a/...ectre.Console/Cli/Internal/ParsingMode.cs → ...ectre.Console.Cli/Internal/ParsingMode.cs b/...ectre.Console/Cli/Internal/ParsingMode.cs → ...ectre.Console.Cli/Internal/ParsingMode.cs
diff --git a/...onsole/Cli/Internal/RemainingArguments.cs → ...onsole.Cli/Internal/RemainingArguments.cs b/...onsole/Cli/Internal/RemainingArguments.cs → ...onsole.Cli/Internal/RemainingArguments.cs
diff --git a/.../Cli/Internal/StringWriterWithEncoding.cs → ....Cli/Internal/StringWriterWithEncoding.cs b/.../Cli/Internal/StringWriterWithEncoding.cs → ....Cli/Internal/StringWriterWithEncoding.cs
diff --git a/...pectre.Console/Cli/Internal/TextBuffer.cs → ...pectre.Console.Cli/Internal/TextBuffer.cs b/...pectre.Console/Cli/Internal/TextBuffer.cs → ...pectre.Console.Cli/Internal/TextBuffer.cs
diff --git a/...tre.Console/Cli/Internal/TypeRegistrar.cs → ...tre.Console.Cli/Internal/TypeRegistrar.cs b/...tre.Console/Cli/Internal/TypeRegistrar.cs → ...tre.Console.Cli/Internal/TypeRegistrar.cs
diff --git a/...nsole/Cli/Internal/TypeResolverAdapter.cs → ...nsole.Cli/Internal/TypeResolverAdapter.cs b/...nsole/Cli/Internal/TypeResolverAdapter.cs → ...nsole.Cli/Internal/TypeResolverAdapter.cs
diff --git a/...tre.Console/Cli/Internal/VersionHelper.cs → ...tre.Console.Cli/Internal/VersionHelper.cs b/...tre.Console/Cli/Internal/VersionHelper.cs → ...tre.Console.Cli/Internal/VersionHelper.cs
diff --git a/src/Spectre.Console/Cli/PairDeconstructor.cs → src/Spectre.Console.Cli/PairDeconstructor.cs b/src/Spectre.Console/Cli/PairDeconstructor.cs → src/Spectre.Console.Cli/PairDeconstructor.cs
diff --git a/src/Spectre.Console.Cli/Properties/Usings.cs b/src/Spectre.Console.Cli/Properties/Usings.cs
@@ -0,0 +1,15 @@
+global using System;
+global using System.Collections;
+global using System.Collections.Generic;
+global using System.ComponentModel;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+global using System.IO;
+global using System.Linq;
+global using System.Reflection;
+global using System.Text;
+global using System.Threading.Tasks;
+global using System.Xml;
+global using Spectre.Console.Cli.Unsafe;
+global using Spectre.Console.Rendering;
diff --git a/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj b/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <NoWarn>SA1633</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\stylecop.json" Link="Properties/stylecop.json" />
+    <None Include="../../resources/gfx/small-logo.png" Pack="true" PackagePath="\" Link="Properties/small-logo.png" />
+    <InternalsVisibleTo Include="Spectre.Console.Cli.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" PrivateAssets="all" />
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />
+    <PackageReference Include="Nullable" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <AnnotatedReferenceAssemblyVersion>3.0.0</AnnotatedReferenceAssemblyVersion>
+    <GenerateNullableAttributes>False</GenerateNullableAttributes>
+  </PropertyGroup>
+
+</Project>
diff --git a/...e/Cli/Unsafe/IUnsafeBranchConfigurator.cs → ...e.Cli/Unsafe/IUnsafeBranchConfigurator.cs b/...e/Cli/Unsafe/IUnsafeBranchConfigurator.cs → ...e.Cli/Unsafe/IUnsafeBranchConfigurator.cs
diff --git a/...Console/Cli/Unsafe/IUnsafeConfigurator.cs → ...Console.Cli/Unsafe/IUnsafeConfigurator.cs b/...Console/Cli/Unsafe/IUnsafeConfigurator.cs → ...Console.Cli/Unsafe/IUnsafeConfigurator.cs
diff --git a/...li/Unsafe/UnsafeConfiguratorExtensions.cs → ...li/Unsafe/UnsafeConfiguratorExtensions.cs b/...li/Unsafe/UnsafeConfiguratorExtensions.cs → ...li/Unsafe/UnsafeConfiguratorExtensions.cs
diff --git a/...tilities/Extensions/ShouldlyExtensions.cs → ....Testing/Extensions/ShouldlyExtensions.cs b/...tilities/Extensions/ShouldlyExtensions.cs → ....Testing/Extensions/ShouldlyExtensions.cs
@@ -1,6 +1,6 @@
 namespace Spectre.Console;
 
-public static class ShouldlyExtensions
+internal static class ShouldlyExtensions
 {
     [DebuggerStepThrough]
     public static T And<T>(this T item, Action<T> action)

diff --git a/...sole.Tests/Utilities/FakeTypeRegistrar.cs → ...ctre.Console.Testing/FakeTypeRegistrar.cs b/...sole.Tests/Utilities/FakeTypeRegistrar.cs → ...ctre.Console.Testing/FakeTypeRegistrar.cs
@@ -1,17 +1,30 @@
 namespace Spectre.Console.Testing;
 
+/// <summary>
+/// A fake type registrar suitable for testing.
+/// </summary>
 public sealed class FakeTypeRegistrar : ITypeRegistrar
 {
+    /// <summary>
+    /// Gets all registrations.
+    /// </summary>
     public Dictionary<Type, List<Type>> Registrations { get; }
+
+    /// <summary>
+    /// Gets all singleton registrations.
+    /// </summary>
     public Dictionary<Type, List<object>> Instances { get; }
-    public Func<Dictionary<Type, List<Type>>, Dictionary<Type, List<object>>, ITypeResolver> TypeResolverFactory { get; set; }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FakeTypeRegistrar"/> class.
+    /// </summary>
     public FakeTypeRegistrar()
     {
         Registrations = new Dictionary<Type, List<Type>>();
         Instances = new Dictionary<Type, List<object>>();
     }
 
+    /// <inheritdoc/>
     public void Register(Type service, Type implementation)
     {
         if (!Registrations.ContainsKey(service))
@@ -24,6 +37,7 @@ public void Register(Type service, Type implementation)
         }
     }
 
+    /// <inheritdoc/>
     public void RegisterInstance(Type service, object implementation)
     {
         if (!Instances.ContainsKey(service))
@@ -32,6 +46,7 @@ public void RegisterInstance(Type service, object implementation)
         }
     }
 
+    /// <inheritdoc/>
     public void RegisterLazy(Type service, Func<object> factory)
     {
         if (factory is null)
@@ -45,8 +60,9 @@ public void RegisterLazy(Type service, Func<object> factory)
         }
     }
 
+    /// <inheritdoc/>
     public ITypeResolver Build()
     {
-        return TypeResolverFactory?.Invoke(Registrations, Instances);
+        return new FakeTypeResolver(Registrations, Instances);
     }
 }
diff --git a/...nsole.Tests/Utilities/FakeTypeResolver.cs → ...ectre.Console.Testing/FakeTypeResolver.cs b/...nsole.Tests/Utilities/FakeTypeResolver.cs → ...ectre.Console.Testing/FakeTypeResolver.cs
@@ -1,10 +1,18 @@
 namespace Spectre.Console.Testing;
 
+/// <summary>
+/// A fake type resolver suitable for testing.
+/// </summary>
 public sealed class FakeTypeResolver : ITypeResolver
 {
     private readonly Dictionary<Type, List<Type>> _registrations;
     private readonly Dictionary<Type, List<object>> _instances;
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FakeTypeResolver"/> class.
+    /// </summary>
+    /// <param name="registrations">The registrations.</param>
+    /// <param name="instances">The singleton registrations.</param>
     public FakeTypeResolver(
         Dictionary<Type, List<Type>> registrations,
         Dictionary<Type, List<object>> instances)
@@ -13,11 +21,14 @@ public FakeTypeResolver(
         _instances = instances ?? throw new ArgumentNullException(nameof(instances));
     }
 
-    public static Func<Dictionary<Type, List<Type>>, Dictionary<Type, List<object>>, ITypeResolver> Factory =>
-        (r, i) => new FakeTypeResolver(r, i);
-
-    public object Resolve(Type type)
+    /// <inheritdoc/>
+    public object? Resolve(Type? type)
     {
+        if (type == null)
+        {
+            return null;
+        }
+
         if (_instances.TryGetValue(type, out var instances))
         {
             return instances.FirstOrDefault();

diff --git a/src/Spectre.Console.Testing/Properties/Usings.cs b/src/Spectre.Console.Testing/Properties/Usings.cs
@@ -1,6 +1,8 @@
 global using System;
 global using System.Collections.Generic;
+global using System.Diagnostics;
 global using System.IO;
+global using System.Linq;
 global using System.Threading;
 global using System.Threading.Tasks;
 global using Spectre.Console.Cli;

diff --git a/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj b/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj
@@ -8,12 +8,18 @@
     <Description>Contains testing utilities for Spectre.Console.</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Spectre.Console.Tests" />
+    <InternalsVisibleTo Include="Spectre.Console.Cli.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="Properties/stylecop.json" />
     <None Include="../../resources/gfx/small-logo.png" Pack="true" PackagePath="\" Link="Properties/small-logo.png" />
   </ItemGroup>
 
   <ItemGroup Label="Project References">
+    <ProjectReference Include="..\Spectre.Console.Cli\Spectre.Console.Cli.csproj" />
     <ProjectReference Include="..\Spectre.Console\Spectre.Console.csproj" />
   </ItemGroup>
 

diff --git a/src/Spectre.Console.sln b/src/Spectre.Console.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30225.117
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console", "Spectre.Console\Spectre.Console.csproj", "{80DCBEF3-99D6-46C0-9C5B-42B4534D9113}"
 EndProject
@@ -30,6 +30,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{E0E4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Tests", "..\test\Spectre.Console.Tests\Spectre.Console.Tests.csproj", "{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Cli", "Spectre.Console.Cli\Spectre.Console.Cli.csproj", "{1B67B74F-1243-4381-9A2B-86EA66D135C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Cli.Tests", "..\test\Spectre.Console.Cli.Tests\Spectre.Console.Cli.Tests.csproj", "{E07C46D2-714F-4116-BADD-FEE09617A9C4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -88,6 +92,30 @@ Global
 		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x64.Build.0 = Release|Any CPU
 		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.ActiveCfg = Release|Any CPU
 		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.Build.0 = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|x64.Build.0 = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B67B74F-1243-4381-9A2B-86EA66D135C5}.Release|x86.Build.0 = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Debug|x86.Build.0 = Debug|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|x64.Build.0 = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{E07C46D2-714F-4116-BADD-FEE09617A9C4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Spectre.Console/Properties/Usings.cs b/src/Spectre.Console/Properties/Usings.cs
@@ -16,7 +16,6 @@
 global using System.Threading;
 global using System.Threading.Tasks;
 global using System.Xml;
-global using Spectre.Console.Cli.Unsafe;
 global using Spectre.Console.Enrichment;
 global using Spectre.Console.Internal;
 global using Spectre.Console.Rendering;

diff --git a/src/Spectre.Console/Spectre.Console.csproj b/src/Spectre.Console/Spectre.Console.csproj
@@ -16,7 +16,6 @@
     <EmbeddedResource Include="Widgets\Figlet\Fonts\Standard.flf" />
     <None Remove="Widgets\Figlet\Fonts\Standard.flf" />
     <None Include="../../resources/gfx/small-logo.png" Pack="true" PackagePath="\" Link="Properties/small-logo.png" />
-    <None Include="..\.editorconfig" Link="Cli\.editorconfig" />
     <InternalsVisibleTo Include="$(AssemblyName).Tests" />
   </ItemGroup>
 

diff --git a/test/Spectre.Console.Tests/Constants.cs → test/Spectre.Console.Cli.Tests/Constants.cs b/test/Spectre.Console.Tests/Constants.cs → test/Spectre.Console.Cli.Tests/Constants.cs
diff --git a/...sole.Tests/Data/Commands/AnimalCommand.cs → ....Cli.Tests/Data/Commands/AnimalCommand.cs b/...sole.Tests/Data/Commands/AnimalCommand.cs → ....Cli.Tests/Data/Commands/AnimalCommand.cs
diff --git a/...Console.Tests/Data/Commands/CatCommand.cs → ...ole.Cli.Tests/Data/Commands/CatCommand.cs b/...Console.Tests/Data/Commands/CatCommand.cs → ...ole.Cli.Tests/Data/Commands/CatCommand.cs
diff --git a/...Console.Tests/Data/Commands/DogCommand.cs → ...ole.Cli.Tests/Data/Commands/DogCommand.cs b/...Console.Tests/Data/Commands/DogCommand.cs → ...ole.Cli.Tests/Data/Commands/DogCommand.cs
diff --git a/...sts/Data/Commands/DumpRemainingCommand.cs → ...sts/Data/Commands/DumpRemainingCommand.cs b/...sts/Data/Commands/DumpRemainingCommand.cs → ...sts/Data/Commands/DumpRemainingCommand.cs
@@ -9,7 +9,7 @@ public DumpRemainingCommand(IAnsiConsole console)
         _console = console;
     }
 
-    public override int Execute([NotNull] CommandContext context, [NotNull] EmptyCommandSettings settings)
+    public override int Execute(CommandContext context, EmptyCommandSettings settings)
     {
         if (context.Remaining.Raw.Count > 0)
         {

diff --git a/...nsole.Tests/Data/Commands/EmptyCommand.cs → ...e.Cli.Tests/Data/Commands/EmptyCommand.cs b/...nsole.Tests/Data/Commands/EmptyCommand.cs → ...e.Cli.Tests/Data/Commands/EmptyCommand.cs
diff --git a/...ole.Tests/Data/Commands/GenericCommand.cs → ...Cli.Tests/Data/Commands/GenericCommand.cs b/...ole.Tests/Data/Commands/GenericCommand.cs → ...Cli.Tests/Data/Commands/GenericCommand.cs
diff --git a/...ole.Tests/Data/Commands/GiraffeCommand.cs → ...Cli.Tests/Data/Commands/GiraffeCommand.cs b/...ole.Tests/Data/Commands/GiraffeCommand.cs → ...Cli.Tests/Data/Commands/GiraffeCommand.cs
diff --git a/...sts/Data/Commands/HiddenOptionsCommand.cs → ...sts/Data/Commands/HiddenOptionsCommand.cs b/...sts/Data/Commands/HiddenOptionsCommand.cs → ...sts/Data/Commands/HiddenOptionsCommand.cs
diff --git a/...nsole.Tests/Data/Commands/HorseCommand.cs → ...e.Cli.Tests/Data/Commands/HorseCommand.cs b/...nsole.Tests/Data/Commands/HorseCommand.cs → ...e.Cli.Tests/Data/Commands/HorseCommand.cs
diff --git a/...ole.Tests/Data/Commands/InvalidCommand.cs → ...Cli.Tests/Data/Commands/InvalidCommand.cs b/...ole.Tests/Data/Commands/InvalidCommand.cs → ...Cli.Tests/Data/Commands/InvalidCommand.cs
diff --git a/...onsole.Tests/Data/Commands/LionCommand.cs → ...le.Cli.Tests/Data/Commands/LionCommand.cs b/...onsole.Tests/Data/Commands/LionCommand.cs → ...le.Cli.Tests/Data/Commands/LionCommand.cs
diff --git a/...sts/Data/Commands/NoDescriptionCommand.cs → ...sts/Data/Commands/NoDescriptionCommand.cs b/...sts/Data/Commands/NoDescriptionCommand.cs → ...sts/Data/Commands/NoDescriptionCommand.cs
@@ -5,7 +5,7 @@ public sealed class NoDescriptionCommand : Command<EmptyCommandSettings>
     [CommandOption("-f|--foo <VALUE>")]
     public int Foo { get; set; }
 
-    public override int Execute([NotNull] CommandContext context, [NotNull] EmptyCommandSettings settings)
+    public override int Execute(CommandContext context, EmptyCommandSettings settings)
     {
         return 0;
     }

diff --git a/...ests/Data/Commands/OptionVectorCommand.cs → ...ests/Data/Commands/OptionVectorCommand.cs b/...ests/Data/Commands/OptionVectorCommand.cs → ...ests/Data/Commands/OptionVectorCommand.cs
diff --git a/...le.Tests/Data/Commands/ThrowingCommand.cs → ...li.Tests/Data/Commands/ThrowingCommand.cs b/...le.Tests/Data/Commands/ThrowingCommand.cs → ...li.Tests/Data/Commands/ThrowingCommand.cs
diff --git a/...ts/Data/Converters/CatAgilityConverter.cs → ...ts/Data/Converters/CatAgilityConverter.cs b/...ts/Data/Converters/CatAgilityConverter.cs → ...ts/Data/Converters/CatAgilityConverter.cs
diff --git a/...ta/Converters/StringToIntegerConverter.cs → ...ta/Converters/StringToIntegerConverter.cs b/...ta/Converters/StringToIntegerConverter.cs → ...ta/Converters/StringToIntegerConverter.cs
diff --git a/...ole.Tests/Data/Settings/AnimalSettings.cs → ...Cli.Tests/Data/Settings/AnimalSettings.cs b/...ole.Tests/Data/Settings/AnimalSettings.cs → ...Cli.Tests/Data/Settings/AnimalSettings.cs
diff --git a/...ts/Data/Settings/ArgumentOrderSettings.cs → ...ts/Data/Settings/ArgumentOrderSettings.cs b/...ts/Data/Settings/ArgumentOrderSettings.cs → ...ts/Data/Settings/ArgumentOrderSettings.cs
diff --git a/...s/Data/Settings/ArgumentVectorSettings.cs → ...s/Data/Settings/ArgumentVectorSettings.cs b/...s/Data/Settings/ArgumentVectorSettings.cs → ...s/Data/Settings/ArgumentVectorSettings.cs
diff --git a/...Tests/Data/Settings/BarCommandSettings.cs → ...Tests/Data/Settings/BarCommandSettings.cs b/...Tests/Data/Settings/BarCommandSettings.cs → ...Tests/Data/Settings/BarCommandSettings.cs
diff --git a/...onsole.Tests/Data/Settings/CatSettings.cs → ...le.Cli.Tests/Data/Settings/CatSettings.cs b/...onsole.Tests/Data/Settings/CatSettings.cs → ...le.Cli.Tests/Data/Settings/CatSettings.cs
diff --git a/...onsole.Tests/Data/Settings/DogSettings.cs → ...le.Cli.Tests/Data/Settings/DogSettings.cs b/...onsole.Tests/Data/Settings/DogSettings.cs → ...le.Cli.Tests/Data/Settings/DogSettings.cs
diff --git a/...sole.Tests/Data/Settings/EmptySettings.cs → ....Cli.Tests/Data/Settings/EmptySettings.cs b/...sole.Tests/Data/Settings/EmptySettings.cs → ....Cli.Tests/Data/Settings/EmptySettings.cs
diff --git a/...onsole.Tests/Data/Settings/FooSettings.cs → ...le.Cli.Tests/Data/Settings/FooSettings.cs b/...onsole.Tests/Data/Settings/FooSettings.cs → ...le.Cli.Tests/Data/Settings/FooSettings.cs
diff --git a/...le.Tests/Data/Settings/GiraffeSettings.cs → ...li.Tests/Data/Settings/GiraffeSettings.cs b/...le.Tests/Data/Settings/GiraffeSettings.cs → ...li.Tests/Data/Settings/GiraffeSettings.cs
diff --git a/...sts/Data/Settings/HiddenOptionSettings.cs → ...sts/Data/Settings/HiddenOptionSettings.cs b/...sts/Data/Settings/HiddenOptionSettings.cs → ...sts/Data/Settings/HiddenOptionSettings.cs
diff --git a/...le.Tests/Data/Settings/InvalidSettings.cs → ...li.Tests/Data/Settings/InvalidSettings.cs b/...le.Tests/Data/Settings/InvalidSettings.cs → ...li.Tests/Data/Settings/InvalidSettings.cs
diff --git a/...nsole.Tests/Data/Settings/LionSettings.cs → ...e.Cli.Tests/Data/Settings/LionSettings.cs b/...nsole.Tests/Data/Settings/LionSettings.cs → ...e.Cli.Tests/Data/Settings/LionSettings.cs
diff --git a/...ole.Tests/Data/Settings/MammalSettings.cs → ...Cli.Tests/Data/Settings/MammalSettings.cs b/...ole.Tests/Data/Settings/MammalSettings.cs → ...Cli.Tests/Data/Settings/MammalSettings.cs
diff --git a/...ettings/MultipleArgumentVectorSettings.cs → ...ettings/MultipleArgumentVectorSettings.cs b/...ettings/MultipleArgumentVectorSettings.cs → ...ettings/MultipleArgumentVectorSettings.cs
diff --git a/...sts/Data/Settings/OptionVectorSettings.cs → ...sts/Data/Settings/OptionVectorSettings.cs b/...sts/Data/Settings/OptionVectorSettings.cs → ...sts/Data/Settings/OptionVectorSettings.cs
diff --git a/...tionalArgumentWithDefaultValueSettings.cs → ...tionalArgumentWithDefaultValueSettings.cs b/...tionalArgumentWithDefaultValueSettings.cs → ...tionalArgumentWithDefaultValueSettings.cs
diff --git a/...sts/Data/Settings/StringOptionSettings.cs → ...sts/Data/Settings/StringOptionSettings.cs b/...sts/Data/Settings/StringOptionSettings.cs → ...sts/Data/Settings/StringOptionSettings.cs
diff --git a/...alidators/EvenNumberValidatorAttribute.cs → ...alidators/EvenNumberValidatorAttribute.cs b/...alidators/EvenNumberValidatorAttribute.cs → ...alidators/EvenNumberValidatorAttribute.cs
diff --git a/...ators/PositiveNumberValidatorAttribute.cs → ...ators/PositiveNumberValidatorAttribute.cs b/...ators/PositiveNumberValidatorAttribute.cs → ...ators/PositiveNumberValidatorAttribute.cs
diff --git a/...Console.Cli.Tests/Expectations/Arguments/ArgumentCannotContainOptions.Output.verified.txt b/...Console.Cli.Tests/Expectations/Arguments/ArgumentCannotContainOptions.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Arguments can not contain options.
+
+       --foo <BAR>
+       ^^^^^ Not permitted
diff --git a/...Console.Cli.Tests/Expectations/Arguments/InvalidCharacterInOptionName.Output.verified.txt b/...Console.Cli.Tests/Expectations/Arguments/InvalidCharacterInOptionName.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Encountered invalid character '$' in option name.
+
+       --f$oo
+          ^ Invalid character
diff --git a/....Console.Cli.Tests/Expectations/Arguments/InvalidCharacterInValueName.Output.verified.txt b/....Console.Cli.Tests/Expectations/Arguments/InvalidCharacterInValueName.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Encountered invalid character '$' in value name.
+
+       -f|--foo <F$OO>
+                  ^ Invalid character
diff --git a/...i.Tests/Expectations/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt b/...i.Tests/Expectations/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Long option names must consist of more than one character.
+
+       --f
+         ^ Invalid option name
diff --git a/...ctre.Console.Cli.Tests/Expectations/Arguments/MissingLongAndShortName.Output.verified.txt b/...ctre.Console.Cli.Tests/Expectations/Arguments/MissingLongAndShortName.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       No long or short name for option has been specified.
+
+       <FOO>
+       ^^^^^ Missing option. Was this meant to be an argument?
diff --git a/....Cli.Tests/Expectations/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt b/....Cli.Tests/Expectations/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Multiple option values are not supported.
+
+       -f|--foo <FOO> <BAR>
+                      ^^^^^ Too many option values
diff --git a/...onsole.Cli.Tests/Expectations/Arguments/MultipleValuesAreNotSupported.Output.verified.txt b/...onsole.Cli.Tests/Expectations/Arguments/MultipleValuesAreNotSupported.Output.verified.txt
@@ -0,0 +1,5 @@
+Error: An error occured when parsing template.
+       Multiple values are not supported.
+
+       <FOO> <BAR>
+             ^^^^^ Too many values