Skip to content
Merged
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
10 changes: 9 additions & 1 deletion src/Aspire.Cli/Commands/PublishCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
return ExitCodeConstants.FailedToDotnetRunAppHost;
}

var buildExitCode = await AppHostHelper.BuildAppHostAsync(_runner, effectiveAppHostProjectFile, cancellationToken);

if (buildExitCode != 0)
{
AnsiConsole.MarkupLine($"[red bold]:thumbs_down: The project could not be built. For more information run with --debug switch.[/]");
return ExitCodeConstants.FailedToBuildArtifacts;
}

var publisher = parseResult.GetValue<string>("--publisher");
var outputPath = parseResult.GetValue<string>("--output-path");
var fullyQualifiedOutputPath = Path.GetFullPath(outputPath ?? ".");
Expand All @@ -81,7 +89,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
var pendingInspectRun = _runner.RunAsync(
effectiveAppHostProjectFile,
false,
false,
true,
["--operation", "inspect"],
null,
backchannelCompletionSource,
Expand Down
13 changes: 7 additions & 6 deletions src/Aspire.Cli/Commands/RunCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell

var watch = parseResult.GetValue<bool>("--watch");

await AnsiConsole.Status()
.Spinner(Spinner.Known.Dots3)
.SpinnerStyle(Style.Parse("purple"))
.StartAsync(":hammer_and_wrench: Building app host...", async context => {
await _runner.BuildAsync(effectiveAppHostProjectFile, cancellationToken).ConfigureAwait(false);
});
var buildExitCode = await AppHostHelper.BuildAppHostAsync(_runner, effectiveAppHostProjectFile, cancellationToken);

if (buildExitCode != 0)
{
AnsiConsole.MarkupLine($"[red bold]:thumbs_down: The project could not be built. For more information run with --debug switch.[/]");
return ExitCodeConstants.FailedToBuildArtifacts;
}

var backchannelCompletitionSource = new TaskCompletionSource<AppHostBackchannel>();

Expand Down
43 changes: 43 additions & 0 deletions src/Aspire.Cli/DotNetCliRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,49 @@ internal sealed class DotNetCliRunner(ILogger<DotNetCliRunner> logger, IServiceP
}
}

public async Task<(int ExitCode, JsonDocument? Output)> GetProjectItemsAndPropertiesAsync(FileInfo projectFile, string[] items, string[] properties, CancellationToken cancellationToken)
{
using var activity = _activitySource.StartActivity();

string[] cliArgs = [
"msbuild",
$"-getProperty:{string.Join(",", properties)}",
$"-getItem:{string.Join(",", items)}",
projectFile.FullName
];

string? stdout = null;
string? stderr = null;

var exitCode = await ExecuteAsync(
cliArgs,
null,
projectFile.Directory!,
null,
(_, output, error) => {
stdout = output.ReadToEnd();
stderr = error.ReadToEnd();
},
cancellationToken);

if (exitCode != 0)
{
logger.LogError(
"Failed to get items and properties from project. Exit code was: {ExitCode}. See debug logs for more details. Stderr: {Stderr}, Stdout: {Stdout}",
exitCode,
stderr,
stdout
);

return (exitCode, null);
}
else
{
var json = JsonDocument.Parse(stdout!);
return (exitCode, json);
}
}

public async Task<int> RunAsync(FileInfo projectFile, bool watch, bool noBuild, string[] args, IDictionary<string, string>? env, TaskCompletionSource<AppHostBackchannel>? backchannelCompletionSource, CancellationToken cancellationToken)
{
using var activity = _activitySource.StartActivity();
Expand Down
10 changes: 10 additions & 0 deletions src/Aspire.Cli/Utils/AppHostHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,14 @@ internal static class AppHostHelper

return appHostInformationResult;
}

internal static async Task<int> BuildAppHostAsync(DotNetCliRunner runner, FileInfo projectFile, CancellationToken cancellationToken)
{
return await AnsiConsole.Status()
.Spinner(Spinner.Known.Dots3)
.SpinnerStyle(Style.Parse("purple"))
.StartAsync(":hammer_and_wrench: Building app host...", async context => {
return await runner.BuildAsync(projectFile, cancellationToken).ConfigureAwait(false);
});
}
}
Loading