[main] Update dependencies from dotnet/command-line-api #33126

dotnet-maestro · 2023-06-08T18:51:25Z

This pull request updates the following dependencies

From https://github.com/dotnet/command-line-api

Subscription: a08a5052-c9e7-44a2-9fba-08d94728d7f2
Build: 20230807.1
Date Produced: August 7, 2023 4:34:26 PM UTC
Commit: a045dd54a4c44723c215d992288160eb1401bb7f
Branch: refs/heads/main

Updates:
- Microsoft.SourceBuild.Intermediate.command-line-api: from 0.1.430701 to 0.1.440701
- System.CommandLine: from 2.0.0-beta4.23307.1 to 2.0.0-beta4.23407.1

…uild 20230608.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.430801

v-wuzhai · 2023-06-09T09:54:47Z

@jonsequitur Looks like dotnet/command-line-api#2205 changed the namespace name "CliAction" caused an error, could you take a look?

…7233ddc-4b19-4004-b583-4a3b720def80

…uild 20230612.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431201

…uild 20230612.2 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431202

JL03-Yue · 2023-06-13T20:13:36Z

@jonsequitur Could you take a look at the error here? The build is failing because of missing assembly reference.

…uild 20230615.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431501

…uild 20230619.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431901

…uild 20230626.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.432601

…7233ddc-4b19-4004-b583-4a3b720def80

marcpopMSFT · 2023-07-03T20:17:22Z

@adamsitnik @baronfel can you take a look as it looks like the underlying code for CliAction changed here and I'm not sure what the update should be.

…ynchronous 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.

MiYanni · 2023-07-17T22:14:19Z

@jonsequitur Can you review the changes I made in my commit above? I based the adjustments from the breaking change PR that you did for S.CL.

…7233ddc-4b19-4004-b583-4a3b720def80

marcpopMSFT · 2023-07-18T18:25:43Z

Looks like there's a test failure where missing a required parameter prints out the usage output but it missing some pieces. Not sure why some of the usage is missing and the arguments are fully missing. Odd change in behavior.

Usage:
dotnet new [ [...]] [options]
dotnet new [command] [options]

Arguments:
A short name of the template to create.
Template specific options to use.

MiYanni · 2023-07-19T22:57:37Z

@jonsequitur @adamsitnik Did some debugging. Looks like ParseErrorAction has changed how the help writing gets activated, which changed the output of our help when testing an error situation. The test Marc mentioned is calling dotnet new -v which normally requires you to provide a value for the -v argument. When this errors, the help is not hitting our argument handlers and not using our custom help logic.

Before

The CliConfiguration is created with the root command being the result of this ConfigureCommandLine method. This method always sets the HelpAction builder to use our custom builder, which eventually calls the custom help rendering.

You can see the Builder is set properly in HelpAction while debugging.

The weird part for me is when I try to add a breakpoint to the setter for the Builder property, it is never hit... Same thing for ConfigureCommandLine. There was likely some voodoo magic that was happening in the previous version of S.CL.

After

This new implementation doesn't seem to set the Builder properly in this scenario. The code on our side hasn't changed for setting this builder.

MiYanni · 2023-07-24T20:41:05Z

The issue was identified to be the one reported here: dotnet/command-line-api#2226

MiYanni · 2023-07-27T21:29:11Z

There was a fix merged for this issue. We'll have to wait until a new version is published. dotnet/command-line-api#2249

…uild 20230731.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.438101

…uild 20230807.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.440701

MiYanni · 2023-11-07T00:21:52Z

Current Progress: Waiting for this change to fix the current test failures for the OptionDuplicates_NotAllowed test.

Edit: That change was merged but a new S.CL package hasn't been published since Aug 7th. Disabling that check in the test for the time being.

…#36672)

…selves. There is potential for this simplification to cause issues, but at least the build works now.

… on a new S.CL package version.

…es. But contains commented code of other variants.

…ges. 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.

marcpopMSFT · 2023-11-10T00:16:10Z

Passing checks, is this actually ready finally? Not sure how to review the changes given they are in response to S.CL changes.

MiYanni · 2023-11-10T00:42:19Z

/azp run

azure-pipelines · 2023-11-10T00:42:31Z

Azure Pipelines successfully started running 1 pipeline(s).

MiYanni · 2023-11-10T00:46:44Z

