Ensure all evaluation data are in binlogs from file-based apps #49841
Conversation
jjonescz
force-pushed
the
sprint-binlog-eval-2
branch
from
662e468 to
a13354b
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR ensures that both restore and build evaluation data are properly captured in binary logs for file-based applications. Previously, only restore evaluation data was being logged to binlogs, missing build evaluation data.
- Restructures project creation to occur before
BeginBuild()is called to ensure evaluation data is captured - Updates test assertions to verify exactly 2 evaluation events (restore + build) instead of just checking for existence
- Removes conditional
BeginBuild()calls and consolidates to a single call after project creation
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs | Restructures project creation and build initialization to ensure evaluation data is captured in binlogs |
| test/dotnet.Tests/CommandTests/Run/RunFileTests.cs | Updates test to verify exactly 2 evaluation events are logged |
| }; | ||
| var logger = new BinaryLogger | ||
| { | ||
| Parameters = arg.IndexOf(':') is >= 0 and var index |
There was a problem hiding this comment.
Do we need to worry about the source of args being a mutable list that chances between when the Lazy is created and when it evaluates?
There was a problem hiding this comment.
That wouldn't be a problem since the whole args array isn't captured inside the Lazy, only the one concrete immutable string arg is.
| @@ -298,12 +292,17 @@ static Action<IDictionary<string, string>> AddRestoreGlobalProperties(ReadOnlyDi | |||
| var arg = args[i]; | |||
| if (LoggerUtility.IsBinLogArgument(arg)) | |||
| { | |||
| return new BinaryLogger | |||
| // We don't want to create the binlog file until actually needed, hence we wrap this in a Lazy. | |||
There was a problem hiding this comment.
Because commands like dotnet run --no-build -bl should not create the binlog file (or at least that's the existing behavior and there are tests verifying it).
| @@ -261,7 +255,7 @@ public override int Execute() | |||
| Environment.SetEnvironmentVariable(key, value); | |||
| } | |||
|
|
|||
| binaryLogger?.Shutdown(); | |||
| binaryLogger?.Value.ReallyShutdown(); | |||
There was a problem hiding this comment.
I guess this is a method on the facade type, where the ordinary shutdown method doesn't do anything on it?
There was a problem hiding this comment.
Yes, exactly. The facade type is already used like this in other code paths of the RunCommand.
|
/backport to release/10.0.1xx-preview7 |
|
Started backporting to release/10.0.1xx-preview7: https://github.com/dotnet/sdk/actions/runs/16448729729 |
Better fix than #49588.
Currently only restore evaluation data are in the binlogs, not build evaluation data - this PR fixes that.