Merge pull request #2366 from KathleenDollard/main-powderhouse-ci

mhutch · web-flow · commit b23f6a47d79b · 2024-04-01T19:10:22.000-04:00
Updated solution filter for CI
diff --git a/System.CommandLine.sln b/System.CommandLine.sln
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Subsyste
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Subsystems.Tests", "src\System.CommandLine.Subsystems.Tests\System.CommandLine.Subsystems.Tests.csproj", "{7D6F74A4-28E4-4B57-8A4B-415A533729A7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEndTestApp", "src\System.CommandLine.Suggest.Tests\EndToEndTestApp\EndToEndTestApp.csproj", "{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -161,6 +163,18 @@ Global
 		{7D6F74A4-28E4-4B57-8A4B-415A533729A7}.Release|x64.Build.0 = Release|Any CPU
 		{7D6F74A4-28E4-4B57-8A4B-415A533729A7}.Release|x86.ActiveCfg = Release|Any CPU
 		{7D6F74A4-28E4-4B57-8A4B-415A533729A7}.Release|x86.Build.0 = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|x64.Build.0 = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Debug|x86.Build.0 = Debug|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|x64.ActiveCfg = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|x64.Build.0 = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|x86.ActiveCfg = Release|Any CPU
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -175,6 +189,7 @@ Global
 		{9E93F66A-6099-4675-AF53-FC10DE01925B} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
 		{D750F504-DEBB-47B1-89AC-BB12B796E7B9} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
 		{7D6F74A4-28E4-4B57-8A4B-415A533729A7} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
+		{8DAAEC0E-0B7C-4BEB-BD04-E197820E3568} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5C159F93-800B-49E7-9905-EE09F8B8434A}
diff --git a/sourcebuild.slnf b/sourcebuild.slnf
@@ -2,10 +2,7 @@
   "solution": {
     "path": "System.CommandLine.sln",
     "projects": [
-      "src\\System.CommandLine\\System.CommandLine.csproj",
-      "src\\System.CommandLine.DragonFruit\\System.CommandLine.DragonFruit.csproj",
-      "src\\System.CommandLine.NamingConventionBinder\\System.CommandLine.NamingConventionBinder.csproj",
-      "src\\System.CommandLine.Rendering\\System.CommandLine.Rendering.csproj"
+      "src\\System.CommandLine\\System.CommandLine.csproj"
     ]
   }
 }
diff --git a/src/System.CommandLine.Subsystems.Tests/System.CommandLine.Subsystems.Tests.csproj b/src/System.CommandLine.Subsystems.Tests/System.CommandLine.Subsystems.Tests.csproj
@@ -6,7 +6,10 @@
     <DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestApps\**</DefaultExcludesInProjectFolder>
     <OutputType>Library</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>annotations</Nullable>
+    <!--   
     <Nullable>enable</Nullable>
+    -->
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
 
@@ -23,7 +26,9 @@
     -->
     <Compile Include="..\System.CommandLine.Tests\Utility\**\*.cs" Link="Utility\%(RecursiveDir)%(Filename).%(Extension)" Exclude="..\System.CommandLine.Tests\Utility\ParseResultExtensions.cs" />
     <Compile Include="..\System.CommandLine.Suggest\DotnetMuxer.cs" Link="Utility\DotnetMuxer.cs" />
+    <!--
     <Compile Include="..\System.CommandLine\Properties\Resources.Designer.cs" Link="Properties\Resources.Designer.cs" />
+    -->
     <Compile Include="AlternateSubsystems.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="PipelineTests.cs" />
diff --git a/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs b/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs
@@ -71,7 +71,7 @@ private static void PrepareTestHomeDirectoryToAvoidPolluteBuildMachineHome()
             Directory.CreateDirectory(_testRoot);
         }
 
-        [ReleaseBuildOnlyFact]
+        [ReleaseBuildOnlyFact(Skip = "Temp E2EApp doesn't have completions wired up yet")]
         public void Test_app_supplies_suggestions()
         {
             var stdOut = new StringBuilder();
@@ -87,7 +87,7 @@ public void Test_app_supplies_suggestions()
                   .Be($"--apple{NewLine}--banana{NewLine}--durian{NewLine}");
         }
 