@marcpopMSFT

Passing checks, is this actually ready finally? Not sure how to review the changes given they are in response to S.CL changes.

This is ready. Looking in DARC, here are the repos that dotnet/command-line-api flows to:

dotnet/dotnet-monitor
dotnet/format
dotnet/roslyn
dotnet/runtime
dotnet/templating
dotnet/sdk

We'll need to coordinate so that there is only 1 version of S.CL for source build to use. I'm not sure how to do that. Any suggestions?

marcpopMSFT · 2023-11-10T00:52:11Z

Hmm, I think we need some guidance from @MichaelSimons as I think the coordination was specifically driven by source build. The runtime makes this hard to do outside of main (ie we may have to leave 8.0.2xx untouched unless we want to take a servicing change to 8.0 and 8.0.1xx)

Can we get PRs triggered for each of those repos in main? Roslyn main will flow to 8.0.2xx so I'm not sure how to make this work.

baronfel · 2023-11-10T00:59:29Z

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs

            HelpBuilder.Default.CommandArgumentsSection()(context);
            context.Output.WriteLine();
            HelpBuilder.Default.OptionsSection()(context);
+            context.Output.WriteLine();


Out of curiosity why was this newline needed? Did formatting change upstream or something?

It did. The help output logic was changed and normalized. As you can see, previously, every other section here had an added WriteLine added to it except this one. It was likely being added (by accident) in the previous versions of S.CL.

I had to add it here so that the tests for checking help output passed and remained the same as expected.

baronfel · 2023-11-10T01:01:37Z

