[release/10.0] Source code updates from dotnet/dotnet (#2668)

dotnet-maestro[bot] · ViktorHofer · web-flow · commit 604f5e6b45f4 · 2025-09-29T15:51:04.000Z
* 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] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is auto-generated by the Maestro dependency flow system.
 Do not edit it manually, as it will get overwritten by automation.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="f8a57b66e6466922534e8046b37a6503d9d39dab" BarId="279432" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="e1eaf1bbd9702e9b6ee9b10dbc94105732e07896" BarId="284895" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -3,8 +3,8 @@
   <!-- Repo Version Information -->
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration></PreReleaseVersionIteration>
     <!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
     <DotNetFinalVersionKind>
     </DotNetFinalVersionKind>
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
@@ -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
@@ -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<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
     {
         _invoke(parseResult);
diff --git 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
@@ -15,7 +15,7 @@ private protected CommandLineAction()
     /// <summary>
     /// Indicates that the action terminates a command line invocation, and later actions are skipped.
     /// </summary>
-    public bool Terminating { get; protected init; } = true;
+    public virtual bool Terminating => true;
 
     /// <summary>
     /// Indicates that the action clears any parse errors associated with symbols other than one that owns the <see cref="CommandLineAction"/>.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<?xml version="1.0" encoding="utf-8"?>`
`2`	`1`	`<!--`
`3`	`2`	`This file is auto-generated by the Maestro dependency flow system.`
`4`	`3`	`Do not edit it manually, as it will get overwritten by automation.`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ public SynchronousTestAction(`
`23`	`23`
`24`	`24`	`public override bool ClearsParseErrors { get; }`
`25`	`25`
	`26`	`+ public override bool Terminating { get; }`
	`27`	`+`
`26`	`28`	`public override int Invoke(ParseResult parseResult)`
`27`	`29`	`{`
`28`	`30`	`_invoke(parseResult);`
`@@ -46,6 +48,8 @@ public AsynchronousTestAction(`
`46`	`48`
`47`	`49`	`public override bool ClearsParseErrors { get; }`
`48`	`50`
	`51`	`+ public override bool Terminating { get; }`
	`52`	`+`
`49`	`53`	`public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)`
`50`	`54`	`{`
`51`	`55`	`_invoke(parseResult);`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ private sealed class EnvironmentVariablesDirectiveAction : SynchronousCommandLin`
`32`	`32`	`internal EnvironmentVariablesDirectiveAction(EnvironmentVariablesDirective directive)`
`33`	`33`	`{`
`34`	`34`	`_directive = directive;`
`35`		`- Terminating = false;`
`36`	`35`	`}`
`37`	`36`
	`37`	`+ public override bool Terminating => false;`
	`38`	`+`
`38`	`39`	`public override int Invoke(ParseResult parseResult)`
`39`	`40`	`{`
`40`	`41`	`SetEnvVars(parseResult);`