Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/src/Binding/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ static async Task<int> Main(
"Enumerables" => await HandlerBindingSample.Enumerables(),
"DependencyInjection" => await HandlerBindingSample.DependencyInjection(),
_
=> throw new ArgumentException(
$"There's no case in Program.Main for {nameof(region)} '{region}'"
)
=> throw new ArgumentException(
$"There's no case in Program.Main for {nameof(region)} '{region}'"
)
};
}
}
Expand Down
10 changes: 4 additions & 6 deletions samples/HostingPlayground/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ await BuildCommandLine()
_ => Host.CreateDefaultBuilder(),
host =>
{
host.ConfigureServices(
services =>
{
services.AddSingleton<IGreeter, Greeter>();
}
);
host.ConfigureServices(services =>
{
services.AddSingleton<IGreeter, Greeter>();
});
}
)
.UseDefaults()
Expand Down
4 changes: 2 additions & 2 deletions src/System.CommandLine.DragonFruit/CommandLine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ internal static string BuildAlias(string parameterName)
}

return parameterName.Length > 1
? $"--{parameterName.ToKebabCase()}"
: $"-{parameterName.ToLowerInvariant()}";
? $"--{parameterName.ToKebabCase()}"
: $"-{parameterName.ToLowerInvariant()}";
}

public static IEnumerable<Option> BuildOptions(this MethodInfo method)
Expand Down
4 changes: 2 additions & 2 deletions src/System.CommandLine.DragonFruit/EntryPointDiscoverer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ var type in assembly.DefinedTypes
string MainMethodFullName()
{
return string.IsNullOrWhiteSpace(entryPointFullTypeName)
? "Main"
: $"{entryPointFullTypeName}.Main";
? "Main"
: $"{entryPointFullTypeName}.Main";
}

if (candidates.Count > 1)
Expand Down
76 changes: 31 additions & 45 deletions src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ public static async Task Constructor_Injection_Injects_Service()
(builder) =>
{
builder
.ConfigureServices(
services =>
{
services.AddTransient(x => service);
}
)
.ConfigureServices(services =>
{
services.AddTransient(x => service);
})
.UseCommandHandler<MyCommand, MyCommand.MyHandler>();
}
)
Expand All @@ -47,18 +45,14 @@ public static async Task Constructor_Injection_Injects_Service()
public static async Task Parameter_is_available_in_property()
{
var parser = new CommandLineBuilder(new MyCommand())
.UseHost(
host =>
{
host.ConfigureServices(
services =>
{
services.AddTransient<MyService>();
}
)
.UseCommandHandler<MyCommand, MyCommand.MyHandler>();
}
)
.UseHost(host =>
{
host.ConfigureServices(services =>
{
services.AddTransient<MyService>();
})
.UseCommandHandler<MyCommand, MyCommand.MyHandler>();
})
.Build();

var result = await parser.InvokeAsync(new string[] { "--int-option", "54" });
Expand All @@ -74,21 +68,17 @@ public static async Task Can_have_diferent_handlers_based_on_command()
root.AddCommand(new MyCommand());
root.AddCommand(new MyOtherCommand());
var parser = new CommandLineBuilder(root)
.UseHost(
host =>
{
host.ConfigureServices(
services =>
{
services.AddTransient<MyService>(
_ => new MyService() { Action = () => 100 }
);
}
)
.UseCommandHandler<MyCommand, MyCommand.MyHandler>()
.UseCommandHandler<MyOtherCommand, MyOtherCommand.MyHandler>();
}
)
.UseHost(host =>
{
host.ConfigureServices(services =>
{
services.AddTransient<MyService>(
_ => new MyService() { Action = () => 100 }
);
})
.UseCommandHandler<MyCommand, MyCommand.MyHandler>()
.UseCommandHandler<MyOtherCommand, MyOtherCommand.MyHandler>();
})
.Build();

var result = await parser.InvokeAsync(
Expand All @@ -111,18 +101,14 @@ public static async Task Can_bind_to_arguments_via_injection()
var cmd = new RootCommand();
cmd.AddCommand(new MyOtherCommand());
var parser = new CommandLineBuilder(cmd)
.UseHost(
host =>
{
host.ConfigureServices(
services =>
{
services.AddSingleton<MyService>(service);
}
)
.UseCommandHandler<MyOtherCommand, MyOtherCommand.MyHandler>();
}
)
.UseHost(host =>
{
host.ConfigureServices(services =>
{
services.AddSingleton<MyService>(service);
})
.UseCommandHandler<MyOtherCommand, MyOtherCommand.MyHandler>();
})
.Build();

var result = await parser.InvokeAsync(new string[] { "myothercommand", "TEST" });
Expand Down
Loading