Tasks Log.HasLoggedError now respects MSBuildWarningsAsErrors

ref/Microsoft.Build.Framework/net/Microsoft.Build.Framework.cs

@@ -211,6 +211,10 @@ public partial interface IBuildEngine7 : Microsoft.Build.Framework.IBuildEngine,
     {
         bool AllowFailureWithoutError { get; set; }
     }
+    public partial interface IBuildEngine8 : Microsoft.Build.Framework.IBuildEngine, Microsoft.Build.Framework.IBuildEngine2, Microsoft.Build.Framework.IBuildEngine3, Microsoft.Build.Framework.IBuildEngine4, Microsoft.Build.Framework.IBuildEngine5, Microsoft.Build.Framework.IBuildEngine6, Microsoft.Build.Framework.IBuildEngine7
+    {
+        System.Collections.Generic.HashSet<string> WarningsAsErrors { get; }
+    }
     public partial interface ICancelableTask : Microsoft.Build.Framework.ITask
     {
         void Cancel();

ref/Microsoft.Build.Framework/netstandard/Microsoft.Build.Framework.cs

@@ -211,6 +211,10 @@ public partial interface IBuildEngine7 : Microsoft.Build.Framework.IBuildEngine,
     {
         bool AllowFailureWithoutError { get; set; }
     }
+    public partial interface IBuildEngine8 : Microsoft.Build.Framework.IBuildEngine, Microsoft.Build.Framework.IBuildEngine2, Microsoft.Build.Framework.IBuildEngine3, Microsoft.Build.Framework.IBuildEngine4, Microsoft.Build.Framework.IBuildEngine5, Microsoft.Build.Framework.IBuildEngine6, Microsoft.Build.Framework.IBuildEngine7
+    {
+        System.Collections.Generic.HashSet<string> WarningsAsErrors { get; }
+    }
     public partial interface ICancelableTask : Microsoft.Build.Framework.ITask
     {
         void Cancel();

ref/Microsoft.Build.Utilities.Core/net/Microsoft.Build.Utilities.Core.cs

@@ -353,6 +353,7 @@ public abstract partial class Task : Microsoft.Build.Framework.ITask
         public Microsoft.Build.Framework.IBuildEngine5 BuildEngine5 { get { throw null; } }
         public Microsoft.Build.Framework.IBuildEngine6 BuildEngine6 { get { throw null; } }
         public Microsoft.Build.Framework.IBuildEngine7 BuildEngine7 { get { throw null; } }
+        public Microsoft.Build.Framework.IBuildEngine7 BuildEngine8 { get { throw null; } }
         protected string HelpKeywordPrefix { get { throw null; } set { } }
         public Microsoft.Build.Framework.ITaskHost HostObject { get { throw null; } set { } }
         public Microsoft.Build.Utilities.TaskLoggingHelper Log { get { throw null; } }

ref/Microsoft.Build.Utilities.Core/netstandard/Microsoft.Build.Utilities.Core.cs

@@ -198,6 +198,7 @@ public abstract partial class Task : Microsoft.Build.Framework.ITask
         public Microsoft.Build.Framework.IBuildEngine5 BuildEngine5 { get { throw null; } }
         public Microsoft.Build.Framework.IBuildEngine6 BuildEngine6 { get { throw null; } }
         public Microsoft.Build.Framework.IBuildEngine7 BuildEngine7 { get { throw null; } }
+        public Microsoft.Build.Framework.IBuildEngine7 BuildEngine8 { get { throw null; } }
         protected string HelpKeywordPrefix { get { throw null; } set { } }
         public Microsoft.Build.Framework.ITaskHost HostObject { get { throw null; } set { } }
         public Microsoft.Build.Utilities.TaskLoggingHelper Log { get { throw null; } }

src/Build.UnitTests/BackEnd/MockLoggingService.cs

@@ -557,6 +557,11 @@ public bool HasBuildSubmissionLoggedErrors(int submissionId)
             return false;
         }
 
+        public HashSet<string> GetWarningsAsErrors(BuildEventContext context)
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
     }
 }

src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs

@@ -51,6 +51,7 @@ public void ConstructorWithNullName()
                     null,
                     @"c:\my tasks\mytask.dll",
                     null,