-        [ReleaseBuildOnlyFact]
+        [ReleaseBuildOnlyFact(Skip = "Temp E2EApp doesn't have completions wired up yet")]
         public void Dotnet_suggest_provides_suggestions_for_app()
         {
             // run "dotnet-suggest register" in explicit way
@@ -122,7 +122,7 @@ public void Dotnet_suggest_provides_suggestions_for_app()
                   .Be($"--apple{NewLine}--banana{NewLine}--durian{NewLine}");
         }
 
-        [ReleaseBuildOnlyFact]
+        [ReleaseBuildOnlyFact(Skip ="Temp E2EApp doesn't have completions wired up yet")]
         public void Dotnet_suggest_provides_suggestions_for_app_with_only_commandname()
         {
             // run "dotnet-suggest register" in explicit way
diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs
@@ -1,5 +1,7 @@
 using System.CommandLine;
+/*
 using System.CommandLine.Help;
+*/
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using System.Threading;
@@ -8,7 +10,7 @@ namespace EndToEndTestApp
 {
     public class Program
     {
-        static async Task Main(string[] args)
+        static void Main(string[] args)
         {
             CliOption<string> appleOption = new ("--apple" );
             CliOption<string> bananaOption = new ("--banana");
@@ -23,19 +25,10 @@ static async Task Main(string[] args)
                 durianOption,
             };
 
-            rootCommand.SetAction((ParseResult ctx, CancellationToken cancellationToken) =>
-            {
-                string apple = ctx.GetValue(appleOption);
-                string banana = ctx.GetValue(bananaOption);
-                string cherry = ctx.GetValue(cherryOption);
-                string durian = ctx.GetValue(durianOption);
-
-                return Task.CompletedTask;
-            });
-
             CliConfiguration commandLine = new (rootCommand);
 
-            await commandLine.InvokeAsync(args);
+            var result = CliParser.Parse(commandLine.RootCommand, args, commandLine);
+
         }
     }
 }
diff --git a/src/System.CommandLine.Tests/ParserTests.cs b/src/System.CommandLine.Tests/ParserTests.cs
@@ -842,6 +842,8 @@ public void Absolute_Windows_style_paths_are_lexed_correctly()
                           .OnlyContain(a => a.Value == @"c:\temp\the file.txt\");
                 }
 
+// Default values
+/*
                 [Fact]
                 public void Commands_can_have_default_argument_values()
                 {
@@ -960,6 +962,7 @@ public void Command_default_argument_value_does_not_override_parsed_value()
                           .Should()
                           .Be("the-directory");
                 }
+*/
 
                 [Fact]
                 public void Unmatched_tokens_that_look_like_options_are_not_split_into_smaller_tokens()
@@ -1479,6 +1482,8 @@ public void Command_argument_arity_can_be_a_range_with_a_lower_bound_greater_tha
                                new CliToken("5", CliTokenType.Argument, argument));
                 }
 
+// TODO: Validation?
+/*
                 [Fact]
                 public void When_command_arguments_are_fewer_than_minimum_arity_then_an_error_is_returned()
                 {
@@ -1517,6 +1522,7 @@ public void When_command_arguments_are_greater_than_maximum_arity_then_an_error_
                            .Should()
                            .Contain(LocalizationResources.UnrecognizedCommandOrArgument("4"));
                 }
+*/
 
                 [Fact]
                 public void Option_argument_arity_can_be_a_fixed_value_greater_than_1()
@@ -1568,6 +1574,8 @@ public void Option_argument_arity_can_be_a_range_with_a_lower_bound_greater_than
                                new CliToken("5", CliTokenType.Argument, default));
                 }
 
+// TODO: Validation?
+/*       
                 [Fact]
                 public void When_option_arguments_are_fewer_than_minimum_arity_then_an_error_is_returned()
                 {
@@ -1603,6 +1611,7 @@ public void When_option_arguments_are_greater_than_maximum_arity_then_an_error_i
                            .Should()
                            .Contain(LocalizationResources.UnrecognizedCommandOrArgument("4"));
                 }
+*/
 
                 [Fact]
                 public void Tokens_are_not_split_if_the_part_before_the_delimiter_is_not_an_option()
diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
@@ -17,7 +17,9 @@
     <!--<Compile Include="..\Common\OptionBuilder.cs" Link="Utility\OptionBuilder.cs" />-->
     <!--<Compile Include="..\System.CommandLine.Suggest\DotnetMuxer.cs" Link="Utility\DotnetMuxer.cs" />-->
     <!--<Compile Include="..\System.CommandLine\LocalizationResources.cs" Link="LocalizationResources.cs" />-->
+    <!--
     <Compile Include="..\System.CommandLine\Properties\Resources.Designer.cs" Link="Properties\Resources.Designer.cs" />
+    -->
     <Compile Include="TokenizerTests.cs" />
     <Compile Include="ParserTests.cs" />
     <Compile Include="Utility\**\*.cs" Exclude="Utility\ParseResultExtensions.cs"/>
diff --git a/src/System.CommandLine/CliArgument{T}.cs b/src/System.CommandLine/CliArgument{T}.cs
@@ -27,11 +27,13 @@ public CliArgument(string name) : base(name)
         /// <summary>
         /// The delegate to invoke to create the default value.
         /// </summary>
+        /*
         /// <remarks>
         /// It's invoked when there was no parse input provided for given Argument.
         /// The same instance can be set as <see cref="CustomParser"/>, in such case
         /// the delegate is also invoked when an input was provided.
         /// </remarks>
+        */
         public Func<ArgumentResult, T>? DefaultValueFactory { get; set; }
 
 // TODO: custom parsers
diff --git a/src/System.CommandLine/CliCommand.cs b/src/System.CommandLine/CliCommand.cs
@@ -37,7 +37,9 @@ public class CliCommand : CliSymbol, IEnumerable<CliSymbol>
         /// Initializes a new instance of the Command class.
         /// </summary>
         /// <param name="name">The name of the command.</param>
