Embed solution node into a graph by VolPlita · Pull Request #14407 · dotnet/msbuild

VolPlita · 2026-07-17T09:32:58Z

Context

Graph builds for solutions did not consistently model/execute a solution node as the single entrypoint, and graph-mode binlog behavior around the solution-level execution path needed to be aligned.

Changes Made

Added a synthetic solution node in graph construction and set it as the only entry/root node for solution graph builds.
Wired synthetic node dependencies to all solution projects so scheduler executes projects first, then solution last.
Updated graph target inference/execution plumbing to handle synthetic entry nodes while keeping project node results behavior intact.
Suppressed inner solution redispatch in graph mode via IsGraphBuild task conditions so hooks/imports run without rebuilding already-built projects.
Updated binlog import collection to include solution path from graph solution execution.
Added/updated targeted unit tests for BuildManager, Graph, and BinaryLogger coverage.

Testing

.\build.cmd
Repro: build a tiny solution with graph mode + binlog and verify solution presence/order in with-graph.binlog
- & <local-msbuild> .\tiny-graph.sln -graph -bl:with-graph.binlog

Notes

Copilot

Pull request overview

This PR adjusts solution graph builds so they model a .sln as a single synthetic entry/root node, enabling solution-level execution (including before/after.<sln>.targets hooks) while still building solution projects through the static graph scheduler, and ensuring the solution file is captured in graph-mode binlog import collection.

Changes:

Add a synthetic solution node during graph construction and make it the sole entry/root node for solution graph builds.
Update graph target inference and BuildManager graph scheduling to recognize/execute the synthetic solution node while keeping per-project node results behavior.
Extend binary logger import collection and add/adjust unit tests for graph + binlog solution behavior.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/Build/Logging/BinaryLogger/BinaryLogger.cs	Adds solution-path import collection during `ProjectStarted` to embed the `.sln` in ProjectImports.
src/Build/Graph/ProjectGraph.cs	Adjusts target inference to account for entry points that are not buildable project nodes (synthetic solution node).
src/Build/Graph/GraphBuilder.cs	Constructs a synthetic solution `ProjectGraphNode` and wires it to depend on all solution projects.
src/Build/Construction/Solution/SolutionProjectGenerator.cs	Conditions solution traversal `MSBuild` tasks to avoid redispatching projects during graph builds.
src/Build/BackEnd/BuildManager/BuildManager.cs	Executes the synthetic solution node in graph scheduling and treats its failure as submission failure while excluding it from per-node results.
src/Build.UnitTests/Graph/ProjectGraph_Tests.cs	Updates expectations for solution graphs now having a single `.sln` entry/root node.
src/Build.UnitTests/Graph/GraphLoadedFromSolution_tests.cs	Updates assertions to reflect the synthetic `.sln` entry/root node model.
src/Build.UnitTests/BinaryLogger_Tests.cs	Adds a test asserting graph solution builds embed the solution file into ProjectImports zip.
src/Build.UnitTests/BackEnd/BuildManager_Tests.cs	Adds a test covering synthetic solution node execution and solution hook execution in graph mode.

+                if (projectArgs.GlobalProperties?.TryGetValue("SolutionPath", out string solutionPath) == true &&
+                    !string.IsNullOrEmpty(solutionPath))
+                {
+                    projectImportsCollector.AddFile(EscapingUtilities.UnescapeAll(solutionPath));
+                }


+            string projectMatchCondition = Strings.WeakIntern($"'%(ProjectReference.Identity)' == '{GetMetaprojectName(project)}'");
+            string combinedCondition = $"({projectMatchCondition}) and {NotGraphBuildCondition}";
+            ProjectTaskInstance task = target.AddTask("MSBuild", combinedCondition, String.Empty);


+                if (Solution != null && !projectNodeSet.Contains(entryPointNode))
+                {
+                    return ["Build"];
+                }


+            if (syntheticSolutionNodeResult?.OverallResult == BuildResultCode.Failure)
+            {
+                graphBuildResult.Exception = syntheticSolutionNodeResult.Exception
+                    ?? new InvalidOperationException("Synthetic solution graph node execution failed.");
+            }


rainersigwald · 2026-07-17T22:06:23Z

