Skip to content
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

Jump to bottom

Avoid BuildHost crash in Mono due to missing types #74392

Closed
wants to merge 1 commit into from
Closed

Avoid BuildHost crash in Mono due to missing types #74392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/Workspaces/Core/MSBuild.BuildHost/BuildHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,18 @@ private void EnsureMSBuildLoaded(string projectFilePath)
/// <summary>
/// Returns the target ID of the <see cref="ProjectFile"/> object created for this.
/// </summary>
public async Task<int> LoadProjectFileAsync(string projectFilePath, string languageName, CancellationToken cancellationToken)
public Task<int> LoadProjectFileAsync(string projectFilePath, string languageName, CancellationToken cancellationToken)
{
EnsureMSBuildLoaded(projectFilePath);
return LoadProjectFileCoreAsync(projectFilePath, languageName, cancellationToken);
}

// When using the Mono runtime, the MSBuild types used in this method must be available
// to the JIT during compilation of the method, so they have to be loaded by the caller;
// therefore this method must not be inlined.
[MethodImpl(MethodImplOptions.NoInlining)]
private async Task<int> LoadProjectFileCoreAsync(string projectFilePath, string languageName, CancellationToken cancellationToken)
{
CreateBuildManager();

ProjectFileLoader projectLoader = languageName switch
Expand Down
Loading