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
2 changes: 2 additions & 0 deletions src/Aspire.Cli/Aspire.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<Compile Include="$(SharedDir)BundleDiscovery.cs" Link="Layout\BundleDiscovery.cs" />
<Compile Include="$(SharedDir)EnumerableExtensions.cs" Link="Utils\EnumerableExtensions.cs" />
<Compile Include="$(SharedDir)KnownConfigNames.cs" Link="Utils\KnownConfigNames.cs" />
<Compile Include="$(SharedDir)DashboardExitCodes.cs" Link="Utils\DashboardExitCodes.cs" />
<Compile Include="$(SharedDir)KnownOtelConfigNames.cs" Link="Utils\KnownOtelConfigNames.cs" />
<Compile Include="$(SharedDir)KnownFormats.cs" Link="Utils\KnownFormats.cs" />
<Compile Include="$(SharedDir)PathNormalizer.cs" Link="Utils\PathNormalizer.cs" />
Expand All @@ -97,6 +98,7 @@
<Compile Include="$(SharedDir)Model\KnownProperties.cs" Link="Model\KnownProperties.cs" />
<Compile Include="$(SharedDir)Model\KnownResourceTypes.cs" Link="Model\KnownResourceTypes.cs" />
<Compile Include="$(SharedDir)Model\ResourceSourceViewModel.cs" Link="Model\ResourceSourceViewModel.cs" />
<Compile Include="$(SharedDir)TokenGenerator.cs" Link="Utils\TokenGenerator.cs" />
<Compile Include="$(SharedDir)DashboardUrls.cs" Link="Utils\DashboardUrls.cs" />
<Compile Include="$(SharedDir)FormatHelpers.cs" Link="Utils\FormatHelpers.cs" />
<Compile Include="$(SharedDir)DateFormatStringsHelpers.cs" Link="Utils\DateFormatStringsHelpers.cs" />
Expand Down
438 changes: 438 additions & 0 deletions src/Aspire.Cli/Commands/DashboardCommand.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Aspire.Cli/Commands/ExecCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
return ExitCodeConstants.FailedToDotnetRunAppHost;
}

var runOptions = new DotNetCliRunnerInvocationOptions
var runOptions = new ProcessInvocationOptions
{
StandardOutputCallback = runOutputCollector.AppendOutput,
StandardErrorCallback = runOutputCollector.AppendError,
Expand Down
16 changes: 8 additions & 8 deletions src/Aspire.Cli/Commands/InitCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private async Task<int> InitializeExistingSolutionAsync(InitContext initContext,
initContext.GetSolutionProjectsOutputCollector = new OutputCollector();
var (getSolutionExitCode, solutionProjects) = await InteractionService.ShowStatusAsync("Reading solution...", async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.GetSolutionProjectsOutputCollector.AppendOutput,
StandardErrorCallback = initContext.GetSolutionProjectsOutputCollector.AppendError
Expand Down Expand Up @@ -356,7 +356,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
"Getting templates...",
async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.InstallTemplateOutputCollector.AppendOutput,
StandardErrorCallback = initContext.InstallTemplateOutputCollector.AppendError
Expand Down Expand Up @@ -384,7 +384,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
"Creating Aspire projects from template...",
async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.NewProjectOutputCollector.AppendOutput,
StandardErrorCallback = initContext.NewProjectOutputCollector.AppendError
Expand Down Expand Up @@ -439,7 +439,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
InitCommandStrings.AddingAppHostProjectToSolution,
async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.AddAppHostToSolutionOutputCollector.AppendOutput,
StandardErrorCallback = initContext.AddAppHostToSolutionOutputCollector.AppendError
Expand All @@ -465,7 +465,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
InitCommandStrings.AddingServiceDefaultsProjectToSolution,
async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.AddServiceDefaultsToSolutionOutputCollector.AppendOutput,
StandardErrorCallback = initContext.AddServiceDefaultsToSolutionOutputCollector.AppendError
Expand Down Expand Up @@ -497,7 +497,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
var addRefResult = await InteractionService.ShowStatusAsync(
$"Adding {project.ProjectFile.Name} to AppHost...", async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = outputCollector.AppendOutput,
StandardErrorCallback = outputCollector.AppendError
Expand Down Expand Up @@ -531,7 +531,7 @@ await nugetConfigPrompter.PromptToCreateOrUpdateAsync(
var addRefResult = await InteractionService.ShowStatusAsync(
$"Adding ServiceDefaults reference to {project.ProjectFile.Name}...", async () =>
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = outputCollector.AppendOutput,
StandardErrorCallback = outputCollector.AppendError
Expand Down Expand Up @@ -638,7 +638,7 @@ private async Task EvaluateSolutionProjectsAsync(InitContext initContext, Cancel

foreach (var project in initContext.SolutionProjects)
{
var options = new DotNetCliRunnerInvocationOptions
var options = new ProcessInvocationOptions
{
StandardOutputCallback = initContext.EvaluateSolutionProjectsOutputCollector.AppendOutput,
StandardErrorCallback = initContext.EvaluateSolutionProjectsOutputCollector.AppendError
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Cli/Commands/RestoreCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell

var restoreExitCode = await _interactionService.ShowStatusAsync(
RestoreCommandStrings.RestoringSdkCode,
async () => await _runner.RestoreAsync(effectiveAppHostFile, new DotNetCliRunnerInvocationOptions(), cancellationToken),
async () => await _runner.RestoreAsync(effectiveAppHostFile, new ProcessInvocationOptions(), cancellationToken),
emoji: KnownEmojis.Gear);

if (restoreExitCode == 0)
Expand Down
2 changes: 2 additions & 0 deletions src/Aspire.Cli/Commands/RootCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public RootCommand(
AgentCommand agentCommand,
TelemetryCommand telemetryCommand,
ExportCommand exportCommand,
DashboardCommand dashboardCommand,
DocsCommand docsCommand,
SecretCommand secretCommand,
SdkCommand sdkCommand,
Expand Down Expand Up @@ -222,6 +223,7 @@ public RootCommand(
Subcommands.Add(telemetryCommand);
Subcommands.Add(exportCommand);
Subcommands.Add(docsCommand);
Subcommands.Add(dashboardCommand);
Subcommands.Add(secretCommand);

#if DEBUG
Expand Down
130 changes: 0 additions & 130 deletions src/Aspire.Cli/DotNet/DotNetCliExecutionFactory.cs

This file was deleted.

Loading
Loading