From 604f5e6b45f464d62b9224db060d4103d650d0b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:51:04 +0000 Subject: [PATCH 1/3] [release/10.0] Source code updates from dotnet/dotnet (#2668) * Backflow from https://github.com/dotnet/dotnet / d409235 build 279762 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 279762 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 279809 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 280198 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 281059 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 281128 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282024 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282086 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282207 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282240 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282379 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282477 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282708 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 282973 No dependency updates to commit * Backflow from https://github.com/dotnet/dotnet / ee760c4 build 283077 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 283077 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283152 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283422 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283666 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283828 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284571 No dependency updates to commit * Backflow from https://github.com/dotnet/dotnet / c9f0e3e build 284752 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284752 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284895 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer --- eng/Version.Details.props | 1 - eng/Version.Details.xml | 2 +- eng/Versions.props | 4 ++-- ...alTests.System_CommandLine_api_is_not_changed.approved.txt | 1 - src/System.CommandLine.Tests/TestActions.cs | 4 ++++ src/System.CommandLine/EnvironmentVariablesDirective.cs | 3 ++- src/System.CommandLine/Invocation/CommandLineAction.cs | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c4f0b4f1a0..c4909dbff2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - 2.0.0 - rc - 1 + rtm + diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt index f19908599f..6f542d6fe6 100644 --- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt +++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt @@ -193,7 +193,6 @@ System.CommandLine.Invocation public abstract class CommandLineAction public System.Boolean ClearsParseErrors { get; } public System.Boolean Terminating { get; } - protected System.Void set_Terminating(System.Boolean value) public class ParseErrorAction : SynchronousCommandLineAction .ctor() public System.Boolean ShowHelp { get; set; } diff --git a/src/System.CommandLine.Tests/TestActions.cs b/src/System.CommandLine.Tests/TestActions.cs index eb948b3cce..ab44b12926 100644 --- a/src/System.CommandLine.Tests/TestActions.cs +++ b/src/System.CommandLine.Tests/TestActions.cs @@ -23,6 +23,8 @@ public SynchronousTestAction( public override bool ClearsParseErrors { get; } + public override bool Terminating { get; } + public override int Invoke(ParseResult parseResult) { _invoke(parseResult); @@ -46,6 +48,8 @@ public AsynchronousTestAction( public override bool ClearsParseErrors { get; } + public override bool Terminating { get; } + public override Task InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { _invoke(parseResult); diff --git a/src/System.CommandLine/EnvironmentVariablesDirective.cs b/src/System.CommandLine/EnvironmentVariablesDirective.cs index ce6047614f..0d64619f76 100644 --- a/src/System.CommandLine/EnvironmentVariablesDirective.cs +++ b/src/System.CommandLine/EnvironmentVariablesDirective.cs @@ -32,9 +32,10 @@ private sealed class EnvironmentVariablesDirectiveAction : SynchronousCommandLin internal EnvironmentVariablesDirectiveAction(EnvironmentVariablesDirective directive) { _directive = directive; - Terminating = false; } + public override bool Terminating => false; + public override int Invoke(ParseResult parseResult) { SetEnvVars(parseResult); diff --git a/src/System.CommandLine/Invocation/CommandLineAction.cs b/src/System.CommandLine/Invocation/CommandLineAction.cs index 0a9cbe5ad9..5e873f08cb 100644 --- a/src/System.CommandLine/Invocation/CommandLineAction.cs +++ b/src/System.CommandLine/Invocation/CommandLineAction.cs @@ -15,7 +15,7 @@ private protected CommandLineAction() /// /// Indicates that the action terminates a command line invocation, and later actions are skipped. /// - public bool Terminating { get; protected init; } = true; + public virtual bool Terminating => true; /// /// Indicates that the action clears any parse errors associated with symbols other than one that owns the . From 5b5ad834a1a2994d688a1a7edf1669a17b1b3469 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 16:42:43 +0000 Subject: [PATCH 2/3] Do not sign dotnet-suggest when not building from the VMR (#2694) Co-authored-by: Matt Mitchell --- eng/Signing.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Signing.props b/eng/Signing.props index f6fb6b798a..234aee04b8 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,7 +1,8 @@ - + + From 897865953ca70c0c20520e5486e626adf7c8d35f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 30 Sep 2025 15:20:38 +0200 Subject: [PATCH 3/3] Update Versions.props --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8007672b39..ccb2158f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,10 +1,10 @@ - + - 2.0.0 - rtm - + 3.0.0 + alpha + 1