Remove CmdParser.GetConsoleWindowWidth. (#879)

This method is available on the Console class, thus we don't need to have our own API for it. Fix #878.

Author: eerhardt

src/Microsoft.ML.Core/CommandLine/CmdParser.cs

@@ -503,70 +503,6 @@ public static string ArgumentsUsage(IHostEnvironment env, Type type, object defa
             return parser.GetUsageString(env, info, showRsp, columns);
         }
 
-#if CORECLR
-        /// <summary>
-        /// Fix the window width for the Core build to remove the kernel32.dll dependency.
-        /// </summary>
-        /// <returns></returns>
-        public static int GetConsoleWindowWidth()
-        {
-            return 120;
-        }
-#else
-        private const int StdOutputHandle = -11;
-
-        private struct Coord
-        {
-            internal Int16 X;
-            internal Int16 Y;
-        }
-
-        private struct SmallRect
-        {
-            internal Int16 Left;
-            internal Int16 Top;
-            internal Int16 Right;
-            internal Int16 Bottom;
-        }
-
-        private struct ConsoleScreenBufferInfo
-        {
-            internal Coord DwSize;
-            internal Coord DwCursorPosition;
-            internal Int16 WAttributes;
-            internal SmallRect SrWindow;
-            internal Coord DwMaximumWindowSize;
-        }
-
-        [DllImport("kernel32.dll", EntryPoint = "GetStdHandle", SetLastError = true, CharSet = CharSet.Unicode, CallingConvention = CallingConvention.StdCall)]
-        private static extern int GetStdHandle(int nStdHandle);
-
-        [DllImport("kernel32.dll", EntryPoint = "GetConsoleScreenBufferInfo", SetLastError = true, CharSet = CharSet.Unicode, CallingConvention = CallingConvention.StdCall)]
-        private static extern int GetConsoleScreenBufferInfo(int hConsoleOutput, ref ConsoleScreenBufferInfo lpConsoleScreenBufferInfo);
-
-        /// <summary>
-        /// Returns the number of columns in the current console window
-        /// </summary>
-        /// <returns>Returns the number of columns in the current console window</returns>
-        public static int GetConsoleWindowWidth()
-        {
-            int screenWidth;
-            ConsoleScreenBufferInfo csbi = new ConsoleScreenBufferInfo();
-            // Just to remove the warning messages...
-            csbi.DwCursorPosition.X = 0;
-            csbi.DwCursorPosition.Y = 0;
-            csbi.SrWindow.Bottom = 0;
-            csbi.SrWindow.Top = 0;
-            csbi.SrWindow.Left = 0;
-            csbi.SrWindow.Right = 0;
-
-            int rc;
-            rc = GetConsoleScreenBufferInfo(GetStdHandle(StdOutputHandle), ref csbi);
-            screenWidth = csbi.DwSize.X;
-            return screenWidth;
-        }
-#endif
-
         private CmdParser(IHostEnvironment env)
         {
             _host = env.Register("CmdParser");
@@ -1009,7 +945,7 @@ public ArgumentHelpStrings(string syntax, string help)
         /// </summary>
         private string GetUsageString(IExceptionContext ectx, ArgumentInfo info, bool showRsp = true, int? columns = null)
         {
-            int screenWidth = columns ?? GetConsoleWindowWidth();
+            int screenWidth = columns ?? Console.BufferWidth;
             if (screenWidth <= 0)
                 screenWidth = 80;
 

src/Microsoft.ML.Maml/HelpCommand.cs

@@ -343,9 +343,9 @@ private void ShowFormattedSummary(IndentingTextWriter writer, string summary, in
                 return;
 
             // REVIEW: should we replace consecutive spaces with a single space as a preprocessing step?
-            int screenWidth = (columns ?? CmdParser.GetConsoleWindowWidth()) - 1;
+            int screenWidth = (columns ?? Console.BufferWidth) - 1;
 
-            // GetConsoleWindowWidth returns 0 if command redirection operator is used
+            // Console.BufferWidth returns 0 if command redirection operator is used
             if (screenWidth <= 0)
                 screenWidth = 80;