Skip to content

LSP: Fix batch builds for file-based programs and fix "dotnet.projects.binaryLogPath" throwing an exception #78644

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 4 commits into from
May 19, 2025
Merged

LSP: Fix batch builds for file-based programs and fix "dotnet.projects.binaryLogPath" throwing an exception #78644

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81f372a
LSP: Fix crash on opening binlog for write multiple times
RikkiGibson May 16, 2025
86dde81
Address feedback
RikkiGibson May 19, 2025
79fc137
Update src/Workspaces/MSBuild/BuildHost/Build/ProjectBuildManager.cs
RikkiGibson May 19, 2025
c9c0f71
Add more issue references
RikkiGibson May 19, 2025
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
32 changes: 21 additions & 11 deletions src/Workspaces/MSBuild/BuildHost/Build/ProjectBuildManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ private static (MSB.Evaluation.Project? project, DiagnosticLog log) LoadProjectC
{
var projectCollection = new MSB.Evaluation.ProjectCollection(
AllGlobalProperties,
_msbuildLogger != null ? [_msbuildLogger] : ImmutableArray<MSB.Framework.ILogger>.Empty,
// https://github.com/dotnet/msbuild/issues/11867: workaround LoggerException when passing binary logger to both evaluation and build
loggers: [],
MSB.Evaluation.ToolsetDefinitionLocations.Default);
try
{
Expand All @@ -171,18 +172,26 @@ private static (MSB.Evaluation.Project? project, DiagnosticLog log) LoadProjectC
var log = new DiagnosticLog();
try
{
var projectCollection = new MSB.Evaluation.ProjectCollection(
AllGlobalProperties,
_msbuildLogger != null ? [_msbuildLogger] : ImmutableArray<MSB.Framework.ILogger>.Empty,
MSB.Evaluation.ToolsetDefinitionLocations.Default);
try
if (BatchBuildStarted)
{
return LoadProjectCore(path, readStream, projectCollection, log);
return LoadProjectCore(path, readStream, _batchBuildProjectCollection, log);
}
finally
else
{
// unload project so collection will release global strings
projectCollection.UnloadAllProjects();
var projectCollection = new MSB.Evaluation.ProjectCollection(
AllGlobalProperties,
// https://github.com/dotnet/msbuild/issues/11867: workaround LoggerException when passing binary logger to both evaluation and build
loggers: [],
MSB.Evaluation.ToolsetDefinitionLocations.Default);
try
{
return LoadProjectCore(path, readStream, projectCollection, log);
}
finally
{
// unload project so collection will release global strings
projectCollection.UnloadAllProjects();
}
}
}
catch (Exception e)
Expand Down Expand Up @@ -228,7 +237,8 @@ public void StartBatchBuild(IDictionary<string, string>? globalProperties = null
? [_msbuildLogger]
: ImmutableArray<MSB.Framework.ILogger>.Empty;

_batchBuildProjectCollection = new MSB.Evaluation.ProjectCollection(allProperties, loggers, MSB.Evaluation.ToolsetDefinitionLocations.Default);
// Pass empty loggers array to workaround LoggerException when passing binary logger to both evaluation and build. See https://github.com/dotnet/msbuild/issues/11867
_batchBuildProjectCollection = new MSB.Evaluation.ProjectCollection(allProperties, loggers: [], MSB.Evaluation.ToolsetDefinitionLocations.Default);

var buildParameters = new MSB.Execution.BuildParameters(_batchBuildProjectCollection)
{
Expand Down
Loading