[xbuild] Fix bug #665004. Honor /nologo option.

* tools/xbuild/Parameters.cs (DisplayVersion): Remove, not required.

diff --git a/mcs/tools/xbuild/Main.cs b/mcs/tools/xbuild/Main.cs
index 88fc1b7f49329daaae045c0bac7f33b79f340890..00384779b0a70c1ce8aa939da0d2da2812bf07ab 100644 (file)
--- a/mcs/tools/xbuild/Main.cs
+++ b/mcs/tools/xbuild/Main.cs
@@ -76,7 +76,7 @@ namespace Mono.XBuild.CommandLine {
                                show_stacktrace = (parameters.LoggerVerbosity == LoggerVerbosity.Detailed ||
                                        parameters.LoggerVerbosity == LoggerVerbosity.Diagnostic);
                                
-                               if (parameters.DisplayVersion)
+                               if (!parameters.NoLogo)
                                        ErrorUtilities.ShowVersion (false);
                                
                                engine  = Engine.GlobalEngine;

diff --git a/mcs/tools/xbuild/Parameters.cs b/mcs/tools/xbuild/Parameters.cs
index beabc9f8108ca0d1dbc45ce77fb7830fe1951ed9..6932907ecabb25ada3d97bbe5820b139e41df658 100644 (file)
--- a/mcs/tools/xbuild/Parameters.cs
+++ b/mcs/tools/xbuild/Parameters.cs
@@ -43,7 +43,6 @@ namespace Mono.XBuild.CommandLine {
        
                string                  consoleLoggerParameters;
                bool                    displayHelp;
-               bool                    displayVersion;
                IList                   flatArguments;
                IList                   loggers;
                LoggerVerbosity         loggerVerbosity;
@@ -64,7 +63,6 @@ namespace Mono.XBuild.CommandLine {
                {
                        consoleLoggerParameters = "";
                        displayHelp = false;
-                       displayVersion = true;
                        loggers = new ArrayList ();
                        loggerVerbosity = LoggerVerbosity.Normal;
                        noConsoleLogger = false;
@@ -354,10 +352,6 @@ namespace Mono.XBuild.CommandLine {
                        get { return noLogo; }
                }
                
-               public bool DisplayVersion {
-                       get { return displayVersion; }
-               }
-               
                public string ProjectFile {
                        get { return projectFile; }
                }