Merge pull request #285 from vors/merge-fixes

2 fixes for Merge-MarkdownHelp

Author: vors

src/Markdown.MAML/Transformer/MamlMultiModelMerger.cs

@@ -32,37 +32,6 @@ public MamlMultiModelMerger(Action<string> infoCallback, bool ignoreTagsIfAllApp
             _mergeMarker = mergeMarker;
         }
 
-        /// <summary>
-        /// Facade for Merge method that's easier to call from PowerShell
-        /// </summary>
-        /// <param name="applicableTag2Model"></param>
-        /// <returns></returns>
-        public MamlCommand MergePS(Hashtable applicableTag2Model)
-        {
-            Dictionary<string, MamlCommand> dict = new Dictionary<string, MamlCommand>();
-            foreach (DictionaryEntry pair in applicableTag2Model)
-            {
-                MamlCommand value;
-                if (pair.Value is PSObject)
-                {
-                    value = (pair.Value as PSObject).BaseObject as MamlCommand;
-                }
-                else
-                {
-                    value = pair.Value as MamlCommand;
-                }
-
-                if (value == null)
-                {
-                    throw new ArgumentException("Value of hashtable cannot be casted to MamlCommand");
-                }
-
-                dict[pair.Key.ToString()] = pair.Value as MamlCommand;
-            }
-
-            return this.Merge(dict);
-        }
-
         public MamlCommand Merge(Dictionary<string, MamlCommand> applicableTag2Model)
         {
             if (applicableTag2Model.Count == 0)

src/platyPS/platyPS.psm1

@@ -503,7 +503,7 @@ function Merge-MarkdownHelp
             $files = $_.Group
             $groupName = $_.Name
 
-            $dict = @{}
+            $dict = New-Object 'System.Collections.Generic.Dictionary[string, Markdown.MAML.Model.MAML.MamlCommand]'
             $files | ForEach-Object {
                 $model = GetMamlModelImpl $_.FullName -ForAnotherMarkdown -Encoding $Encoding
                 # unwrap List of 1 element
@@ -523,8 +523,8 @@ function Merge-MarkdownHelp
                 $newMetadata = @{}
             }
 
-            $merger = New-Object Markdown.MAML.Transformer.MamlMultiModelMerger -ArgumentList $null, !$ExplicitApplicableIfAll, $MergeMarker
-            $newModel = $merger.MergePS($dict)
+            $merger = New-Object Markdown.MAML.Transformer.MamlMultiModelMerger -ArgumentList $null, (-not $ExplicitApplicableIfAll), $MergeMarker
+            $newModel = $merger.Merge($dict)
 
             $md = ConvertMamlModelToMarkdown -mamlCommand $newModel -metadata $newMetadata -PreserveFormatting
             $outputFilePath = Join-Path $OutputPath $groupName