support Dictionary parameter,fix #58

Cysharp · Apr 7, 2021 · 22a073b · 22a073b
1 parent c784d76
commit 22a073b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/sandbox/SingleContainedApp/Program.cs b/sandbox/SingleContainedApp/Program.cs
@@ -240,10 +240,10 @@ public void Hello(
             if (hello == null) hello = DateTime.Now;
             Console.WriteLine(hello);
         }
-        public void Dispose()
+
+        void IDisposable.Dispose()
         {
-            Console.WriteLine("DISPOSE!");
+            throw new NotImplementedException();
         }
-
     }
 }
diff --git a/src/ConsoleAppFramework/ConsoleAppEngine.cs b/src/ConsoleAppFramework/ConsoleAppEngine.cs
@@ -271,7 +271,7 @@ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsO
                                 return false;
                             }
                         }
-                        else if (typeof(System.Collections.IEnumerable).IsAssignableFrom(parameters[i].ParameterType))
+                        else if (typeof(System.Collections.IEnumerable).IsAssignableFrom(parameters[i].ParameterType) && !typeof(System.Collections.IDictionary).IsAssignableFrom(parameters[i].ParameterType))
                         {
                             var v = value.Value;
                             if (!(v.StartsWith("[") && v.EndsWith("]")))

diff --git a/tests/ConsoleAppFramework.Tests/ParameterCheckTest.cs b/tests/ConsoleAppFramework.Tests/ParameterCheckTest.cs
@@ -0,0 +1,46 @@
+using FluentAssertions;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ConsoleAppFramework.Tests
+{
+    public class ParameterCheckTest
+    {
+        ITestOutputHelper testOutput;
+
+        public ParameterCheckTest(ITestOutputHelper testOutput)
+        {
+            this.testOutput = testOutput;
+        }
+
+        public class DictionaryCheck : ConsoleAppBase
+        {
+            public void Hello(Dictionary<string, string> q)
+            {
+
+                foreach (var item in q)
+                {
+                    Context.Logger.LogInformation($"{item.Key}:{item.Value}");
+                }
+            }
+        }
+
+        [Fact]
+        public async Task DictParse()
+        {
+            var args = @"-q {""Key1"":""Value1*""}".Split(' ');
+
+            var log = new LogStack();
+            await new HostBuilder()
+                .ConfigureTestLogging(testOutput, log, true)
+                .RunConsoleAppFrameworkAsync<DictionaryCheck>(args);
+
+            log.InfoLogShouldBe(0, "Key1:Value1*");
+        }
+    }
+}