+        /*
         /// <param name="description">The description of the command, shown in help.</param>
+        */
         public CliCommand(string name)/*, string? description = null) */
             : base(name) 
         {
diff --git a/src/System.CommandLine/CliRootCommand.cs b/src/System.CommandLine/CliRootCommand.cs
@@ -17,7 +17,9 @@ namespace System.CommandLine
     /// </remarks>
     public class CliRootCommand : CliCommand
     {
+        /*
         /// <param name="description">The description of the command, shown in help.</param>
+        */
         public CliRootCommand(/*string description = "" */)
             : base(CliExecutable.ExecutableName/*, description*/)
         {
diff --git a/src/System.CommandLine/Parsing/ArgumentResult.cs b/src/System.CommandLine/Parsing/ArgumentResult.cs
@@ -41,8 +41,9 @@ public T GetValueOrDefault<T>() =>
                 .ConvertIfNeeded(typeof(T))
                 .GetValueOrDefault<T>();
 
+        // TODO: Fix cref for unmatched tokens
         /// <summary>
-        /// Specifies the maximum number of tokens to consume for the argument. Remaining tokens are passed on and can be consumed by later arguments, or will otherwise be added to <see cref="ParseResult.UnmatchedTokens"/>
+        /// Specifies the maximum number of tokens to consume for the argument. Remaining tokens are passed on and can be consumed by later arguments, or will otherwise be added to see cref="ParseResult.UnmatchedTokens"/>
         /// </summary>
         /// <param name="numberOfTokens">The number of tokens to take. The rest are passed on.</param>
         /// <exception cref="ArgumentOutOfRangeException">numberOfTokens - Value must be at least 1.</exception>
diff --git a/src/System.CommandLine/Parsing/CliParser.cs b/src/System.CommandLine/Parsing/CliParser.cs
@@ -11,10 +11,13 @@ namespace System.CommandLine.Parsing
     /// </summary>
     public static class CliParser
     {
+        /*
+        /// <param name="command">The command to use to parse the command line input.</param>
+        */
         /// <summary>
         /// Parses a list of arguments.
         /// </summary>
-        /// <param name="command">The command to use to parse the command line input.</param>
+        /// <param name="rootCommand"></param>
         /// <param name="args">The string array typically passed to a program's <c>Main</c> method.</param>
         /// <param name="configuration">The configuration on which the parser's grammar and behaviors are based.</param>
         /// <returns>A <see cref="ParseResult"/> providing details about the parse operation.</returns>
@@ -24,7 +27,7 @@ public static ParseResult Parse(CliCommand rootCommand, IReadOnlyList<string> ar
         /// <summary>
         /// Parses a command line string.
         /// </summary>
-        /// <param name="command">The command to use to parse the command line input.</param>
+        /// <param name="rootCommand">The command to use to parse the command line input.</param>
         /// <param name="commandLine">The complete command line input prior to splitting and tokenization. This input is not typically available when the parser is called from <c>Program.Main</c>. It is primarily used when calculating completions via the <c>dotnet-suggest</c> tool.</param>
         /// <param name="configuration">The configuration on which the parser's grammar and behaviors are based.</param>
         /// <remarks>The command line string input will be split into tokens as if it had been passed on the command line.</remarks>
diff --git a/src/System.CommandLine/Parsing/ParseOperation.cs b/src/System.CommandLine/Parsing/ParseOperation.cs
@@ -15,8 +15,10 @@ internal sealed class ParseOperation
 
         private int _index;
         private CommandResult _innermostCommandResult;
+        /*
         private bool _isHelpRequested;
         private bool _isTerminatingDirectiveSpecified;
+        */
 // TODO: invocation
 /*
         private CliAction? _primaryAction;
@@ -61,10 +63,12 @@ internal ParseResult Parse()
             ParseDirectives();
 */
             ParseCommandChildren();
+            /*
             if (!_isHelpRequested)
             {
                 Validate();
             }
+            */
 
 // TODO: invocation
 /*
diff --git a/src/System.CommandLine/Parsing/StringExtensions.cs b/src/System.CommandLine/Parsing/StringExtensions.cs
@@ -64,7 +64,9 @@ internal static void Tokenize(
             var currentCommand = rootCommand;
             var foundDoubleDash = false;
             // TODO: Directives
+            /*
             var foundEndOfDirectives = false;
+            */
 
             var tokenList = new List<CliToken>(args.Count);
 

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,7 @@`
`2`	`2`	`"solution": {`
`3`	`3`	`"path": "System.CommandLine.sln",`
`4`	`4`	`"projects": [`
`5`		`- "src\\System.CommandLine\\System.CommandLine.csproj",`
`6`		`- "src\\System.CommandLine.DragonFruit\\System.CommandLine.DragonFruit.csproj",`
`7`		`- "src\\System.CommandLine.NamingConventionBinder\\System.CommandLine.NamingConventionBinder.csproj",`
`8`		`- "src\\System.CommandLine.Rendering\\System.CommandLine.Rendering.csproj"`
	`5`	`+ "src\\System.CommandLine\\System.CommandLine.csproj"`
`9`	`6`	`]`
`10`	`7`	`}`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static void PrepareTestHomeDirectoryToAvoidPolluteBuildMachineHome()`
`71`	`71`	`Directory.CreateDirectory(_testRoot);`
`72`	`72`	`}`
`73`	`73`
`74`		`- [ReleaseBuildOnlyFact]`
	`74`	`+ [ReleaseBuildOnlyFact(Skip = "Temp E2EApp doesn't have completions wired up yet")]`
`75`	`75`	`public void Test_app_supplies_suggestions()`
`76`	`76`	`{`
`77`	`77`	`var stdOut = new StringBuilder();`
`@@ -87,7 +87,7 @@ public void Test_app_supplies_suggestions()`
`87`	`87`	`.Be($"--apple{NewLine}--banana{NewLine}--durian{NewLine}");`
`88`	`88`	`}`
`89`	`89`
`90`		`- [ReleaseBuildOnlyFact]`
	`90`	`+ [ReleaseBuildOnlyFact(Skip = "Temp E2EApp doesn't have completions wired up yet")]`
`91`	`91`	`public void Dotnet_suggest_provides_suggestions_for_app()`
`92`	`92`	`{`
`93`	`93`	`// run "dotnet-suggest register" in explicit way`
`@@ -122,7 +122,7 @@ public void Dotnet_suggest_provides_suggestions_for_app()`
`122`	`122`	`.Be($"--apple{NewLine}--banana{NewLine}--durian{NewLine}");`
`123`	`123`	`}`
`124`	`124`
`125`		`- [ReleaseBuildOnlyFact]`
	`125`	`+ [ReleaseBuildOnlyFact(Skip ="Temp E2EApp doesn't have completions wired up yet")]`
`126`	`126`	`public void Dotnet_suggest_provides_suggestions_for_app_with_only_commandname()`
`127`	`127`	`{`
`128`	`128`	`// run "dotnet-suggest register" in explicit way`
Original file line number	Diff line number	Diff line change
`@@ -842,6 +842,8 @@ public void Absolute_Windows_style_paths_are_lexed_correctly()`
`842`	`842`	`.OnlyContain(a => a.Value == @"c:\temp\the file.txt\");`
`843`	`843`	`}`
`844`	`844`
	`845`	`+// Default values`
	`846`	`+/*`
`845`	`847`	`[Fact]`
`846`	`848`	`public void Commands_can_have_default_argument_values()`
`847`	`849`	`{`
`@@ -960,6 +962,7 @@ public void Command_default_argument_value_does_not_override_parsed_value()`
`960`	`962`	`.Should()`
`961`	`963`	`.Be("the-directory");`
`962`	`964`	`}`
	`965`	`+*/`
`963`	`966`
`964`	`967`	`[Fact]`
`965`	`968`	`public void Unmatched_tokens_that_look_like_options_are_not_split_into_smaller_tokens()`
`@@ -1479,6 +1482,8 @@ public void Command_argument_arity_can_be_a_range_with_a_lower_bound_greater_tha`
`1479`	`1482`	`new CliToken("5", CliTokenType.Argument, argument));`
`1480`	`1483`	`}`
`1481`	`1484`
	`1485`	`+// TODO: Validation?`
	`1486`	`+/*`
`1482`	`1487`	`[Fact]`
`1483`	`1488`	`public void When_command_arguments_are_fewer_than_minimum_arity_then_an_error_is_returned()`
`1484`	`1489`	`{`
`@@ -1517,6 +1522,7 @@ public void When_command_arguments_are_greater_than_maximum_arity_then_an_error_`
`1517`	`1522`	`.Should()`
`1518`	`1523`	`.Contain(LocalizationResources.UnrecognizedCommandOrArgument("4"));`
`1519`	`1524`	`}`
	`1525`	`+*/`
`1520`	`1526`
`1521`	`1527`	`[Fact]`
`1522`	`1528`	`public void Option_argument_arity_can_be_a_fixed_value_greater_than_1()`
`@@ -1568,6 +1574,8 @@ public void Option_argument_arity_can_be_a_range_with_a_lower_bound_greater_than`
`1568`	`1574`	`new CliToken("5", CliTokenType.Argument, default));`
`1569`	`1575`	`}`
`1570`	`1576`
	`1577`	`+// TODO: Validation?`
	`1578`	`+/*`
`1571`	`1579`	`[Fact]`
`1572`	`1580`	`public void When_option_arguments_are_fewer_than_minimum_arity_then_an_error_is_returned()`
`1573`	`1581`	`{`
`@@ -1603,6 +1611,7 @@ public void When_option_arguments_are_greater_than_maximum_arity_then_an_error_i`
`1603`	`1611`	`.Should()`
`1604`	`1612`	`.Contain(LocalizationResources.UnrecognizedCommandOrArgument("4"));`
`1605`	`1613`	`}`
	`1614`	`+*/`
`1606`	`1615`
`1607`	`1616`	`[Fact]`
`1608`	`1617`	`public void Tokens_are_not_split_if_the_part_before_the_delimiter_is_not_an_option()`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ namespace System.CommandLine`
`17`	`17`	`/// </remarks>`
`18`	`18`	`public class CliRootCommand : CliCommand`
`19`	`19`	`{`
	`20`	`+ /*`
`20`	`21`	`/// <param name="description">The description of the command, shown in help.</param>`
	`22`	`+ */`
`21`	`23`	`public CliRootCommand(/string description = "" /)`
`22`	`24`	`: base(CliExecutable.ExecutableName/, description/)`
`23`	`25`	`{`