Skip to content

Bypass logcontext validity check #10401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Bypass logcontext validity check #10401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e462e3f
Bypass logcontext validity check
JanKrivanek Jul 17, 2024
0b49e9d
Update from PR comments
JanKrivanek Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Build/BackEnd/Components/Logging/TargetLoggingContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal ProjectTargetInstance Target
/// </summary>
internal void LogTargetBatchFinished(string projectFullPath, bool success, IEnumerable<TaskItem> targetOutputs)
{
ErrorUtilities.VerifyThrow(IsValid, "Should be valid");
this.CheckValidity();

TargetOutputItemsInstanceEnumeratorProxy targetOutputWrapper = null;

Expand All @@ -110,7 +110,7 @@ internal void LogTargetBatchFinished(string projectFullPath, bool success, IEnum
/// </summary>
internal TaskLoggingContext LogTaskBatchStarted(string projectFullPath, ProjectTargetInstanceChild task, string taskAssemblyLocation)
{
ErrorUtilities.VerifyThrow(IsValid, "Should be valid");
this.CheckValidity();

return new TaskLoggingContext(this, projectFullPath, task, taskAssemblyLocation);
}
Expand Down
4 changes: 3 additions & 1 deletion src/Build/BackEnd/Components/RequestBuilder/AssemblyLoadsTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ private void CurrentDomainOnAssemblyLoad(object? sender, AssemblyLoadEventArgs a
if (_loggingContext?.BuildEventContext != null)
{
buildArgs.BuildEventContext = _loggingContext.BuildEventContext;
_loggingContext.LogBuildEvent(buildArgs);
// bypass the logging context validity check: it's possible that the load happened
// on a thread unrelated to the context we're tracking loads in
_loggingContext.LoggingService.LogBuildEvent(buildArgs);
}
_loggingService?.LogBuildEvent(buildArgs);
}
Expand Down