Skip to content

Commit 7a0fefe

Browse files
authored
Make environment-derived properties change opt-in and read at use time (dotnet#7715)
This works around VS test failures in C++ scenarios that expected to see environment variables logged.
1 parent 3db83fd commit 7a0fefe

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

src/Build.UnitTests/BinaryLogger_Tests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public void UnusedEnvironmentVariablesDoNotAppearInBinaryLog()
144144
{
145145
using (TestEnvironment env = TestEnvironment.Create())
146146
{
147+
env.SetEnvironmentVariable("MSBUILDONLYLOGUSEDENVIRONMENTVARIABLES", "1");
147148
env.SetEnvironmentVariable("EnvVar1", "itsValue");
148149
env.SetEnvironmentVariable("EnvVar2", "value2");
149150
env.SetEnvironmentVariable("EnvVar3", "value3");

src/Framework/Traits.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public Traits()
9494
/// <summary>
9595
/// Log all environment variables whether or not they are used in a build in the binary log.
9696
/// </summary>
97-
public readonly bool LogAllEnvironmentVariables = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("MSBUILDLOGALLENVIRONMENTVARIABLES"))
97+
public bool LogAllEnvironmentVariables => string.IsNullOrEmpty(Environment.GetEnvironmentVariable("MSBUILDONLYLOGUSEDENVIRONMENTVARIABLES"))
9898
#if !TASKHOST
9999
&& ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_4)
100100
#endif

0 commit comments

Comments
 (0)