escapemarkup on every MarkupLine call

Sire · Sire · commit 94562bc9442d · 2025-10-07T09:21:01.000+02:00
diff --git a/Commands/PingCommand.cs b/Commands/PingCommand.cs
@@ -29,8 +29,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, ConsoleSett
             var connString = GetConnectionString(settings);
 
             //Logger.LogInformation("");
-            AnsiConsole.MarkupLine($"ConnectionString: [teal]{connString}[/]");
-            AnsiConsole.MarkupLine($"SQL Query       : [teal]{settings.SQLCommand}[/]");
+            AnsiConsole.MarkupLine($"ConnectionString: [teal]{connString.EscapeMarkup()}[/]");
+            AnsiConsole.MarkupLine($"SQL Query       : [teal]{settings.SQLCommand.EscapeMarkup()}[/]");
 
             bool running = true;
 
@@ -45,7 +45,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, ConsoleSett
                     .Start("Please wait...", ctx =>
                     {
                         // Simulate some work
-                        ctx.Status($"Trying to connect to server [teal]{settings.Server}[/]...");
+                        ctx.Status($"Trying to connect to server [teal]{settings.Server.EscapeMarkup()}[/]...");
                         CallDatabase(connString, settings);
 
                         // Update the status and spinner
@@ -100,7 +100,7 @@ private static string GetConnectionString(ConsoleSettings settings) {
 
         private void CallDatabase(string connString, ConsoleSettings settings)
         {
-            AnsiConsole.MarkupLine($"[teal]{DateTime.Now.ToLocalTime()}[/] Connecting to {settings.Server}... ");
+            AnsiConsole.MarkupLine($"[teal]{DateTime.Now.ToLocalTime()}[/] Connecting to {settings.Server.EscapeMarkup()}... ");
 
             try
             {
@@ -122,7 +122,7 @@ private void CallDatabase(string connString, ConsoleSettings settings)
                             }
                         }
                     }
-                    AnsiConsole.MarkupLine($"  [green]SUCCESS[/] {sb}");
+                    AnsiConsole.MarkupLine($"  [green]SUCCESS[/] {sb.ToString().EscapeMarkup()}");
                 }
             }
             catch (SqlException ex)

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, ConsoleSett`
`29`	`29`	`var connString = GetConnectionString(settings);`
`30`	`30`
`31`	`31`	`//Logger.LogInformation("");`
`32`		`- AnsiConsole.MarkupLine($"ConnectionString: [teal]{connString}[/]");`
`33`		`- AnsiConsole.MarkupLine($"SQL Query : [teal]{settings.SQLCommand}[/]");`
	`32`	`+ AnsiConsole.MarkupLine($"ConnectionString: [teal]{connString.EscapeMarkup()}[/]");`
	`33`	`+ AnsiConsole.MarkupLine($"SQL Query : [teal]{settings.SQLCommand.EscapeMarkup()}[/]");`
`34`	`34`
`35`	`35`	`bool running = true;`
`36`	`36`
`@@ -45,7 +45,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, ConsoleSett`
`45`	`45`	`.Start("Please wait...", ctx =>`
`46`	`46`	`{`
`47`	`47`	`// Simulate some work`
`48`		`- ctx.Status($"Trying to connect to server [teal]{settings.Server}[/]...");`
	`48`	`+ ctx.Status($"Trying to connect to server [teal]{settings.Server.EscapeMarkup()}[/]...");`
`49`	`49`	`CallDatabase(connString, settings);`
`50`	`50`
`51`	`51`	`// Update the status and spinner`
`@@ -100,7 +100,7 @@ private static string GetConnectionString(ConsoleSettings settings) {`
`100`	`100`
`101`	`101`	`private void CallDatabase(string connString, ConsoleSettings settings)`
`102`	`102`	`{`
`103`		`- AnsiConsole.MarkupLine($"[teal]{DateTime.Now.ToLocalTime()}[/] Connecting to {settings.Server}... ");`
	`103`	`+ AnsiConsole.MarkupLine($"[teal]{DateTime.Now.ToLocalTime()}[/] Connecting to {settings.Server.EscapeMarkup()}... ");`
`104`	`104`
`105`	`105`	`try`
`106`	`106`	`{`
`@@ -122,7 +122,7 @@ private void CallDatabase(string connString, ConsoleSettings settings)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- AnsiConsole.MarkupLine($" [green]SUCCESS[/] {sb}");`
	`125`	`+ AnsiConsole.MarkupLine($" [green]SUCCESS[/] {sb.ToString().EscapeMarkup()}");`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`catch (SqlException ex)`