System.CommandLine update #48477

adamsitnik · 2025-04-15T11:24:22Z

This PR consist of few maestro updates required to update the System.CommandLine depedendency:

arcade: [main] Update dependencies from dotnet/arcade #48453
roslyn: [main] Update dependencies from dotnet/roslyn #48457
templating: [main] Update dependencies from dotnet/templating #48467
sourcelink: [main] Update dependencies from dotnet/sourcelink #48476
nuget.client: [main] Update dependencies from nuget/nuget.client #48489
runtime: [main] Update dependencies from dotnet/runtime #48505

…414.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 5.0.0-1.25213.1 -> To Version 5.0.0-1.25214.5

…ine.Rendering (will no longer be supported)

…414.8 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25212.1 -> To Version 10.0.0-beta.25214.8

…0250414.7 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-preview.4.25214.2 -> To Version 10.0.100-preview.4.25214.7

…0250414.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-preview.4.25214.2 -> To Version 10.0.100-preview.4.25214.8

…0250414.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 10.0.0-beta.25203.1 -> To Version 10.0.0-beta.25214.2

dotnet-issue-labeler · 2025-04-15T11:24:33Z

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

dotnet-issue-labeler · 2025-04-15T11:24:35Z

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

Copilot

Copilot reviewed 175 out of 178 changed files in this pull request and generated no comments.

Files not reviewed (3)

eng/Version.Details.xml: Language not supported
eng/Versions.props: Language not supported
global.json: Language not supported

Comments suppressed due to low confidence (3)

src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICommandDocument.cs:9

Ensure that the XML documentation consistently reflects the use of the new Command type instead of the legacy CliCommand, and verify that this update is in line with the rest of the codebase.

/// If a <see cref="Command"/> implements this interface, it can open

src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs:225

Verify that replacing AsynchronousCliAction with AsynchronousCommandLineAction meets the expected asynchronous action contract, ensuring no behavioral regressions occur.

private sealed class CommandAction : AsynchronousCommandLineAction

src/BuiltInTools/dotnet-watch/CommandLineOptions.cs:67

Confirm that replacing CliRootCommand with RootCommand and updating to CommandLineConfiguration preserves the intended command-line behavior in dotnet-watch.

var rootCommand = new RootCommand(Resources.Help)

adamsitnik · 2025-04-15T11:57:44Z

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs

@@ -10,10 +10,11 @@
 using Microsoft.TemplateEngine.Edge;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
+using Command = System.CommandLine.Command;


I was getting the following error:

'Command' is an ambiguous reference between 'System.CommandLine.Command' and 'Microsoft.DotNet.Cli.Utils.Command'

and decided to make it explicit with a using rather than using fully qualified name everywhere

I'll clean this stuff up later so don't worry about it.

adamsitnik · 2025-04-15T12:35:30Z

src/Cli/dotnet/Extensions/ParseResultExtensions.cs