+                    null,
                     null);
             }
            );
@@ -79,6 +80,7 @@ public void ConstructorWithEmptyName()
                     String.Empty,
                     @"c:\my tasks\mytask.dll",
                     null,
+                    null,
                     null);
             }
            );
@@ -107,6 +109,7 @@ public void ConstructorWithNullLocation()
                     "TaskName",
                     null,
                     null,
+                    null,
                     null);
             }
            );
@@ -137,6 +140,7 @@ public void ConstructorWithEmptyLocation()
                     "TaskName",
                     String.Empty,
                     null,
+                    null,
                     null);
             }
            );
@@ -165,6 +169,7 @@ public void TestValidConstructors()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 null,
+                null,
                 null);
 
             TaskHostConfiguration config2 = new TaskHostConfiguration(
@@ -183,6 +188,7 @@ public void TestValidConstructors()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 null,
+                null,
                 null);
 
             IDictionary<string, object> parameters = new Dictionary<string, object>();
@@ -202,6 +208,7 @@ public void TestValidConstructors()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 parameters,
+                null,
                 null);
 
             IDictionary<string, object> parameters2 = new Dictionary<string, object>();
@@ -226,6 +233,7 @@ public void TestValidConstructors()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 parameters2,
+                null,
                 null);
         }
 
@@ -257,7 +265,8 @@ public void TestTranslationWithNullDictionary()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 null,
-                expectedGlobalProperties);
+                expectedGlobalProperties,
+                null);
 
             ((ITranslatable)config).Translate(TranslationHelpers.GetWriteTranslator());
             INodePacket packet = TaskHostConfiguration.FactoryForDeserialization(TranslationHelpers.GetReadTranslator());
@@ -295,7 +304,8 @@ public void TestTranslationWithEmptyDictionary()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 new Dictionary<string, object>(),
-                new Dictionary<string, string>());
+                new Dictionary<string, string>(),
+                null);
 
             ((ITranslatable)config).Translate(TranslationHelpers.GetWriteTranslator());
             INodePacket packet = TaskHostConfiguration.FactoryForDeserialization(TranslationHelpers.GetReadTranslator());
@@ -338,6 +348,7 @@ public void TestTranslationWithValueTypesInDictionary()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 parameters,
+                null,
                 null);
 
             ((ITranslatable)config).Translate(TranslationHelpers.GetWriteTranslator());
@@ -379,6 +390,7 @@ public void TestTranslationWithITaskItemInDictionary()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 parameters,
+                null,
                 null);
 
             ((ITranslatable)config).Translate(TranslationHelpers.GetWriteTranslator());
@@ -419,6 +431,7 @@ public void TestTranslationWithITaskItemArrayInDictionary()
                 "TaskName",
                 @"c:\MyTasks\MyTask.dll",
                 parameters,
+                null,
                 null);
 
             ((ITranslatable)config).Translate(TranslationHelpers.GetWriteTranslator());

src/Build/BackEnd/Components/Logging/ILoggingService.cs

@@ -219,6 +219,8 @@ bool IncludeTaskInputs
         /// <returns><code>true</code> if the build submission logged an errors, otherwise <code>false</code>.</returns>
         bool HasBuildSubmissionLoggedErrors(int submissionId);
 
+        HashSet<string> GetWarningsAsErrors(BuildEventContext context);
+
         #region Register
 
         /// <summary>

src/Build/BackEnd/Components/Logging/LoggingService.cs

@@ -515,6 +515,18 @@ public bool HasBuildSubmissionLoggedErrors(int submissionId)
             return _buildSubmissionIdsThatHaveLoggedErrors?.Contains(submissionId) == true;
         }
 
