bug fix: drop support for < net46 and fix for finding dotnet.exe when DOTNET_ROOT is not set (#526)

Author: danmoseley

src/CommandLineUtils/Abstractions/ValueParserProvider.cs

@@ -61,7 +61,7 @@ private static readonly MethodInfo s_getParserGeneric
         public IValueParser GetParser(Type type)
         {
             var method = s_getParserGeneric.MakeGenericMethod(type);
-            return (IValueParser)method.Invoke(this, Util.EmptyArray<object>());
+            return (IValueParser)method.Invoke(this, Array.Empty<object>());
         }
 
         /// <summary>

src/CommandLineUtils/Attributes/CommandAttribute.cs

@@ -14,7 +14,7 @@ namespace McMaster.Extensions.CommandLineUtils
     [AttributeUsage(AttributeTargets.Class)]
     public sealed class CommandAttribute : Attribute
     {
-        private string[] _names = Util.EmptyArray<string>();
+        private string[] _names = Array.Empty<string>();
 
         /// <summary>
         /// Initializes a new <see cref="CommandAttribute"/>.
@@ -55,7 +55,7 @@ public string? Name
                 }
                 else
                 {
-                    _names = Util.EmptyArray<string>();
+                    _names = Array.Empty<string>();
                 }
             }
         }

src/CommandLineUtils/Attributes/VersionOptionFromMemberAttribute.cs

@@ -60,7 +60,7 @@ internal CommandOption Configure(CommandLineApplication app, Type type, Func<obj
 
                 shortFormGetter = () =>
                 {
-                    return (string)methods[0].Invoke(targetInstanceFactory.Invoke(), Util.EmptyArray<object>());
+                    return (string)methods[0].Invoke(targetInstanceFactory.Invoke(), Array.Empty<object>());
                 };
             }
 

src/CommandLineUtils/CommandLineApplication.Execute.cs

@@ -129,7 +129,7 @@ public static int Execute<TApp>(params string[] args)
         public static int Execute<TApp>(IConsole console, params string[] args)
             where TApp : class
         {
-            args ??= Util.EmptyArray<string>();
+            args ??= Array.Empty<string>();
             var context = new DefaultCommandLineContext(console, Directory.GetCurrentDirectory(), args);
             return Execute<TApp>(context);
         }
@@ -168,7 +168,7 @@ public static Task<int> ExecuteAsync<TApp>(string[] args, CancellationToken canc
 #pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
         where TApp : class
         {
-            args ??= Util.EmptyArray<string>();
+            args ??= Array.Empty<string>();
             var context = new DefaultCommandLineContext(PhysicalConsole.Singleton, Directory.GetCurrentDirectory(), args);
             return ExecuteAsync<TApp>(context, cancellationToken);
         }
@@ -189,7 +189,7 @@ public static Task<int> ExecuteAsync<TApp>(string[] args, CancellationToken canc
         public static Task<int> ExecuteAsync<TApp>(IConsole console, params string[] args)
             where TApp : class
         {
-            args ??= Util.EmptyArray<string>();
+            args ??= Array.Empty<string>();
             var context = new DefaultCommandLineContext(console, Directory.GetCurrentDirectory(), args);
             return ExecuteAsync<TApp>(context);
         }

src/CommandLineUtils/CommandLineApplication.cs

@@ -748,7 +748,7 @@ public ParseResult Parse(params string[] args)
         {
             Reset();
 
-            args ??= Util.EmptyArray<string>();
+            args ??= Array.Empty<string>();
 
             var processor = new CommandLineProcessor(this, args);
             var result = processor.Process();

src/CommandLineUtils/Conventions/OptionAttributeConventionBase.cs

@@ -131,7 +131,7 @@ private protected void AddOption(ConventionContext context, CommandOption option
                         {
                             if (!option.HasValue())
                             {
-                                setter.Invoke(modelAccessor.GetModel(), Util.EmptyArray<bool>());
+                                setter.Invoke(modelAccessor.GetModel(), Array.Empty<bool>());
                             }
 
                             var count = new bool[option.Values.Count];

src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs

@@ -413,7 +413,7 @@ private string[] ExtractNamesFromEnum(Type? type)
         {
             if (type == null)
             {
-                return Util.EmptyArray<string>();
+                return Array.Empty<string>();
             }
 
             if (ReflectionHelper.IsNullableType(type, out var wrappedType))
@@ -431,7 +431,7 @@ private string[] ExtractNamesFromEnum(Type? type)
                 return Enum.GetNames(type);
             }
 
-            return Util.EmptyArray<string>();
+            return Array.Empty<string>();
         }
     }
 }

src/CommandLineUtils/IO/Pager.cs

@@ -42,10 +42,10 @@ public Pager(IConsole console)
                 throw new ArgumentNullException(nameof(console));
             }
 
-#if NET45
+#if NET46_OR_GREATER
             // if .NET Framework, assume we're on Windows unless it's running on Mono.
             _enabled = Type.GetType("Mono.Runtime") != null;
-#elif NETSTANDARD2_0 || NETSTANDARD2_1
+#elif NETSTANDARD2_0_OR_GREATER
             _enabled = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !console.IsOutputRedirected;
 #else
 #error Update target frameworks
@@ -130,7 +130,7 @@ public void Kill()
                     FileName = "less",
                     Arguments = ArgumentEscaper.EscapeAndConcatenate(args),
                     RedirectStandardInput = true,
-#if NET45
+#if NET46_OR_GREATER
                     UseShellExecute = false,
 #endif
                 }

src/CommandLineUtils/Internal/Util.cs

@@ -25,7 +25,7 @@ public HashSetParser(Type elementType, IValueParser elementParser, CultureInfo p
 
         public object Parse(string? argName, IReadOnlyList<string?> values)
         {
-            var set = Activator.CreateInstance(_listType, Util.EmptyArray<object>());
+            var set = Activator.CreateInstance(_listType, Array.Empty<object>());
             foreach (var t in values)
             {
                 _addMethod.Invoke(set, new[] { _elementParser.Parse(argName, t, _parserCulture) });