@@ -97,13 +97,13 @@ public static bool IsDotnetBuiltInCommand(this ParseResult parseResult)

    public static bool IsTopLevelDotnetCommand(this ParseResult parseResult)
    {
-        return parseResult.CommandResult.Command.Equals(RootCommand) && string.IsNullOrEmpty(parseResult.RootSubCommandResult());
+        return parseResult.CommandResult.Command.Equals(Microsoft.DotNet.Cli.Parser.RootCommand) && string.IsNullOrEmpty(parseResult.RootSubCommandResult());


CliRootCommand got renamed to RootCommand and it conflicted with RootCommand which was imported here with a static using:

sdk/src/Cli/dotnet/Extensions/ParseResultExtensions.cs

Line 11 in afb3494

using static Microsoft.DotNet.Cli.Parser;

src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs

…6.15.0.7 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.102 -> To Version 6.15.0-preview.1.7

nkolev92 · 2025-04-15T20:40:42Z

I cherry-picked #48489 into this PR.

MiYanni · 2025-04-15T21:23:37Z

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/TemplateCommand.cs

@@ -10,10 +10,11 @@
 using Microsoft.TemplateEngine.Edge;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
+using Command = System.CommandLine.Command;


I'll clean this stuff up later so don't worry about it.

ViktorHofer · 2025-04-16T05:14:45Z

@premun we need to flow sourcelink into the VMR from sdk for this PR. Can we change the flow back temporarily to unblock the PR?

…0415.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.IO.Hashing , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.TargetingPack.x64.10.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-preview.4.25211.19 -> To Version 10.0.0-preview.4.25215.12

…-local-properties.patch

premun · 2025-04-16T07:05:13Z

@ViktorHofer do you mean to enable to old kind of synchronization for sourcelink?
Why can't we make the change sourcelink directly?

ViktorHofer · 2025-04-16T07:19:39Z

The change was already made to sourcelink but everything needs to flow-in together via sdk in this case. Those are tightly coupled product dependencies.

Yes, old synchronization. See my commits in this PR.

premun · 2025-04-16T07:21:17Z

@ViktorHofer then please change the disableSynchronization for sourcelink in this PR to see if it works.
(and update the V.D.xml record of sourcelink)

premun · 2025-04-16T07:35:27Z

Ah, I see. Then yeah, feel free to merge this

ViktorHofer · 2025-04-16T07:56:47Z

@adamsitnik I think you need to revert changes under src/SourceBuild.

adamsitnik · 2025-04-16T11:26:37Z

I've re-run the failed sdk test leg as the failing test has 6% failure rate.

@ViktorHofer how can we overcome the source build failure?

…ld 20250414.8" This reverts commit c2a6e14.

ViktorHofer · 2025-04-16T12:39:23Z

Ok that worked. The latest update should resolve the test failure in the source build job.

ViktorHofer · 2025-04-16T14:26:25Z

We will need to temporarily break source-build stage2 for this. Merge the PR, wait for a new official build and then re-bootstrap.

adamsitnik · 2025-04-16T14:28:01Z

@ViktorHofer the sdk-source-build has failed with:

/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(61,20): error CS0246: The type or namespace name 'CliCommand' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]
/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(71,42): error CS0246: The type or namespace name 'CliCommand' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]
/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(12,28): error CS0246: The type or namespace name 'CliArgument<>' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]
/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(18,28): error CS0246: The type or namespace name 'CliOption<>' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]
/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(25,28): error CS0246: The type or namespace name 'CliOption<>' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]
/__w/1/vmr/eng/tools/BinaryToolKit/Program.cs(33,28): error CS0246: The type or namespace name 'CliOption<>' could not be found (are you missing a using directive or an assembly reference?) [/__w/1/vmr/eng/tools/BinaryToolKit/BinaryToolKit.csproj]

Does it mean I should actually port everything in https://github.com/dotnet/sdk/blob/main/src/SourceBuild/content/eng/tools/BinaryToolKit ? (I did that initially and then you told me to revert it).

ViktorHofer · 2025-04-16T14:29:18Z

See my previous comment. We can't fix source-build stage2 here as then source-build stage1 would be broken. We will need to force-merge that PR and then unbreak it by doing some work. I will drive that today.

dotnet-maestro bot and others added 7 commits April 15, 2025 08:33

bump System.CommandLine version, remove dependency to System.CommandL…

20bffaa

…ine.Rendering (will no longer be supported)

adjust to breaking changes: the removal of Cli prefix

158c0e8

Copilot AI review requested due to automatic review settings April 15, 2025 11:24

adamsitnik requested review from a team as code owners April 15, 2025 11:24

dotnet-issue-labeler bot added the untriaged Request triage from a team member label Apr 15, 2025

Copilot AI reviewed Apr 15, 2025

View reviewed changes

adamsitnik self-assigned this Apr 15, 2025

ViktorHofer mentioned this pull request Apr 15, 2025

[main] Source code updates from dotnet/scenario-tests dotnet/dotnet#172

Merged

adamsitnik commented Apr 15, 2025

View reviewed changes

