update callsites for use-case-specific constructors

Author: baronfel

src/Build.UnitTests/BackEnd/LoggingService_Tests.cs

@@ -974,7 +974,9 @@ private MockLogger GetLoggedEventsWithWarningsAsErrorsOrMessages(
 
             loggingService.RegisterLogger(logger);
 
-            BuildEventContext projectStarted = loggingService.LogProjectStarted(buildEventContext, 0, buildEventContext.ProjectInstanceId, BuildEventContext.Invalid, "projectFile", "Build", Enumerable.Empty<DictionaryEntry>(), Enumerable.Empty<DictionaryEntry>());
+            var projectStartedArgs = loggingService.CreateProjectStartedForLocalProject(BuildEventContext.Invalid, buildEventContext.ProjectInstanceId, "projectFile", "Build", null, Enumerable.Empty<DictionaryEntry>(), Enumerable.Empty<DictionaryEntry>(), null);
+            loggingService.LogProjectStarted(projectStartedArgs);
+            BuildEventContext projectStarted = projectStartedArgs.BuildEventContext;
 
             if (warningsAsErrorsForProject != null)
             {

src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs

@@ -792,7 +792,9 @@ public void ProjectStartedNullBuildEventContext()
             Assert.Throws<InternalErrorException>(() =>
             {
                 ProcessBuildEventHelper service = (ProcessBuildEventHelper)ProcessBuildEventHelper.CreateLoggingService(LoggerMode.Synchronous, 1);
-                service.LogProjectStarted(null, 1, 2, s_taskBuildEventContext, "ProjectFile", "TargetNames", null, null, s_targetBuildEventContext.EvaluationId, s_taskBuildEventContext.ProjectContextId);
+                var args = service.CreateProjectStartedForLocalProject(s_taskBuildEventContext, 2, "ProjectFile", "TargetNames", null, null, null, null);
+                args.BuildEventContext = null; // Force null context for error test
+                service.LogProjectStarted(args);
             });
         }
 
@@ -806,7 +808,8 @@ public void ProjectStartedNullParentBuildEventContext()
             Assert.Throws<InternalErrorException>(() =>
             {
                 ProcessBuildEventHelper service = (ProcessBuildEventHelper)ProcessBuildEventHelper.CreateLoggingService(LoggerMode.Synchronous, 1);
-                service.LogProjectStarted(s_taskBuildEventContext, 1, 2, null, "ProjectFile", "TargetNames", null, null, s_targetBuildEventContext.EvaluationId, s_taskBuildEventContext.ProjectContextId);
+                var args = service.CreateProjectStartedForLocalProject(null, 2, "ProjectFile", "TargetNames", null, null, null, null);
+                service.LogProjectStarted(args);
             });
         }
 
@@ -841,7 +844,9 @@ public void ProjectStartedEventTests(string projectFile, string targetNames)
             BuildRequestConfiguration config = new BuildRequestConfiguration(2, data, "4.0");
             cache.AddConfiguration(config);
 
-            BuildEventContext context = service.LogProjectStarted(s_taskBuildEventContext, 1, 2, s_taskBuildEventContext, projectFile, targetNames, null, null, s_targetBuildEventContext.EvaluationId, s_taskBuildEventContext.ProjectContextId);
+            var args = service.CreateProjectStartedForLocalProject(s_taskBuildEventContext, 2, projectFile, targetNames, null, null, null, null);
+            service.LogProjectStarted(args);
+            BuildEventContext context = args.BuildEventContext;
             BuildEventContext parentBuildEventContext = s_taskBuildEventContext;
             VerifyProjectStartedEventArgs(service, context.ProjectContextId, message, projectFile, targetNames, parentBuildEventContext, context);
 
@@ -873,17 +878,10 @@ public void ProjectStartedProvidedProjectContextId()
             projectCacheBuildEventContext.ProjectContextId.ShouldNotBe(BuildEventContext.InvalidProjectContextId);
 
             BuildEventContext nodeBuildEventContext = BuildEventContext.CreateInitial(0, Scheduler.InProcNodeId);
