Support MSBuild 16.10

args.BuildEventContext.EvaluationId is not set to -1 args.BuildEventContext.ProjectContextId is not set to InvalidProjectContextId Fixes dotnet#390
mrward · May 27, 2021 · 96eb2c0 · 96eb2c0
1 parent f214836
commit 96eb2c0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/LogModel/Builder/ModelBuilder.cs b/src/LogModel/Builder/ModelBuilder.cs
@@ -231,8 +231,7 @@ private void OnBuildFinished(BuildFinishedEventArgs args)
         private static void CheckProjectEventContext(BuildEventArgs args)
         {
             if (args.BuildEventContext.TargetId != -1 ||
-                args.BuildEventContext.TaskId != -1 ||
-                args.BuildEventContext.EvaluationId != -1)
+                args.BuildEventContext.TaskId != -1)
             {
                 throw new LoggerException(Resources.BadState);
             }
@@ -750,8 +749,7 @@ private void ProcessTaskMessage(BuildEventArgs args)
 
         private void ProcessEvaluationMessage(BuildEventArgs args)
         {
-            if (args.BuildEventContext.ProjectContextId != BuildEventContext.InvalidProjectContextId ||
-                args.BuildEventContext.TargetId != BuildEventContext.InvalidTargetId ||
+            if (args.BuildEventContext.TargetId != BuildEventContext.InvalidTargetId ||
                 args.BuildEventContext.TaskId != BuildEventContext.InvalidTaskId)
             {
                 throw new LoggerException(Resources.UnexpectedMessage);