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.

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

TL: Fix logs appearance from nuget client/credential provider #9407

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\[?25l
[?25l
[?25h
Build succeeded in 0.0s
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\--interactive
--interactive
[?25l
[?25h
Build succeeded in 0.0s
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\directory/file(1,2,3,4): warning AA0000: [CredentialProvider]
directory/file(1,2,3,4): warning AA0000: [CredentialProvider]
project succeeded with warnings (0.0s)
directory/file(1,2,3,4): warning AA0000: [CredentialProvider]
[?25l
Expand Down
13 changes: 4 additions & 9 deletions src/MSBuild/TerminalLogger/TerminalLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal sealed class TerminalLogger : INodeLogger
{
private const string FilePathPattern = " -> ";
private const char PatternSeparator = '|';
private readonly string _immediateMessagePattern = $@"\[CredentialProvider\]{PatternSeparator}--interactive";
private readonly Regex _immediateMessageRegex = new Regex($@"\[CredentialProvider\]{PatternSeparator}--interactive");
rainersigwald marked this conversation as resolved.
Show resolved Hide resolved

/// <summary>
/// A wrapper over the project context ID passed to us in <see cref="IEventSource"/> logger events.
Expand Down Expand Up @@ -567,7 +567,7 @@ private void MessageRaised(object sender, BuildMessageEventArgs e)
}
}

if (ImmeidateMessageRaised(message))
if (ImmediateMessageRaised(message))
{
RenderImmediateMessage(message);
}
Expand Down Expand Up @@ -596,7 +596,7 @@ private void WarningRaised(object sender, BuildWarningEventArgs e)
threadId: e.ThreadId,
logOutputProperties: null);

if (ImmeidateMessageRaised(message))
if (ImmediateMessageRaised(message))
{
RenderImmediateMessage(message);
}
Expand All @@ -610,12 +610,7 @@ private void WarningRaised(object sender, BuildWarningEventArgs e)
/// </summary>
/// <param name="message">Raised event.</param>
/// <returns>true if marker is detected.</returns>
private bool ImmeidateMessageRaised(string message)
{
Regex regex = new(_immediateMessagePattern);

return regex.IsMatch(message);
}
private bool ImmediateMessageRaised(string message) => _immediateMessageRegex.IsMatch(message);

/// <summary>
/// The <see cref="IEventSource.ErrorRaised"/> callback.
Expand Down