From b495a722fe111a9de08b41a0146d060dbcca5981 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 17 Feb 2017 13:32:13 -0500 Subject: [PATCH] [xbuild] Show the deprecation notice with logo, and so hide it with (#4399) `/nologo`. It is not controlled by logging levels now. But we also show the deprecation notice if we couldn't parse the arguments, which would be more likely to be noticed by a user. --- mcs/tools/xbuild/Main.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mcs/tools/xbuild/Main.cs b/mcs/tools/xbuild/Main.cs index e81574d2787..3fe5475097d 100644 --- a/mcs/tools/xbuild/Main.cs +++ b/mcs/tools/xbuild/Main.cs @@ -82,12 +82,13 @@ namespace Mono.XBuild.CommandLine { throw; } - ShowDeprecationNotice (); show_stacktrace = (parameters.LoggerVerbosity == LoggerVerbosity.Detailed || parameters.LoggerVerbosity == LoggerVerbosity.Diagnostic); - if (!parameters.NoLogo) + if (!parameters.NoLogo) { + ShowDeprecationNotice (); ErrorUtilities.ShowVersion (false); + } engine = Engine.GlobalEngine; if (!String.IsNullOrEmpty (parameters.ToolsVersion)) { @@ -175,13 +176,11 @@ namespace Mono.XBuild.CommandLine { void ShowDeprecationNotice () { - if (parameters.LoggerVerbosity != LoggerVerbosity.Minimal && parameters.LoggerVerbosity != LoggerVerbosity.Quiet) { - Console.ForegroundColor = ConsoleColor.DarkRed; - Console.WriteLine (); - Console.WriteLine (">>>> xbuild tool is deprecated and will be removed in future updates, use msbuild instead <<<<"); - Console.WriteLine (); - Console.ResetColor (); - } + Console.ForegroundColor = ConsoleColor.DarkRed; + Console.WriteLine (); + Console.WriteLine (">>>> xbuild tool is deprecated and will be removed in future updates, use msbuild instead <<<<"); + Console.WriteLine (); + Console.ResetColor (); } } -- 2.25.1