Skip to content

Commit 054ba91

Browse files
committed
Fix remaining Spectre markup escaping: link targets, CLI version, and double-escaped resource labels
1 parent a3131be commit 054ba91

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/Aspire.Cli/Commands/LogsCommand.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ private void OutputLogLine(ResourceLogLine logLine, OutputFormat format)
334334
// Colorized output: assign a consistent color to each resource
335335
var color = GetResourceColor(logLine.ResourceName);
336336
var escapedContent = logLine.Content.EscapeMarkup();
337-
AnsiConsole.MarkupLine($"[{color}][[{logLine.ResourceName.EscapeMarkup()}]][/] {escapedContent}");
337+
var escapedLabel = $"[{logLine.ResourceName}]".EscapeMarkup();
338+
AnsiConsole.MarkupLine($"[{color}]{escapedLabel}[/] {escapedContent}");
338339
}
339340
else
340341
{

src/Aspire.Cli/Commands/RunCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
310310

311311
endpointsGrid.AddRow(
312312
firstEndpoint ? new Align(new Markup($"[bold green]{endpointsLocalizedString}[/]:"), HorizontalAlignment.Right) : Text.Empty,
313-
new Markup($"[bold]{resource.EscapeMarkup()}[/] [grey]has endpoint[/] [link={endpoint}]{endpoint.EscapeMarkup()}[/]")
313+
new Markup($"[bold]{resource.EscapeMarkup()}[/] [grey]has endpoint[/] [link={endpoint.EscapeMarkup()}]{endpoint.EscapeMarkup()}[/]")
314314
);
315315

316316
var endpointsPadder = new Padder(endpointsGrid, new Padding(3, 0));

src/Aspire.Cli/Interaction/ConsoleInteractionService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public int DisplayIncompatibleVersionError(AppHostIncompatibleException ex, stri
190190
Console.WriteLine();
191191
_outConsole.MarkupLine(
192192
$"\t[bold]{InteractionServiceStrings.AspireHostingSDKVersion}[/]: {appHostHostingVersion.EscapeMarkup()}");
193-
_outConsole.MarkupLine($"\t[bold]{InteractionServiceStrings.AspireCLIVersion}[/]: {cliInformationalVersion}");
193+
_outConsole.MarkupLine($"\t[bold]{InteractionServiceStrings.AspireCLIVersion}[/]: {cliInformationalVersion.EscapeMarkup()}");
194194
_outConsole.MarkupLine($"\t[bold]{InteractionServiceStrings.RequiredCapability}[/]: {ex.RequiredCapability.EscapeMarkup()}");
195195
Console.WriteLine();
196196
return ExitCodeConstants.AppHostIncompatible;

0 commit comments

Comments
 (0)