Remove old System.CommandLine code that has a more natural expression #36672
+9
−39
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
MiYanni
approved these changes
Nov 6, 2023
MiYanni
merged commit 41f78d5
into
dotnet:darc-main-a7233ddc-4b19-4004-b583-4a3b720def80
dotnet-maestro bot
added a commit
that referenced
this pull request
Nov 23, 2023
[main] Update dependencies from dotnet/command-line-api - Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Add missing using statement - Changed CommandAction to derive of AsynchronousCliAction, since the synchronous Invoke was not called. Removed uses of EnableParseErrorReporting and EnableTypoCorrecti since these were removed from CliConfiguration. Set the Directives on CliRootCommand since CliConfiguration no longer has a local list for Directives. - Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 - Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 # Conflicts: # eng/Versions.props - Fixed build error by adding required namespace for AsynchronousCliAction. - Merge branch 'darc-main-a7233ddc-4b19-4004-b583-4a3b720def80' of https://github.com/dotnet/sdk into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 # Conflicts: # eng/Versions.props - Aligned System.CommandLine versions between Versions.props and Version.Details.xml. Fixed GetValue in TemplateCommandArgs.cs by checking against the new typed generic of CliOption. Adjusted CustomHelpLayout in ParserFactory.cs to match the new Func<HelpContext, bool> instead of the previous Action<HelpContext> by always returning true to match the previous logic. - Added missing newline based on help option output changes in S.CL. - It seems that ExactlyOne with a default value would be coerced into ZeroOrOne. Now, it seems the parsing logic doesn't do that, so we need to explicitly set it to ZeroOrOne. - Added HACKY WORKAROUND for accessing ArgumentResult values when token parsing. Also added DirectiveResult token access. - remove old hack - fix name comparison - Remove old System.CommandLine code that has a more natural expression (#36672) - Cleanup from Chet's simplification. - Fix build by switching on the symbolResult instead of the tokens themselves. There is potential for this simplification to cause issues, but at least the build works now. - Disable the check in OptionDuplicates_NotAllowed since the fix relies on a new S.CL package version. - This is functioning (passes tests) of the ParseResultExtensions changes. But contains commented code of other variants. - Figured out what was causing the test failures with the previous changes. The logic around OptionResult was required or else it would both show the warning and try to use -p as a property (when it should be a project) for the particular failing tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.