[release/9.0.1xx] [XC] Fix passing message arguments to BuildExceptio…

…n when logging warning as error (#25326) * Fix passing message args to BuildException in XamlCTask * Avoid using string.Format with null args --------- Co-authored-by: Simon Rozsival <[email protected]>
dotnet · Oct 18, 2024 · ee8740a · ee8740a
1 parent f5ca66a
commit ee8740a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Controls/src/Build.Tasks/BuildException.cs b/src/Controls/src/Build.Tasks/BuildException.cs
@@ -30,7 +30,12 @@ protected BuildException(System.Runtime.Serialization.SerializationInfo info, Sy
 
 		static string FormatMessage(BuildExceptionCode code, IXmlLineInfo xmlinfo, object[] args)
 		{
-			var message = string.Format(ErrorMessages.ResourceManager.GetString(code.ErrorMessageKey), args);
+			var message = ErrorMessages.ResourceManager.GetString(code.ErrorMessageKey);
+			if (args is not null)
+			{
+				message = string.Format(message, args);
+			}
+
 			var ecode = code.Code;
 			var position = xmlinfo == null || !xmlinfo.HasLineInfo() ? "" : $"({xmlinfo.LineNumber},{xmlinfo.LinePosition})";
 

diff --git a/src/Controls/src/Build.Tasks/XamlCTask.cs b/src/Controls/src/Build.Tasks/XamlCTask.cs
@@ -99,7 +99,7 @@ public static void LogWarningOrError(this TaskLoggingHelper loggingHelper, Build
 			{
 				loggingHelper.LogError("XamlC", $"{code.CodePrefix}{code.CodeCode:0000}", code.HelpLink, xamlFilePath, lineNumber, linePosition, endLineNumber, endLinePosition, ErrorMessages.ResourceManager.GetString(code.ErrorMessageKey), messageArgs);
 				LoggedErrors ??= new();
-				LoggedErrors.Add(new BuildException(code, new XmlLineInfo(lineNumber, linePosition), innerException: null));
+				LoggedErrors.Add(new BuildException(code, new XmlLineInfo(lineNumber, linePosition), innerException: null, messageArgs));
 			}
 			else
 			{