-            BuildEventContext projectStartedBuildEventContext = service.LogProjectStarted(
-                nodeBuildEventContext,
-                submissionId: SubmissionId,
-                configurationId: ConfigurationId,
-                parentBuildEventContext: BuildEventContext.Invalid,
-                projectFile: ProjectFile,
-                targetNames: "TargetNames",
-                properties: null,
-                items: null,
-                evaluationId: EvaluationId,
-                projectContextId: projectCacheBuildEventContext.ProjectContextId);
+            var args = service.CreateProjectStartedForLocalProject(BuildEventContext.Invalid, ConfigurationId, ProjectFile, "TargetNames", null, null, null, null);
+            args.BuildEventContext = args.BuildEventContext.WithProjectContextId(projectCacheBuildEventContext.ProjectContextId); // Use provided project context ID
+            service.LogProjectStarted(args);
+            BuildEventContext projectStartedBuildEventContext = args.BuildEventContext;
             projectStartedBuildEventContext.ProjectContextId.ShouldBe(projectCacheBuildEventContext.ProjectContextId);
         }
 
@@ -907,62 +905,15 @@ public void ProjectStartedProvidedUnknownProjectContextIdInProcNode()
             BuildRequestConfiguration config = new BuildRequestConfiguration(ConfigurationId, data, "4.0");
             cache.AddConfiguration(config);
 
-            BuildEventContext nodeBuildEventContext = BuildEventContext.CreateInitial(0, Scheduler.InProcNodeId);
+            BuildEventContext parentBuildEventContext = BuildEventContext.CreateInitial(SubmissionId, Scheduler.InProcNodeId).WithEvaluationId(EvaluationId);
+            BuildEventContext remoteBuildEventContextWithKnownBadContextOnCurrentNode = parentBuildEventContext.WithProjectContextId(ProjectContextId);
             Assert.Throws<InternalErrorException>(() =>
             {
-                service.LogProjectStarted(
-                    nodeBuildEventContext,
-                    submissionId: SubmissionId,
-                    configurationId: ConfigurationId,
-                    parentBuildEventContext: BuildEventContext.Invalid,
-                    projectFile: ProjectFile,
-                    targetNames: "TargetNames",
-                    properties: null,
-                    items: null,
-                    evaluationId: EvaluationId,
-                    projectContextId: ProjectContextId);
+                var args = service.CreateProjectStartedForCachedProject(parentBuildEventContext,  remoteBuildEventContextWithKnownBadContextOnCurrentNode, BuildEventContext.Invalid, null, ProjectFile, "TargetNames", null);
+                service.LogProjectStarted(args);
             });
         }
 
-        /// <summary>
-        /// Expect an unknown project context id to be accepted on an out-of-proc node.
-        /// </summary>
-        [Fact]
-        public void ProjectStartedProvidedUnknownProjectContextIdOutOfProcNode()
-        {
-            const int SubmissionId = 1;
-            const int EvaluationId = 2;
-            const int ConfigurationId = 3;
-            const string ProjectFile = "SomeProjectFile";
-            const int NodeId = 2;
-            const int ProjectContextId = 123;
-
-            // Ensure we didn't pick the one bad const value
-            NodeId.ShouldNotBe(Scheduler.InProcNodeId);
-
-            MockHost componentHost = new MockHost();
-            ProcessBuildEventHelper service = (ProcessBuildEventHelper)ProcessBuildEventHelper.CreateLoggingService(LoggerMode.Synchronous, 1, componentHost);
-            ConfigCache cache = (ConfigCache)componentHost.GetComponent(BuildComponentType.ConfigCache);
-
-            BuildRequestData data = new BuildRequestData(ProjectFile, new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty<string>(), null);
-            BuildRequestConfiguration config = new BuildRequestConfiguration(ConfigurationId, data, "4.0");
-            cache.AddConfiguration(config);
-
-            BuildEventContext nodeBuildEventContext = BuildEventContext.CreateInitial(0, NodeId);
-            BuildEventContext projectStartedBuildEventContext = service.LogProjectStarted(
-                nodeBuildEventContext,
-                submissionId: SubmissionId,
-                configurationId: ConfigurationId,
-                parentBuildEventContext: BuildEventContext.Invalid,
-                projectFile: ProjectFile,
-                targetNames: "TargetNames",
-                properties: null,
-                items: null,
-                evaluationId: EvaluationId,
-                projectContextId: ProjectContextId);
-            projectStartedBuildEventContext.ProjectContextId.ShouldBe(ProjectContextId);
-        }
-
         #endregion
 
         #region ProjectFinished
@@ -1422,17 +1373,9 @@ private void TestProjectFinishedEvent(string projectFile, bool success)
             cache.AddConfiguration(config);
 
             // Now do it the right way -- with a matching ProjectStarted.
