Merge pull request #286 from Azure/clu

Clu

Author: huangpf

src/CLU/Microsoft.CLU/CommandBinder/CmdletBinderAndCommand.cs

@@ -342,6 +342,18 @@ private void BindDynamicParameters()
                 // If Cmdlet instance support dynamic parameters then rerun the parser to bind dynamic parameters.
                 _dynamicParameterBindInProgress = true;
                 this.ParserSeekBeginAndRun();
+                var psCmdlet = _cmdlet as PSCmdlet;
+                if (psCmdlet != null)
+                {
+                    // We need to add all dynamic parameters that were bound
+                    foreach (var boundParam in _cmdletMetadata.Instance.Parameters)
+                    {
+                        if (boundParam.Value.IsBound && boundParam.Value.IsDynamic && !psCmdlet.MyInvocation.BoundParameters.ContainsKey(boundParam.Value.Name))
+                        {
+                            psCmdlet.MyInvocation.BoundParameters[boundParam.Value.Name] = boundParam.Value;
+                        }
+                    }
+                }
                 _dynamicParameterBindInProgress = false;
             }
         }

src/CLU/Microsoft.CLU/Metadata/CmdletMetadata.cs

@@ -17,7 +17,7 @@ internal class CmdletMetadata
         /// <summary>
         /// The metadata information of the cmdlet instance.
         /// </summary>
-        public InstanceMetadata Instance { get; set; }
+        public InstanceMetadata Instance { get; private set; }
 
         /// <summary>
         /// Creates an instance of CmdletMetadata.

src/CLU/Microsoft.CLU/Metadata/InstanceMetadata.cs

@@ -51,7 +51,7 @@ public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets
             }
         }
 
-        Dictionary<string, ParameterMetadata> _dynamicParameters;
+        Dictionary<string, ParameterMetadata> _dynamicParameters = new Dictionary<string, ParameterMetadata>();
         /// <summary>
         /// Get dynamic parameter metadata dictionary. The key is name of the dynamic
         /// parameter and value is the dynamic parameter metadata.

src/CLU/Microsoft.CLU/System.Management.Automation/CmdletInfo.cs

@@ -1,6 +1,8 @@
-using System.Collections.ObjectModel;
+using Microsoft.CLU.Metadata;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
+using System.Collections.Generic;
 
 namespace System.Management.Automation
 {
@@ -25,6 +27,9 @@ internal CmdletInfo(Type cmdlet, PSModuleInfo module, ICommandRuntime runtime, s
                 cmdlet.GetTypeInfo().GetCustomAttributes(typeof(OutputTypeAttribute), true)
                 .Select(a => a as OutputTypeAttribute)
                 .SelectMany(ot => ot.Type).ToList());
+
+            _typeMetadata = new TypeMetadata(cmdlet);
+            _typeMetadata.Load();
         }
 
         public string Noun
@@ -37,6 +42,13 @@ public string Verb
             get; private set;
         }
 
+        public override Dictionary<string, ParameterMetadata> Parameters
+        {
+            get
+            {
+                return _typeMetadata.Parameters;
+            }
+        }
         public override ReadOnlyCollection<PSTypeName> OutputType
         {
             get
@@ -67,6 +79,7 @@ public override string ToString()
             return Name;
         }
 
+        private TypeMetadata _typeMetadata;
         private ReadOnlyCollection<PSTypeName> _outputTypes;
     }
 }

src/CLU/Microsoft.CLU/System.Management.Automation/CommandInfo.cs

@@ -8,8 +8,8 @@ public abstract class CommandInfo
         public CommandTypes CommandType { get { return CommandTypes.Cmdlet; } }
         public string Name { get; protected set; }
         public abstract ReadOnlyCollection<PSTypeName> OutputType { get;  }
-        public virtual Dictionary<string, ParameterMetadata> Parameters { get; private set; }
-        public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets { get; protected set; }
+        public virtual Dictionary<string, ParameterMetadata> Parameters { get; }
+        public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets { get; }
         public PSModuleInfo Module { get; protected set; }
         public string ModuleName { get { return Module.Name; } }