admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1375 from PowerShell/cchen/bugfix

Browse Source 
msft:8027609 Get-Module -List and Test-ModuleManifest import the the …
This commit is contained in:
Sergei Vorobev
2016-07-14 16:08:31 -07:00
committed by GitHub
parent 735456a12a 080f029d8a
commit 3e105225cf
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+5 -1
View File
@@ -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)
{
src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+4 -5
View File
@@ -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)
{
src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
+1 -1
View File
@@ -175,7 +175,7 @@ namespace Microsoft.PowerShell.Commands
{
foreach (ModuleSpecification requiredModule in requiredModules)
{
var modules = GetModule(new[] { requiredModule.Name }, true, true);
var modules = GetModule(new[] { requiredModule.Name }, false, true);
if (modules.Count == 0)
{
string errorMsg = StringUtil.Format(Modules.InvalidRequiredModulesinModuleManifest, requiredModule.Name, filePath);