Skip to content

Revert "Merge pull request #1920 from dotnet/darc-main-c4635c16-72c5-… #1983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjonescz merged 1 commit into from
Oct 21, 2023
Merged

Revert "Merge pull request #1920 from dotnet/darc-main-c4635c16-72c5-… #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>60b77a63df30362ed1c66a834fcb8f8956ea113b</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.440701">
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.430701">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23407.1">
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
</Dependency>
<Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.23407.1">
<Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.23307.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- command-line-api -->
<SystemCommandLineVersion>2.0.0-beta4.23407.1</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.23407.1</SystemCommandLineRenderingVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.23307.1</SystemCommandLineRenderingVersion>
<!-- corefx -->
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
<!-- msbuild -->
Expand Down
5 changes: 3 additions & 2 deletions src/Commands/FormatAnalyzersCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using System.Collections.Immutable;
using System.CommandLine;
using System.CommandLine.Invocation;
using System.CommandLine.IO;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -28,8 +27,10 @@ internal static CliCommand GetCommand()
return command;
}

private class FormatAnalyzersHandler : AsynchronousCliAction
private class FormatAnalyzersHandler : CliAction
{
public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult, CancellationToken.None).GetAwaiter().GetResult();

public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
{
var formatOptions = parseResult.ParseVerbosityOption(FormatOptions.Instance);
Expand Down
5 changes: 3 additions & 2 deletions src/Commands/FormatStyleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using System.Collections.Immutable;
using System.CommandLine;
using System.CommandLine.Invocation;
using System.CommandLine.IO;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -28,8 +27,10 @@ internal static CliCommand GetCommand()
return command;
}

private class FormatStyleHandler : AsynchronousCliAction
private class FormatStyleHandler : CliAction
{
public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult, CancellationToken.None).GetAwaiter().GetResult();

public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
{
var formatOptions = parseResult.ParseVerbosityOption(FormatOptions.Instance);
Expand Down
5 changes: 3 additions & 2 deletions src/Commands/FormatWhitespaceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information.

using System.CommandLine;
using System.CommandLine.Invocation;
using System.CommandLine.IO;
using System.CommandLine.Parsing;
using System.Threading;
Expand Down Expand Up @@ -63,8 +62,10 @@ internal static void EnsureFolderNotSpecifiedWhenLoggingBinlog(CommandResult sym
}
}

private class FormatWhitespaceHandler : AsynchronousCliAction
private class FormatWhitespaceHandler : CliAction
{
public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult, CancellationToken.None).GetAwaiter().GetResult();

public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
{
var formatOptions = parseResult.ParseVerbosityOption(FormatOptions.Instance);
Expand Down
5 changes: 3 additions & 2 deletions src/Commands/RootFormatCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using System.Collections.Immutable;
using System.CommandLine;
using System.CommandLine.Invocation;
using System.CommandLine.IO;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -31,8 +30,10 @@ public static CliRootCommand GetCommand()
return formatCommand;
}

private class FormatCommandDefaultHandler : AsynchronousCliAction
private class FormatCommandDefaultHandler : CliAction
{
public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult, CancellationToken.None).GetAwaiter().GetResult();

public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken)
{
var formatOptions = parseResult.ParseVerbosityOption(FormatOptions.Instance);
Expand Down