From bd0ba6771c4e6582a6e72274456d8ff29dfd9054 Mon Sep 17 00:00:00 2001
From: Chunqing Chen <johndoe@example.com>
Date: Thu, 14 Jul 2016 12:42:47 -0700
Subject: [PATCH] msft:8027609 Get-Module -List and Test-ModuleManifest import
 the the nested module dependencies into the current/global runspace.

---
 .../engine/Modules/ImportModuleCommand.cs                | 6 +++++-
 .../engine/Modules/ModuleCmdletBase.cs                   | 9 ++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 2e5562d38d..4e7f146ec6 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -652,7 +652,11 @@ namespace Microsoft.PowerShell.Commands
                         else if (Directory.Exists(rootedPath))
                         {
                             // Load the latest valid version if it is a multi-version module directory
-                            foundModule = LoadUsingMultiVersionModuleBase(rootedPath, importModuleOptions, out found);
+                            foundModule = LoadUsingMultiVersionModuleBase(rootedPath,
+                                                                            ManifestProcessingFlags.LoadElements |
+                                                                            ManifestProcessingFlags.WriteErrors |
+                                                                            ManifestProcessingFlags.NullOnFirstError,
+                                                                            importModuleOptions, out found);
 
                             if (!found)
                             {
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index fb6c1c372b..6e15ac3df8 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -388,7 +388,7 @@ namespace Microsoft.PowerShell.Commands
                 string qualifiedPath = Path.Combine(path, fileBaseName);
 
                 // Load the latest valid version if it is a multi-version module directory
-                module = LoadUsingMultiVersionModuleBase(qualifiedPath, options, out found);
+                module = LoadUsingMultiVersionModuleBase(qualifiedPath, manifestProcessingFlags, options, out found);
 
                 if (!found)
                 {
@@ -432,10 +432,11 @@ namespace Microsoft.PowerShell.Commands
         /// Loads the latest valid version if moduleBase is a multi-versioned module directory
         /// </summary>
         /// <param name="moduleBase">module directory path</param>
+        /// <param name="manifestProcessingFlags">The flag that indicate manifest processing option</param>
         /// <param name="importModuleOptions">The set of options that are used while importing a module</param>
         /// <param name="found">True if a module was found</param>
         /// <returns></returns>
-        internal PSModuleInfo LoadUsingMultiVersionModuleBase(string moduleBase, ImportModuleOptions importModuleOptions, out bool found)
+        internal PSModuleInfo LoadUsingMultiVersionModuleBase(string moduleBase, ManifestProcessingFlags manifestProcessingFlags, ImportModuleOptions importModuleOptions, out bool found)
         {
             PSModuleInfo foundModule = null;
             found = false;
@@ -465,9 +466,7 @@ namespace Microsoft.PowerShell.Commands
                                                             null,
                                                             this.BasePrefix, /*SessionState*/ null,
                                                             importModuleOptions,
-                                                            ManifestProcessingFlags.LoadElements |
-                                                            ManifestProcessingFlags.WriteErrors |
-                                                            ManifestProcessingFlags.NullOnFirstError,
+                                                            manifestProcessingFlags,
                                                             out found);
                         if (found)
                         {