+            _logger.AssertLogContains("AfterSolutionHookRan");
+        }


I think this would catch my big problem . . .

rainersigwald

Repro: build a tiny solution with graph mode + binlog and verify solution presence/order in with-graph.binlog

& <local-msbuild> .\tiny-graph.sln -graph -bl:with-graph.binlog

Try this again, please, I think it shows a problem (that the projects aren't actually building):

❯ dotnet msbuild -graph -bl
    info NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy
  Console1 net11.0 succeeded (1.3s) → Console1\bin\Debug\net11.0\Console1.dll
  Lib1 net11.0 succeeded (0.2s) → Lib1\bin\Debug\net11.0\Lib1.dll

Build succeeded in 3.2s

❯ S:\msbuild\artifacts\bin\bootstrap\core\dotnet.exe msbuild -graph -bl

Build succeeded in 0.0s

rainersigwald · 2026-07-17T21:48:04Z

+                if (projectArgs.GlobalProperties?.TryGetValue("SolutionPath", out string solutionPath) == true &&
+                    !string.IsNullOrEmpty(solutionPath))
+                {
+                    projectImportsCollector.AddFile(EscapingUtilities.UnescapeAll(solutionPath));


Hm--this works, but I don't like it. Can you trace why the sln is getting into the non-graph binlog (my guess is as an actual ProjectStartedEventArgs path) and replicate that for the graph path?

rainersigwald · 2026-07-17T21:52:21Z

        private static void AddReferencesBuildTask(ProjectTargetInstance target, string targetToBuild, string outputItem)
        {
-            ProjectTaskInstance task = target.AddTask("MSBuild", String.Empty, String.Empty);
+            ProjectTaskInstance task = target.AddTask("MSBuild", NotGraphBuildCondition, String.Empty);


Question I'd like you to look at deeply for onboarding: should this be a condition on the target, or on the tasks within? The relevant reference doc is https://learn.microsoft.com/visualstudio/msbuild/target-build-order.

rainersigwald · 2026-07-17T21:57:29Z

        private readonly ProjectGraph.ProjectInstanceFactoryFunc _projectInstanceFactory;
        private readonly ProjectGraphMode _graphMode;
        private IReadOnlyDictionary<string, IReadOnlyCollection<string>> _solutionDependencies;
+        private ImmutableDictionary<string, string> _solutionGlobalProperties;


I don't think I understand why these need to be preserved at the graph level, can you expand on that (or avoid it?)?

rainersigwald · 2026-07-17T22:02:19Z

+                syntheticSolutionInstance = new ProjectInstance(
+                    syntheticRootElement,
+                    solutionGlobalProperties,
+                    toolsVersion: null,
+                    _projectCollection);


Can you get the instance out of the SolutionProjectGenerator instead of reconstructing one here?

rainersigwald · 2026-07-17T22:06:23Z

+            _logger.AssertLogContains("AfterSolutionHookRan");
+        }


I think this would catch my big problem . . .

VolPlita requested a review from Copilot July 17, 2026 09:33

VolPlita assigned rainersigwald Jul 17, 2026

Copilot started reviewing on behalf of VolPlita July 17, 2026 09:33 View session

embed solution node into a graph

85c9f04

VolPlita force-pushed the fix-8170-add-solution-node-graph branch from 07153ac to 85c9f04 Compare July 17, 2026 09:37

VolPlita unassigned rainersigwald Jul 17, 2026

VolPlita requested a review from rainersigwald July 17, 2026 09:37

VolPlita self-assigned this Jul 17, 2026

Copilot AI reviewed Jul 17, 2026

View reviewed changes

rainersigwald requested changes Jul 17, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Embed solution node into a graph#14407

Embed solution node into a graph#14407
VolPlita wants to merge 1 commit into
dotnet:mainfrom
VolPlita:fix-8170-add-solution-node-graph

VolPlita commented Jul 17, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

rainersigwald left a comment •

edited

Loading

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

rainersigwald Jul 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

VolPlita commented Jul 17, 2026

Context

Changes Made

Testing

Notes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

rainersigwald left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

rainersigwald Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rainersigwald left a comment •

edited

Loading