Skip to content

Commit 09f5b04

Browse files
[main] Source code updates from dotnet/dotnet (#2682)
* Backflow from https://github.com/dotnet/dotnet / 4a5547e build 283019 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 283019 No dependency updates to commit * Backflow from https://github.com/dotnet/dotnet / 99827af build 283082 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 283082 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283253 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283489 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283636 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 283775 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284039 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284210 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284343 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284548 No dependency updates to commit * Update dependencies from https://github.com/dotnet/dotnet build 284884 No dependency updates to commit --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 864756d commit 09f5b04

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

eng/Version.Details.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!--
32
This file is auto-generated by the Maestro dependency flow system.
43
Do not edit it manually, as it will get overwritten by automation.

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="5c3434d8b831745673c31e186906f463e1036301" BarId="279843" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d" BarId="284884" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>

es-metadata.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schemaVersion: 0.0.1
2+
isProduction: true
3+
accountableOwners:
4+
service: 7a9b52f6-7805-416c-9390-343168c0cdb3
5+
routing:
6+
defaultAreaPath:
7+
org: devdiv
8+
path: DevDiv\NET Libraries

src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ System.CommandLine.Invocation
193193
public abstract class CommandLineAction
194194
public System.Boolean ClearsParseErrors { get; }
195195
public System.Boolean Terminating { get; }
196-
protected System.Void set_Terminating(System.Boolean value)
197196
public class ParseErrorAction : SynchronousCommandLineAction
198197
.ctor()
199198
public System.Boolean ShowHelp { get; set; }

src/System.CommandLine.Tests/TestActions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public SynchronousTestAction(
2323

2424
public override bool ClearsParseErrors { get; }
2525

26+
public override bool Terminating { get; }
27+
2628
public override int Invoke(ParseResult parseResult)
2729
{
2830
_invoke(parseResult);
@@ -46,6 +48,8 @@ public AsynchronousTestAction(
4648

4749
public override bool ClearsParseErrors { get; }
4850

51+
public override bool Terminating { get; }
52+
4953
public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
5054
{
5155
_invoke(parseResult);

src/System.CommandLine/EnvironmentVariablesDirective.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ private sealed class EnvironmentVariablesDirectiveAction : SynchronousCommandLin
3232
internal EnvironmentVariablesDirectiveAction(EnvironmentVariablesDirective directive)
3333
{
3434
_directive = directive;
35-
Terminating = false;
3635
}
3736

37+
public override bool Terminating => false;
38+
3839
public override int Invoke(ParseResult parseResult)
3940
{
4041
SetEnvVars(parseResult);

src/System.CommandLine/Invocation/CommandLineAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ private protected CommandLineAction()
1515
/// <summary>
1616
/// Indicates that the action terminates a command line invocation, and later actions are skipped.
1717
/// </summary>
18-
public bool Terminating { get; protected init; } = true;
18+
public virtual bool Terminating => true;
1919

2020
/// <summary>
2121
/// Indicates that the action clears any parse errors associated with symbols other than one that owns the <see cref="CommandLineAction"/>.

0 commit comments

Comments
 (0)