-            BuildEventContext projectContext = service.LogProjectStarted(
-                    BuildEventContext.CreateInitial(0, 1),
-                    1,
-                    2,
-                    s_taskBuildEventContext,
-                    projectFile,
-                    null,
-                    null,
-                    null,
-                    s_taskBuildEventContext.EvaluationId,
-                    s_taskBuildEventContext.ProjectContextId);
+            var projectStartedArgs = service.CreateProjectStartedForLocalProject(s_taskBuildEventContext, 2, projectFile, null, null, null, null, null);
+            service.LogProjectStarted(projectStartedArgs);
+            BuildEventContext projectContext = projectStartedArgs.BuildEventContext;
 
             service.LogProjectFinished(projectContext, projectFile, success);
 

src/Build.UnitTests/BackEnd/MockLoggingService.cs

@@ -545,48 +545,70 @@ public void LogProjectEvaluationFinished(
         {
         }
 
-        /// <summary>
-        /// Logs a project started event
-        /// </summary>
-        public BuildEventContext LogProjectStarted(
-            BuildEventContext nodeBuildEventContext,
-            int submissionId,
-            int configurationId,
-            BuildEventContext parentBuildEventContext,
-            string projectFile,
-            string targetNames,
-            IEnumerable<DictionaryEntry> properties,
-            IEnumerable<DictionaryEntry> items,
-            int evaluationId = BuildEventContext.InvalidEvaluationId,
-            int projectContextId = BuildEventContext.InvalidProjectContextId)
-        {
-            return BuildEventContext.CreateInitial(0, 0);
-        }
-
         public void LogProjectStarted(ProjectStartedEventArgs args)
         { }
 
         public ProjectStartedEventArgs CreateProjectStartedForLocalProject(
-            BuildEventContext nodeBuildEventContext,
-            int submissionId,
-            int configurationId,
             BuildEventContext parentBuildEventContext,
+            int configurationId,
             string projectFile,
             string targetNames,
+            IDictionary<string, string> globalProperties,
             IEnumerable<DictionaryEntry> properties,
             IEnumerable<DictionaryEntry> items,
-            int evaluationId = BuildEventContext.InvalidEvaluationId,
-            int projectContextId = BuildEventContext.InvalidProjectContextId)
+            string toolsVersion)
         {
-            return new ProjectStartedEventArgs(
+            // Create a mock project context ID for testing
+            int projectContextId = configurationId;
+            
+            BuildEventContext projectBuildEventContext = parentBuildEventContext
+                .WithProjectInstanceId(configurationId)
+                .WithProjectContextId(projectContextId);
+
+            var buildEvent = new ProjectStartedEventArgs(
                 configurationId,
                 message: null,
                 helpKeyword: null,
                 projectFile,
                 targetNames,
                 properties,
                 items,
-                parentBuildEventContext);
+                parentBuildEventContext,
+                globalProperties,
+                toolsVersion);
+            
+            buildEvent.BuildEventContext = projectBuildEventContext;
+            return buildEvent;
+        }
+
+        public ProjectStartedEventArgs CreateProjectStartedForCachedProject(
+            BuildEventContext currentNodeBuildEventContext,
+            BuildEventContext remoteNodeEvaluationBuildEventContext,
+            BuildEventContext parentBuildEventContext,
+            IDictionary<string, string> globalProperties,
+            string projectFile,
+            string targetNames,
+            string toolsVersion)
+        {
+            BuildEventContext projectBuildEventContext = parentBuildEventContext
+                .WithProjectInstanceId(remoteNodeEvaluationBuildEventContext.ProjectInstanceId)
+                .WithProjectContextId(remoteNodeEvaluationBuildEventContext.ProjectContextId);
+
+            var buildEvent = new ProjectStartedEventArgs(
+                remoteNodeEvaluationBuildEventContext.ProjectInstanceId,
+                message: null,
+                helpKeyword: null,
+                projectFile,
+                targetNames,
+                null, // No properties for cache scenarios in mock
+                null, // No items for cache scenarios in mock
+                parentBuildEventContext,
+                globalProperties,
+                toolsVersion,
+                remoteNodeEvaluationBuildEventContext); // Pass original context
+            
+            buildEvent.BuildEventContext = projectBuildEventContext;
+            return buildEvent;
         }
 
         /// <summary>

src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs

