Transfer evaluation ids across nodes too!

Author: baronfel

src/Build/BackEnd/BuildManager/BuildManager.cs

@@ -2496,6 +2496,11 @@ private void HandleResult(int node, BuildResult result)
                 configuration.ProjectDefaultTargets ??= result.DefaultTargets;
                 configuration.ProjectInitialTargets ??= result.InitialTargets;
                 configuration.ProjectTargets ??= result.ProjectTargets;
+                // Update the evaluation ID if it's valid (not InvalidEvaluationId)
+                if (result.EvaluationId != BuildEventContext.InvalidEvaluationId)
+                {
+                    configuration.ProjectEvaluationId = result.EvaluationId;
+                }
             }
 
             // Only report results to the project cache services if it's the result for a build submission.

src/Build/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs

@@ -852,6 +852,7 @@ private void EvaluateRequestStates()
                     completedEntry.Result.DefaultTargets = configuration.ProjectDefaultTargets;
                     completedEntry.Result.InitialTargets = configuration.ProjectInitialTargets;
                     completedEntry.Result.ProjectTargets = configuration.ProjectTargets;
+                    completedEntry.Result.EvaluationId = configuration.ProjectEvaluationId;
                 }
 
                 TraceEngine("ERS: Request is now {0}({1}) (nr {2}) has had its builder cleaned up.", completedEntry.Request.GlobalRequestId, completedEntry.Request.ConfigurationId, completedEntry.Request.NodeRequestId);

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

@@ -70,7 +70,7 @@ internal ProjectLoggingContext(
             projectItems: null,
             request.ParentBuildEventContext,
             // if the project was built on a different node, the evaluation id will be a lie anyway, make that super clear
-            configuration.ResultsNodeId != nodeLoggingContext.BuildEventContext.NodeId ? int.MaxValue : configuration.ProjectEvaluationId,
+            configuration.ProjectEvaluationId,
             request.ProjectContextId,
             configuration.ResultsNodeId)
         {

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

@@ -865,6 +865,8 @@ private async Task RequestThreadProc(bool setThreadParameters)
                 {
                     ErrorUtilities.VerifyThrow(result == null, "Result already set when exception was thrown.");
                     result = new BuildResult(_requestEntry.Request, thrownException);
+                    // Populate the evaluation ID from the configuration for sending to the central node
+                    result.EvaluationId = _requestEntry.RequestConfiguration.ProjectEvaluationId;
                 }
 
                 ReportResultAndCleanUp(result);
@@ -1019,7 +1021,10 @@ private BuildResult[] GetResultsForContinuation(FullyQualifiedBuildRequest[] req
                 results = new Dictionary<int, BuildResult>();
                 for (int i = 0; i < requests.Length; i++)
                 {
-                    results[i] = new BuildResult(new BuildRequest(), new BuildAbortedException());
+                    var result = new BuildResult(new BuildRequest(), new BuildAbortedException());
+                    // Populate the evaluation ID from the configuration for sending to the central node
+                    result.EvaluationId = _requestEntry.RequestConfiguration.ProjectEvaluationId;
+                    results[i] = result;
                 }
             }
 
@@ -1210,6 +1215,9 @@ private async Task<BuildResult> BuildProject()
                 BuildResult result = await _targetBuilder.BuildTargets(_projectLoggingContext, _requestEntry, this,
                     allTargets, _requestEntry.RequestConfiguration.BaseLookup, _cancellationTokenSource.Token);
 
+                // Populate the evaluation ID from the configuration for sending to the central node
+                result.EvaluationId = _requestEntry.RequestConfiguration.ProjectEvaluationId;
+
                 UpdateStatisticsPostBuild();
 
                 result = _requestEntry.Request.ProxyTargets == null

src/Build/BackEnd/Shared/BuildRequestConfiguration.cs

@@ -300,7 +300,11 @@ internal BuildRequestConfiguration()
         /// <summary>
         /// A short
         /// </summary>
-        public int ProjectEvaluationId => _projectEvaluationId;
+        public int ProjectEvaluationId
+        {
+            get => _projectEvaluationId;
+            internal set => _projectEvaluationId = value;
+        }
 
         /// <summary>
         /// Flag indicating if this configuration represents a traversal project.  Traversal projects

src/Build/BackEnd/Shared/BuildResult.cs

@@ -86,7 +86,8 @@ public class BuildResult : BuildResultBase, INodePacket, IBuildResults
         /// <remarks>
         /// Allows to serialize and deserialize different versions of the build result.
         /// </remarks>
-        private int _version = Traits.Instance.EscapeHatches.DoNotVersionBuildResult ? 0 : 1;
+        private int _version = 
+            Traits.Instance.EscapeHatches.DoNotVersionBuildResult ? 0 : 2;
 
         /// <summary>
         /// The request caused a circular dependency in scheduling.
@@ -100,6 +101,11 @@ public class BuildResult : BuildResultBase, INodePacket, IBuildResults
         /// </summary>
         private Exception? _requestException;
 
+        /// <summary>
+        /// The evaluation ID of the project used for this build.
+        /// </summary>
+        private int _evaluationId = BuildEventContext.InvalidEvaluationId;
+
         /// <summary>
         /// The overall result calculated in the constructor.
         /// </summary>
@@ -495,6 +501,17 @@ internal HashSet<string>? ProjectTargets
             set => _projectTargets = value;
         }
 
+        /// <summary>
+        /// The evaluation ID of the project used for this build.
+        /// </summary>
+        internal int EvaluationId
+        {
+            [DebuggerStepThrough]
+            get => _evaluationId;
+            [DebuggerStepThrough]
+            set => _evaluationId = value;
+        }
+
         /// <summary>
         /// Container used to transport errors from the scheduler (issued while computing a build result)
         /// to the TaskHost that has the proper logging context (project id, target id, task id, file location)
@@ -695,6 +712,11 @@ void ITranslatable.Translate(ITranslator translator)
             {
                 translator.TranslateEnum(ref _buildRequestDataFlags, (int)_buildRequestDataFlags);
             }
+                
+            if (_version >= 2)
+            {
+                translator.Translate(ref _evaluationId);
+            }
         }
 
         /// <summary>