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

Re-Revert "MSBuild server V1" #18263

Merged
merged 1 commit into from
Jun 14, 2021
Merged

Re-Revert "MSBuild server V1" #18263

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace Microsoft.DotNet.Cli.Utils
internal class MSBuildForwardingAppWithoutLogging
{
private static readonly bool AlwaysExecuteMSBuildOutOfProc = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_RUN_MSBUILD_OUTOFPROC");
private static readonly bool DoNotUseMSBUILDNOINPROCNODE = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_DO_NOT_USE_MSBUILDNOINPROCNODE");

private const string MSBuildExeName = "MSBuild.dll";

Expand Down Expand Up @@ -53,6 +54,13 @@ public MSBuildForwardingAppWithoutLogging(IEnumerable<string> argsToForward, str
_argsToForward = argsToForward;
MSBuildPath = msbuildPath ?? defaultMSBuildPath;

if (!DoNotUseMSBUILDNOINPROCNODE)
{
// Force MSBuild to use external working node long living process for building projects
// We also refers to this as MSBuild Server V1 as entry process forwards most of the work to it.
EnvironmentVariable("MSBUILDNOINPROCNODE", "1");
}

// If DOTNET_CLI_RUN_MSBUILD_OUTOFPROC is set or we're asked to execute a non-default binary, call MSBuild out-of-proc.
if (AlwaysExecuteMSBuildOutOfProc || !string.Equals(MSBuildPath, defaultMSBuildPath, StringComparison.OrdinalIgnoreCase))
{
Expand Down Expand Up @@ -92,6 +100,8 @@ public void EnvironmentVariable(string name, string value)

if (value == string.Empty || value == "\0")
{
// Do not allow MSBuild NOIPROCNODE as null env vars are not properly transferred to build nodes
_msbuildRequiredEnvironmentVariables["MSBUILDNOINPROCNODE"] = "0";
// Unlike ProcessStartInfo.EnvironmentVariables, Environment.SetEnvironmentVariable can't set a variable
// to an empty value, so we just fall back to calling MSBuild out-of-proc if we encounter this case.
// https://github.com/dotnet/runtime/issues/50554
Expand Down