Fixed issue involving oddball Windows pre-processing of command lines. Minor cleanup.

Author: markolbert

Binder/J4JCommandLineExtensions.cs

@@ -4,6 +4,17 @@ namespace J4JSoftware.Configuration.CommandLine
 {
     public static class J4JCommandLineExtensions
     {
+        public static IConfigurationBuilder AddJ4JCommandLine(
+            this IConfigurationBuilder builder,
+            IOptionCollection options)
+        {
+            var rawCmdLine = new RawCommandLine();
+
+            builder.Add(new J4JCommandLineSource(options, rawCmdLine.GetRawCommandLine()));
+
+            return builder;
+        }
+
         public static IConfigurationBuilder AddJ4JCommandLine(
             this IConfigurationBuilder builder,
             string cmdLine,

Binder/J4JCommandLineSource.cs

@@ -1,6 +1,4 @@
-using System;
-using J4JSoftware.Logging;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 
 namespace J4JSoftware.Configuration.CommandLine
 {

Binder/RawCommandLine.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace J4JSoftware.Configuration.CommandLine
+{
+    public class RawCommandLine 
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto)]
+        private static extern IntPtr GetCommandLine();
+
+        private readonly bool _useKernel32;
+
+        public RawCommandLine()
+        {
+            _useKernel32 = Environment.OSVersion.Platform switch
+            {
+                PlatformID.Win32NT => true,
+                PlatformID.Win32S => true,
+                PlatformID.Win32Windows => true,
+                PlatformID.WinCE => true,
+                _ => false
+            };
+        }
+
+        public string GetRawCommandLine()
+        {
+            if( !_useKernel32 ) 
+                return Environment.CommandLine;
+
+            IntPtr ptr = GetCommandLine();
+
+            return Marshal.PtrToStringAuto( ptr )!;
+        }
+    }
+}

Binder/master-text/MasterTextCollection.static.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using J4JSoftware.Logging;
 
 namespace J4JSoftware.Configuration.CommandLine