Catch formatting exceptions in LoggerHelper

xunit · Jul 17, 2024 · 59b2a63 · 59b2a63
1 parent 9942a1e
commit 59b2a63
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/xunit.runner.visualstudio/Utility/LoggerHelper.cs b/src/xunit.runner.visualstudio/Utility/LoggerHelper.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
@@ -61,7 +62,14 @@ void SendMessage(
 		if (logger is null)
 			return;
 
-		var assemblyText = assemblyName is null ? "" : $"{Path.GetFileNameWithoutExtension(assemblyName)}: ";
-		logger.SendMessage(level, $"[xUnit.net {Stopwatch.Elapsed:hh\\:mm\\:ss\\.ff}] {assemblyText}{string.Format(CultureInfo.CurrentCulture, format, args)}");
+		try
+		{
+			var assemblyText = assemblyName is null ? "" : $"{Path.GetFileNameWithoutExtension(assemblyName)}: ";
+			logger.SendMessage(level, $"[xUnit.net {Stopwatch.Elapsed:hh\\:mm\\:ss\\.ff}] {assemblyText}{string.Format(CultureInfo.CurrentCulture, format, args)}");
+		}
+		catch (Exception ex)
+		{
+			logger.SendMessage(TestMessageLevel.Warning, $"Exception formatting {level} message '{format}': {ex}");
+		}
 	}
 }