Skip to content

Don't clear BUILDXL_AUGMENTED_MANIFEST_HANDLE to support shared compilation #11

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
dfederm merged 1 commit into from
Feb 10, 2023
Merged

Don't clear BUILDXL_AUGMENTED_MANIFEST_HANDLE to support shared compilation #11

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
7 changes: 6 additions & 1 deletion src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ namespace Microsoft.Build.BackEnd
/// </summary>
internal class RequestBuilder : IRequestBuilder, IRequestBuilderCallback, IBuildComponent
{
private const string BuildXLAugmentedManifestHandle = "BUILDXL_AUGMENTED_MANIFEST_HANDLE";

/// <summary>
/// The dedicated scheduler object.
/// </summary>
Expand Down Expand Up @@ -1289,7 +1291,10 @@ private void ClearVariablesNotInEnvironment(IDictionary<string, string> savedEnv
{
foreach (KeyValuePair<string, string> entry in currentEnvironment)
{
if (!savedEnvironment.ContainsKey(entry.Key))
// TODO: The BuildXLAugmentedManifestHandle condition is necessary to ensure the
// BuildXLAugmentedManifestHandle environment variable is set when file accesses are reported
// by the VBCSCompilerLogger. Remove it once Roslyn natively reports file accesses to MSBuild.
if (!savedEnvironment.ContainsKey(entry.Key) && !entry.Key.Equals(BuildXLAugmentedManifestHandle))
{
Environment.SetEnvironmentVariable(entry.Key, null);
}
Expand Down