@@ -1694,7 +1694,9 @@ private ProjectInstance CreateTestProject(string projectBodyContents, string ini
         /// <returns>The context</returns>
         private ProjectLoggingContext GetProjectLoggingContext(BuildRequestEntry entry)
         {
-            return new ProjectLoggingContext(new NodeLoggingContext(_host, BuildEventContext.Invalid.WithNodeId(1), 1, false), entry);
+            var nodeContext = new NodeLoggingContext(_host, BuildEventContext.Invalid.WithNodeId(1), 1, false);
+            var (_, context) = ProjectLoggingContext.CreateForLocalBuild(nodeContext, entry);
+            return context;
         }
 
         /// <summary>

src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs

@@ -1086,7 +1086,9 @@ private ProjectInstance CreateTestProject(bool returnsAttributeEnabled)
         /// <returns>The project logging context.</returns>
         private ProjectLoggingContext GetProjectLoggingContext(BuildRequestEntry entry)
         {
-            return new ProjectLoggingContext(new NodeLoggingContext(_host, BuildEventContext.Invalid.WithNodeId(1), 1, false), entry);
+            var nodeContext = new NodeLoggingContext(_host, BuildEventContext.Invalid.WithNodeId(1), 1, false);
+            var (_, context) = ProjectLoggingContext.CreateForLocalBuild(nodeContext, entry);
+            return context;
         }
 
         /// <summary>

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

@@ -541,41 +541,52 @@ void LogProjectEvaluationFinished(
         /// Creates a ProjectStartedEventArgs for a locally-building project - 
         /// meaning one that is not served from cache and is building on the current node.
         /// </summary>
-        /// <param name="parentBuildEventContext">The parent build event context for the project that is about to be built.</param>
-        /// <param name="projectConfiguration">The project configuration of the project that is about to be built.</param>
-        /// <param name="projectFile">The project file path of the project that is about to be built.</param>
-        /// <param name="targetNames">The target names to be built.</param>
+        /// <param name="parentBuildEventContext">The parent build event context for the project that is starting.</param>
+        /// <param name="configurationId">The configuration ID of the project that is starting.</param>
+        /// <param name="projectFile">The project file path of the project that is starting.</param>
+        /// <param name="targetNames">The target names that are being built.</param>
+        /// <param name="globalProperties">The global properties for the project instance.</param>
         /// <param name="properties">The initial properties for the project instance, if any.</param>
         /// <param name="items">The initial items for the project instance, if any.</param>
+        /// <param name="toolsVersion">The tools version for the project instance.</param>
+        /// <remarks>
+        /// We _could_ pass in BuildRequest/BuildRequestConfiguration for most of this data, but that makes layering/dependency
+        /// tracking of the namespaces more complex, and we don't really need the full objects here.
+        /// </remarks>
         ProjectStartedEventArgs CreateProjectStartedForLocalProject(
             BuildEventContext parentBuildEventContext,
-            BuildRequestConfiguration projectConfiguration,
+            int configurationId,
             string projectFile,
             string targetNames,
+            IDictionary<string, string> globalProperties,
             IEnumerable<DictionaryEntry> properties,
-            IEnumerable<DictionaryEntry> items);
+            IEnumerable<DictionaryEntry> items,
+            string toolsVersion);
 
         /// <summary>
         /// Creates a ProjectStartedEventArgs for a project that was already built on another node, so
-        /// is being served from cache.
+        /// is being served from cache. Unlike the local-build case, we don't have properties/items
+        /// because they were not deserialized from the cache.
         /// </summary>
         /// <param name="currentNodeBuildEventContext">The build event context on the current node.</param>
         /// <param name="remoteNodeEvaluationBuildEventContext">The complete evaluation build event context on the remote node.</param>
         /// <param name="parentBuildEventContext">The parent build event context for the project that is already built.</param>
-        /// <param name="projectConfiguration">The (cached) project configuration of the project that is already built.</param>
+        /// <param name="globalProperties">The global properties for the project instance, from the configuration.</param>
         /// <param name="projectFile">The project file path of the project that is already built.</param>
         /// <param name="targetNames">The target names that were built.</param>
-        /// <param name="properties">The initial properties for the project instance, if any.</param>
-        /// <param name="items">The initial items for the project instance, if any.</param>
+        /// <param name="toolsVersion">The tools version for the project instance.</param>
+        /// <remarks>
+        /// We _could_ pass in BuildRequest/BuildRequestConfiguration for most of this data, but that makes layering/dependency
+        /// tracking of the namespaces more complex, and we don't really need the full objects here.
+        /// </remarks>
         ProjectStartedEventArgs CreateProjectStartedForCachedProject(
             BuildEventContext currentNodeBuildEventContext,
             BuildEventContext remoteNodeEvaluationBuildEventContext,
             BuildEventContext parentBuildEventContext,
-            BuildRequestConfiguration projectConfiguration,
+            IDictionary<string, string> globalProperties,
             string projectFile,
             string targetNames,
-            IEnumerable<DictionaryEntry> properties,
-            IEnumerable<DictionaryEntry> items);
+            string toolsVersion);
 
         /// <summary>
         /// Log that the project has finished