src/Cli/dotnet/Parser.cs

        public static CliConfiguration Instance { get; } = new(ConfigureCommandLine(RootCommand))
        {
            EnableDefaultExceptionHandler = false,
-            EnableParseErrorReporting = true,


Why do we remove the error reporting here and in the other place? S.CL uses this for reporting parse errors in a nice way - I'm actually pretty confused why our tests pass with such a large change!

This feature was changed and this property no longer exists on this class. There is a discussion here that you responded to. This concept is bound to the ParseErrorAction now. From my understanding, it isn't a thing you turn on/off, but the type of action returned when a parsing error occurs. It is actually one of the things I've made a PR for, as there was a problem with a stray newline in its output: dotnet/command-line-api#2289

Wow I completely forgot about both of those things 😅

Thank you for the reminder, and the explanation! All good from my end now.

MiYanni · 2023-11-15T02:55:24Z

Created PRs for the other repos to update the S.CL version:

lewing · 2023-11-16T19:06:09Z

The changes have hit dotnet/installer#17818 so we won't get a new installer until all the prs have merged and completed flow into sdk

src/Tests/dotnet-watch.Tests/CommandLineOptionsTests.cs

src/Cli/dotnet/ParseResultExtensions.cs

Update dependencies from https://github.com/dotnet/command-line-api b…

a93456e

…uild 20230608.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.430801

ghost added Area-CodeFlow untriaged Request triage from a team member labels Jun 8, 2023

v-wuzhai requested a review from jonsequitur June 12, 2023 07:17

Jason Zhai and others added 3 commits June 12, 2023 00:21

Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a…

27f25dc

…7233ddc-4b19-4004-b583-4a3b720def80

Update dependencies from https://github.com/dotnet/command-line-api b…

35c9c70

…uild 20230612.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431201

Update dependencies from https://github.com/dotnet/command-line-api b…

7aa4ec2

…uild 20230612.2 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431202

dotnet-maestro bot and others added 5 commits June 15, 2023 17:39

Update dependencies from https://github.com/dotnet/command-line-api b…

0c7a1dd

…uild 20230615.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431501

Update dependencies from https://github.com/dotnet/command-line-api b…

8167084

…uild 20230619.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.431901

Update dependencies from https://github.com/dotnet/command-line-api b…

b55ba25

…uild 20230626.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.356401 -> To Version 0.1.432601

Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a…

90754b0

…7233ddc-4b19-4004-b583-4a3b720def80

Add missing using statement

6d16402

marcpopMSFT requested a review from a team as a code owner July 3, 2023 18:18

MiYanni added the waiting-on-feedback label Jul 17, 2023

build-analysis bot mentioned this pull request Jul 18, 2023

NuGet failing with Response status code does not indicate success: 503 (Service Unavailable) dotnet/arcade#11723

Open

5 tasks

Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a…

898ce04

…7233ddc-4b19-4004-b583-4a3b720def80

dotnet-maestro bot and others added 4 commits July 31, 2023 20:44

Update dependencies from https://github.com/dotnet/command-line-api b…

1965507

…uild 20230731.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.438101

Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80

d2818e1

Update dependencies from https://github.com/dotnet/command-line-api b…

82f4ac3

…uild 20230807.1 Microsoft.SourceBuild.Intermediate.command-line-api , System.CommandLine From Version 0.1.430701 -> To Version 0.1.440701

Merge branch 'main' into darc-main-a7233ddc-4b19-4004-b583-4a3b720def80

3a9f452

dsplaisted mentioned this pull request Aug 21, 2023

[release/8.0.1xx] Update dependencies from dotnet/command-line-api #34751

Closed

MiYanni mentioned this pull request Nov 7, 2023

Fix extra newline on writing error output dotnet/command-line-api#2289

Merged

MiYanni and others added 4 commits November 6, 2023 16:22

Remove old System.CommandLine code that has a more natural expression (…

41f78d5

…#36672)

Cleanup from Chet's simplification.

d2ff86e

Fix build by switching on the symbolResult instead of the tokens them…

7e707b3

…selves. 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…

bdb4668

… on a new S.CL package version.

MiYanni requested review from a team, arunchndr and tmat as code owners November 7, 2023 23:02

MiYanni added 2 commits November 7, 2023 18:21

This is functioning (passes tests) of the ParseResultExtensions chang…

dac42ad

…es. But contains commented code of other variants.

Figured out what was causing the test failures with the previous chan…

8755e93

…ges. 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.

marcpopMSFT requested a review from nagilson November 10, 2023 00:14

baronfel reviewed Nov 10, 2023

View reviewed changes

MiYanni mentioned this pull request Nov 21, 2023

Revert "Revert "Update to the latest dotnet/command-line-api version"" dotnet/runtime#95092

Merged

nagilson reviewed Nov 22, 2023

View reviewed changes

src/Tests/dotnet-watch.Tests/CommandLineOptionsTests.cs Show resolved Hide resolved

nagilson reviewed Nov 22, 2023

View reviewed changes

src/Cli/dotnet/ParseResultExtensions.cs Show resolved Hide resolved

nagilson self-requested a review November 22, 2023 18:09

nagilson approved these changes Nov 23, 2023

View reviewed changes

dotnet-maestro bot merged commit 1a64a74 into main Nov 23, 2023

dotnet-maestro bot deleted the darc-main-a7233ddc-4b19-4004-b583-4a3b720def80 branch November 23, 2023 00:41

[main] Update dependencies from dotnet/command-line-api #33126

[main] Update dependencies from dotnet/command-line-api #33126

Uh oh!

Conversation

dotnet-maestro bot commented Jun 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

From https://github.com/dotnet/command-line-api

Uh oh!

v-wuzhai commented Jun 9, 2023

Uh oh!

JL03-Yue commented Jun 13, 2023

Uh oh!

marcpopMSFT commented Jul 3, 2023

Uh oh!

MiYanni commented Jul 17, 2023

Uh oh!

marcpopMSFT commented Jul 18, 2023

Uh oh!

MiYanni commented Jul 19, 2023

Before

After

Uh oh!

MiYanni commented Jul 24, 2023

Uh oh!

MiYanni commented Jul 27, 2023

Uh oh!

MiYanni commented Nov 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marcpopMSFT commented Nov 10, 2023

Uh oh!

MiYanni commented Nov 10, 2023

Uh oh!

azure-pipelines bot commented Nov 10, 2023

Uh oh!

MiYanni commented Nov 10, 2023

Uh oh!

marcpopMSFT commented Nov 10, 2023

Uh oh!

baronfel Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

MiYanni Nov 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

baronfel Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

MiYanni Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

baronfel Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

MiYanni commented Nov 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

SDK PR

New PRs

Already has latest S.CL version

Uh oh!

lewing commented Nov 16, 2023

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

dotnet-maestro bot commented Jun 8, 2023 •

edited

Loading

MiYanni commented Nov 7, 2023 •

edited

Loading

MiYanni Nov 10, 2023 •

edited

Loading

MiYanni commented Nov 15, 2023 •

edited

Loading