+        public HashSet<string> GetWarningsAsErrors(BuildEventContext context)
+        {
+            int key = GetWarningsAsErrorOrMessageKey(context);
+
+            if (_warningsAsErrorsByProject.ContainsKey(key))
+            {
+                return _warningsAsErrorsByProject[key] as HashSet<string>;
+            }
+
+            return null;
+        }
+
         public void AddWarningsAsErrors(BuildEventContext buildEventContext, ISet<string> codes)
         {
             lock (_lockObject)

src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs

@@ -33,7 +33,7 @@ internal class TaskHost :
 #if FEATURE_APPDOMAIN
         MarshalByRefObject,
 #endif
-        IBuildEngine7
+        IBuildEngine8
     {
         /// <summary>
         /// True if the "secret" environment variable MSBUILDNOINPROCNODE is set.
@@ -676,6 +676,13 @@ public void LogTelemetry(string eventName, IDictionary<string, string> propertie
         public bool AllowFailureWithoutError { get; set; } = false;
         #endregion
 
+        #region IBuildEngine8 Members
+        /// <summary>
+        /// Contains all warnings that should be logged as errors.
+        /// </summary>
+        public HashSet<string> WarningsAsErrors { get => _taskLoggingContext.LoggingService.GetWarningsAsErrors(_taskLoggingContext.BuildEventContext); }
+        #endregion
+
         /// <summary>
         /// Called by the internal MSBuild task.
         /// Does not take the lock because it is called by another request builder thread.

src/Build/Instance/TaskFactories/TaskHostTask.cs

@@ -271,7 +271,9 @@ public bool Execute()
                         _taskType.Type.FullName,
                         AssemblyUtilities.GetAssemblyLocation(_taskType.Type.GetTypeInfo().Assembly),
                         _setParameters,
-                        new Dictionary<string, string>(_buildComponentHost.BuildParameters.GlobalProperties)
+                        new Dictionary<string, string>(_buildComponentHost.BuildParameters.GlobalProperties),
+                        _taskLoggingContext.LoggingService.GetWarningsAsErrors(_taskLoggingContext.BuildEventContext)
+
                     );
 
             try

src/Framework/IBuildEngine8.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Build.Framework
+{
+    /// <summary>
+    /// This interface extends <see cref="IBuildEngine7" /> to allow tasks know if a warning
+    /// they logged was turned into an error.
+    /// </summary>
+    public interface IBuildEngine8 : IBuildEngine7
+    {
+        public HashSet<string> WarningsAsErrors { get; }
+    }
+}

src/MSBuild/OutOfProcTaskHostNode.cs

@@ -33,7 +33,7 @@ internal class OutOfProcTaskHostNode :
 #if CLR2COMPATIBILITY
         IBuildEngine3
 #else
-        IBuildEngine7
+        IBuildEngine8
 #endif
     {
         /// <summary>
@@ -267,6 +267,13 @@ public bool IsRunningMultipleNodes
         public bool AllowFailureWithoutError { get; set; } = false;
         #endregion
 
+        #region IBuildEngine8 Implementation
+        /// <summary>
+        /// Contains all warnings that should be logged as errors.
+        /// </summary>
+        public HashSet<string> WarningsAsErrors { get; private set; }
+        #endregion
+
         #region IBuildEngine Implementation (Methods)
 
         /// <summary>
@@ -793,7 +800,7 @@ private void RunTask(object state)
             _debugCommunications = taskConfiguration.BuildProcessEnvironment.ContainsValueAndIsEqual("MSBUILDDEBUGCOMM", "1", StringComparison.OrdinalIgnoreCase);
             _updateEnvironment = !taskConfiguration.BuildProcessEnvironment.ContainsValueAndIsEqual("MSBuildTaskHostDoNotUpdateEnvironment", "1", StringComparison.OrdinalIgnoreCase);
             _updateEnvironmentAndLog = taskConfiguration.BuildProcessEnvironment.ContainsValueAndIsEqual("MSBuildTaskHostUpdateEnvironmentAndLog", "1", StringComparison.OrdinalIgnoreCase);
-
+            WarningsAsErrors = taskConfiguration.WarningsAsErrors;
             try
             {
                 // Change to the startup directory

src/Shared/TaskHostConfiguration.cs

@@ -85,6 +85,8 @@ internal class TaskHostConfiguration : INodePacket
 
         private Dictionary<string, string> _globalParameters;
 
+        private HashSet<string> _warningsAsErrors;
+
 #if FEATURE_APPDOMAIN
         /// <summary>
         /// Constructor
@@ -103,6 +105,7 @@ internal class TaskHostConfiguration : INodePacket
         /// <param name="taskLocation">Location of the assembly the task is to be loaded from.</param>
         /// <param name="taskParameters">Parameters to apply to the task.</param>
         /// <param name="globalParameters">global properties for the current project.</param>
+        /// <param name="warningsAsErrors">Warning codes to be thrown as errors for the current project.</param>
 #else
         /// <summary>
         /// Constructor
@@ -120,6 +123,7 @@ internal class TaskHostConfiguration : INodePacket
         /// <param name="taskLocation">Location of the assembly the task is to be loaded from.</param>
         /// <param name="taskParameters">Parameters to apply to the task.</param>
         /// <param name="globalParameters">global properties for the current project.</param>
+        /// <param name="warningsAsErrors">Warning codes to be thrown as errors for the current project.</param>
 #endif
         public TaskHostConfiguration
             (
@@ -138,7 +142,8 @@ public TaskHostConfiguration
                 string taskName,
                 string taskLocation,
                 IDictionary<string, object> taskParameters,
-                Dictionary<string, string> globalParameters
+                Dictionary<string, string> globalParameters,
+                HashSet<string> warningsAsErrors
             )
         {
             ErrorUtilities.VerifyThrowInternalLength(taskName, nameof(taskName));
@@ -168,6 +173,7 @@ public TaskHostConfiguration
             _continueOnError = continueOnError;
             _taskName = taskName;
             _taskLocation = taskLocation;
+            _warningsAsErrors = warningsAsErrors;
 
             if (taskParameters != null)
             {
@@ -342,6 +348,15 @@ public NodePacketType Type
             { return NodePacketType.TaskHostConfiguration; }
         }
 
+        public HashSet<string> WarningsAsErrors
+        {
+            [DebuggerStepThrough]
+            get
+            {
+                return _warningsAsErrors;
+            }
+        }
+
         /// <summary>
         /// Translates the packet to/from binary form.
         /// </summary>
@@ -364,6 +379,7 @@ public void Translate(ITranslator translator)
             translator.TranslateDictionary(ref _taskParameters, StringComparer.OrdinalIgnoreCase, TaskParameter.FactoryForDeserialization);
             translator.Translate(ref _continueOnError);
             translator.TranslateDictionary(ref _globalParameters, StringComparer.OrdinalIgnoreCase);
+            translator.Translate(ref _warningsAsErrors);
         }
 
         /// <summary>

src/Shared/TaskLoggingHelper.cs

@@ -1016,6 +1016,30 @@ public void LogWarning
             // that gives the user something.
             bool fillInLocation = (String.IsNullOrEmpty(file) && (lineNumber == 0) && (columnNumber == 0));
 
+            if ((BuildEngine as IBuildEngine8).WarningsAsErrors.Contains(warningCode))
+            {
+                var err = new BuildErrorEventArgs
+                (
+                    subcategory,
+                    warningCode,
+                    fillInLocation ? BuildEngine.ProjectFileOfTaskNode : file,
+                    fillInLocation ? BuildEngine.LineNumberOfTaskNode : lineNumber,
+                    fillInLocation ? BuildEngine.ColumnNumberOfTaskNode : columnNumber,
+                    endLineNumber,
+                    endColumnNumber,
+                    message,
+                    helpKeyword,
+                    TaskName,
+                    helpLink,
+                    DateTime.UtcNow,
+                    messageArgs
+                );
+
+                BuildEngine.LogErrorEvent(err);
+                HasLoggedErrors = true;
+                return;
+            }
+
             var e = new BuildWarningEventArgs
                 (
                     subcategory,

src/Utilities/Task.cs

@@ -94,6 +94,11 @@ protected Task(ResourceManager taskResources, string helpKeywordPrefix)
         /// </summary>
         public IBuildEngine7 BuildEngine7 => (IBuildEngine7)BuildEngine;
 
+        /// <summary>
+        /// Retrieves the <see cref="IBuildEngine8" /> version of the build engine interface provided by the host.
+        /// </summary>
+        public IBuildEngine7 BuildEngine8 => (IBuildEngine8)BuildEngine;
+
         /// <summary>
         /// The build engine sets this property if the host IDE has associated a host object with this particular task.
         /// </summary>