Skip to content

Adding a private indicator for the activation of the terminal logger #10423

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 8 commits into from
Jul 29, 2024
Merged

Adding a private indicator for the activation of the terminal logger #10423

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e0442a
Adding a private indicator for the activation of the terminal logger
MichalPavlik Jul 22, 2024
658024b
Fixed ProcessInvalidTargetSwitch test
MichalPavlik Jul 23, 2024
b487862
Fixed more tests
MichalPavlik Jul 23, 2024
048e8b5
Fixed MSBuildEngineLogger test
MichalPavlik Jul 24, 2024
20c7369
Additional tests fix
MichalPavlik Jul 24, 2024
4bd150f
Removed unnecessary empty lines
MichalPavlik Jul 24, 2024
f3eab02
Merge branch 'main' into dev/mipavlik/enabled-tl-indication
MichalPavlik Jul 25, 2024
3a2e19b
"Final" test fix
MichalPavlik Jul 25, 2024
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
1 change: 1 addition & 0 deletions src/Build.UnitTests/Utilities_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void CommentsInPreprocessing()
TransientTestFile outputFile = env.CreateFile("tempOutput.tmp");

env.SetEnvironmentVariable("MSBUILDLOADALLFILESASWRITEABLE", "1");
env.SetEnvironmentVariable("_MSBUILDTLENABLED", "0");

#if FEATURE_GET_COMMANDLINE
MSBuildApp.Execute(@"c:\bin\msbuild.exe """ + inputFile.Path +
Expand Down
2 changes: 2 additions & 0 deletions src/MSBuild.UnitTests/CommandLineSwitches_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,8 @@ public void ProcessInvalidTargetSwitch()
</Project>
""";
using TestEnvironment testEnvironment = TestEnvironment.Create();
testEnvironment.SetEnvironmentVariable("_MSBUILDTLENABLED", "0");

string project = testEnvironment.CreateTestProjectWithFiles("project.proj", projectContent).ProjectFile;

#if FEATURE_GET_COMMANDLINE
Expand Down
3 changes: 3 additions & 0 deletions src/MSBuild.UnitTests/XMake_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,8 @@ public void VersionSwitchDisableChangeWave()
public void ErrorCommandLine()
{
string oldValueForMSBuildLoadMicrosoftTargetsReadOnly = Environment.GetEnvironmentVariable("MSBuildLoadMicrosoftTargetsReadOnly");
string oldValueForMSBuildTLEnabled = Environment.GetEnvironmentVariable("_MSBUILDTLENABLED");

#if FEATURE_GET_COMMANDLINE
MSBuildApp.Execute(@"c:\bin\msbuild.exe -junk").ShouldBe(MSBuildApp.ExitType.SwitchError);

Expand All @@ -627,6 +629,7 @@ public void ErrorCommandLine()
MSBuildApp.Execute(new[] { @"msbuild.exe", "@bogus.rsp" }).ShouldBe(MSBuildApp.ExitType.InitializationError);
#endif
Environment.SetEnvironmentVariable("MSBuildLoadMicrosoftTargetsReadOnly", oldValueForMSBuildLoadMicrosoftTargetsReadOnly);
Environment.SetEnvironmentVariable("_MSBUILDTLENABLED", oldValueForMSBuildTLEnabled);
}

[Fact]
Expand Down
5 changes: 5 additions & 0 deletions src/MSBuild/XMake.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2516,6 +2516,11 @@ private static bool ProcessCommandLineSwitches(
#endif

bool useTerminalLogger = ProcessTerminalLoggerConfiguration(commandLineSwitches, out string aggregatedTerminalLoggerParameters);

// This is temporary until we can remove the need for the environment variable.
// DO NOT use this environment variable for any new features as it will be removed without further notice.
Environment.SetEnvironmentVariable("_MSBUILDTLENABLED", useTerminalLogger ? "1" : "0");

DisplayVersionMessageIfNeeded(recursing, useTerminalLogger, commandLineSwitches);

// Idle priority would prevent the build from proceeding as the user does normal actions.
Expand Down