build-analysis bot mentioned this pull request Apr 15, 2025

Template engine tests hitting known parallelism issue in GetVisualStudioInstances #44878

Open

carlossanlop reviewed Apr 15, 2025

View reviewed changes

src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Program.cs Show resolved Hide resolved

adamsitnik and others added 2 commits April 15, 2025 21:27

Merge branch 'main' into sclUpdate

5688b19

MiYanni approved these changes Apr 15, 2025

View reviewed changes

Temporarily synchronize sourcelink again

1e24e3b

dotnet-maestro bot and others added 2 commits April 16, 2025 08:02

Delete src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as…

f5258c8

…-local-properties.patch

build-analysis bot mentioned this pull request Apr 16, 2025

Build failure in VMR Vertical Build Windows_x64: Downloading vswhere - Process cannot access sdk.txt because it is being used by another process #45809

Open

revert changes under src/SourceBuild

dff9bad

akoeplinger mentioned this pull request Apr 16, 2025

Don't pass -os twice for windows in DotNetBuild.props dotnet/runtime#114732

Merged

Add runtime patch

0c3615c

adamsitnik and others added 2 commits April 16, 2025 13:39

Revert "Update dependencies from https://github.com/dotnet/arcade bui…

fd9cdde

…ld 20250414.8" This reverts commit c2a6e14.

Merge branch 'main' into sclUpdate

a3891d8

ViktorHofer approved these changes Apr 16, 2025

View reviewed changes

This was referenced Apr 16, 2025

dotnet-watch tests failing #40006

Open

[dotnet watch] Cannot open project Lib.fsproj because extension fsproj is not associated with a language #46378

Open

ViktorHofer merged commit 6bca3a3 into main Apr 16, 2025
36 of 39 checks passed

ViktorHofer deleted the sclUpdate branch April 16, 2025 14:54

ViktorHofer mentioned this pull request Apr 16, 2025

Re-Bootstrap Source Build to .NET 10.0.100-preview.4.25216.1 #48523

Merged

artl93 mentioned this pull request Apr 17, 2025

[main] Update dependencies from dotnet/runtime #48528

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

System.CommandLine update #48477

System.CommandLine update #48477

adamsitnik commented Apr 15, 2025 •

edited by ViktorHofer

Loading

dotnet-issue-labeler bot commented Apr 15, 2025

dotnet-issue-labeler bot commented Apr 15, 2025

Copilot AI left a comment

adamsitnik Apr 15, 2025

MiYanni Apr 15, 2025

adamsitnik Apr 15, 2025

nkolev92 commented Apr 15, 2025

MiYanni Apr 15, 2025

ViktorHofer commented Apr 16, 2025 •

edited

Loading

premun commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025 •

edited

Loading

premun commented Apr 16, 2025

premun commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

adamsitnik commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

adamsitnik commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

System.CommandLine update #48477

System.CommandLine update #48477

Conversation

adamsitnik commented Apr 15, 2025 • edited by ViktorHofer Loading

dotnet-issue-labeler bot commented Apr 15, 2025

dotnet-issue-labeler bot commented Apr 15, 2025

Copilot AI left a comment

Choose a reason for hiding this comment

adamsitnik Apr 15, 2025

Choose a reason for hiding this comment

MiYanni Apr 15, 2025

Choose a reason for hiding this comment

adamsitnik Apr 15, 2025

Choose a reason for hiding this comment

nkolev92 commented Apr 15, 2025

MiYanni Apr 15, 2025

Choose a reason for hiding this comment

ViktorHofer commented Apr 16, 2025 • edited Loading

premun commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025 • edited Loading

premun commented Apr 16, 2025

premun commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

adamsitnik commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

adamsitnik commented Apr 16, 2025

ViktorHofer commented Apr 16, 2025

adamsitnik commented Apr 15, 2025 •

edited by ViktorHofer

Loading

ViktorHofer commented Apr 16, 2025 •

edited

Loading

ViktorHofer commented Apr 16, 2025 •

edited

Loading