Revert "Added support for logging interpolated strings in tasks. (#8424)" (#8479)

This reverts commit 05f741b, which should unblock dotnet/installer#15586.

Author: rainersigwald

src/Framework/LogInterpolatedStringHandler.cs

@@ -239,7 +239,7 @@ public virtual string GetResourceMessage(string resourceName)
         }
         #endregion
 
-        #region Message logging method
+        #region Message logging methods
 
         /// <summary>
         /// Returns <see langword="true"/> if the build is configured to log all task inputs.
@@ -258,33 +258,6 @@ public bool LogsMessagesOfImportance(MessageImportance importance)
                 || buildEngine10.EngineServices.LogsMessagesOfImportance(importance);
         }
 
-#if NET6_0_OR_GREATER
-
-        /// <summary>
-        /// Logs a message using the specified interpolated string.
-        /// Thread safe.
-        /// </summary>
-        /// <param name="stringHandler">The message interpolated string.</param>
-        public void LogMessage(LogInterpolatedStringHandler stringHandler)
-        {
-            LogMessage(MessageImportance.Normal, stringHandler);
-        }
-
-        /// <summary>
-        /// Logs a message using the specified interpolated string.
-        /// Thread safe.
-        /// </summary>
-        /// <param name="importance">The importance level of the message.</param>
-        /// <param name="stringHandler">The message interpolated string.</param>
-        public void LogMessage(MessageImportance importance, LogInterpolatedStringHandler stringHandler)
-        {
-            if (LogsMessagesOfImportance(importance))
-            {
-                LogMessage(importance, stringHandler.GetFormat(), stringHandler.Arguments);
-            }
-        }
-#endif
-
         /// <summary>
         /// Logs a message using the specified string.
         /// Thread safe.
@@ -620,19 +593,6 @@ public void LogCommandLine(MessageImportance importance, string commandLine)
 
         #region Error logging methods
 
-#if NET6_0_OR_GREATER
-
-        /// <summary>
-        /// Logs an error message using the specified interpolated string.
-        /// Thread safe.
-        /// </summary>
-        /// <param name="stringHandler">The message interpolated string.</param>
-        public void LogError(LogInterpolatedStringHandler stringHandler)
-        {
-            LogError(stringHandler.GetFormat(), stringHandler.Arguments);
-        }
-#endif
-
         /// <summary>
         /// Logs an error using the specified string.
         /// Thread safe.
@@ -984,19 +944,6 @@ public void LogErrorFromException(Exception exception, bool showStackTrace, bool
 
         #region Warning logging methods
 
-#if NET6_0_OR_GREATER
-
-        /// <summary>
-        /// Logs a warning message using the specified interpolated string.
-        /// Thread safe.
-        /// </summary>
-        /// <param name="stringHandler">The message interpolated string.</param>
-        public void LogWarning(LogInterpolatedStringHandler stringHandler)
-        {
-            LogWarning(stringHandler.GetFormat(), stringHandler.Arguments);
-        }
-#endif
-
         /// <summary>
         /// Logs a warning using the specified string.
         /// Thread safe.

src/Shared/TaskLoggingHelper.cs

@@ -31,8 +31,6 @@ internal sealed class MockEngine : IBuildEngine3
     {
         private StringBuilder _log = new StringBuilder();
 
-        public List<LazyFormattedBuildEventArgs> BuildEventArgs { get; } = new List<LazyFormattedBuildEventArgs>();
-
         public MessageImportance MinimumMessageImportance { get; set; } = MessageImportance.Low;
 
         internal int Messages { set; get; }
@@ -45,17 +43,13 @@ internal sealed class MockEngine : IBuildEngine3
 
         public void LogErrorEvent(BuildErrorEventArgs eventArgs)
         {
-            BuildEventArgs.Add(eventArgs);
-
             Console.WriteLine(EventArgsFormatting.FormatEventMessage(eventArgs));
             _log.AppendLine(EventArgsFormatting.FormatEventMessage(eventArgs));
             ++Errors;
         }
 
         public void LogWarningEvent(BuildWarningEventArgs eventArgs)
         {
-            BuildEventArgs.Add(eventArgs);
-
             Console.WriteLine(EventArgsFormatting.FormatEventMessage(eventArgs));
             _log.AppendLine(EventArgsFormatting.FormatEventMessage(eventArgs));
             ++Warnings;
@@ -72,8 +66,6 @@ public void LogMessageEvent(BuildMessageEventArgs eventArgs)
             // Only if the message is above the minimum importance should we record the log message
             if (eventArgs.Importance <= MinimumMessageImportance)
             {
-                BuildEventArgs.Add(eventArgs);
-
                 Console.WriteLine(eventArgs.Message);
                 _log.AppendLine(eventArgs.Message);
                 ++Messages;

src/Utilities.UnitTests/MockEngine.cs

@@ -2,11 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
 using Microsoft.Build.Exceptions;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
@@ -314,57 +310,5 @@ public void TestLogFromExceptionWithAggregateException()
             engine.AssertLogContains("The operation was invalid");
             engine.AssertLogContains("An I/O error occurred");
         }
-
-#if NET6_0_OR_GREATER
-
-        public static IEnumerable<object[]> InterpolatedLogTestData()
-        {
-            Action<Task> logMessage = t => t.Log.LogMessage($"echo {0} and {"1"} {2} {3} {4} {5} {6} {7} {8} {9} {10}");
-            Action<Task> logWarning = t => t.Log.LogWarning($"echo {0} and {"1"}");
-            Action<Task> logError = t => t.Log.LogError($"echo {0} and {"1"}");
-
-            yield return new object[] { logMessage, "echo 0 and 1 2 3 4 5 6 7 8 9 10", typeof(BuildMessageEventArgs) };
-            yield return new object[] { logWarning, "echo 0 and 1", typeof(BuildWarningEventArgs) };
-            yield return new object[] { logError, "echo 0 and 1", typeof(BuildErrorEventArgs) };
-        }
-
-        [Theory]
-        [MemberData(nameof(InterpolatedLogTestData))]
-        public void LogWithInterpolatedString(Action<Task> logAction, string expectedResult, Type expectedEventType)
-        {
-            MockEngine mockEngine = new MockEngine();
-            Task t = new MockTask();
-            t.BuildEngine = mockEngine;
-
-            logAction(t);
-
-            mockEngine.BuildEventArgs.Count.ShouldBe(1);
-            mockEngine.BuildEventArgs[0].ShouldBeOfType(expectedEventType);
-            mockEngine.BuildEventArgs[0].Message.ShouldBe(expectedResult);
-
-            MethodBody logActionBody = logAction
-                .GetMethodInfo()
-                .GetMethodBody();
-
-            logActionBody
-                .LocalVariables
-                .Select(lvi => lvi.LocalType)
-                .ShouldContain(typeof(LogInterpolatedStringHandler), "Wrong logging method was bound");
-        }
-
-        [Fact]
-        public void LogMessageWithInterpolatedString_RespectsImportanceLevel()
-        {
-            MockEngine mockEngine = new MockEngine();
-            Task t = new MockTask();
-            t.BuildEngine = mockEngine;
-
-            mockEngine.MinimumMessageImportance = MessageImportance.High;
-            t.Log.LogMessage(MessageImportance.Low, $"echo {0} and {"1"}");
-
-            mockEngine.BuildEventArgs.Count.ShouldBe(0);
-        }
-#endif
-
     }
 }