Skip to content

msft:8027609 Get-Module -List and Test-ModuleManifest import the the … #1375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vors merged 2 commits into from
Jul 14, 2016
Merged

msft:8027609 Get-Module -List and Test-ModuleManifest import the the … #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd0ba67
msft:8027609 Get-Module -List and Test-ModuleManifest import the the …
Jul 14, 2016
080f029
msft:7980238, 7768797 Test-ModuleManifest loads all available modules…
Jul 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,11 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
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)
{
Expand Down
9 changes: 4 additions & 5 deletions src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
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)
{
Expand Down Expand Up @@ -432,10 +432,11 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
/// 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;
Expand Down Expand Up @@ -465,9 +466,7 @@ internal PSModuleInfo LoadUsingMultiVersionModuleBase(string moduleBase, ImportM
null,
this.BasePrefix, /*SessionState*/ null,
importModuleOptions,
ManifestProcessingFlags.LoadElements |
ManifestProcessingFlags.WriteErrors |
ManifestProcessingFlags.NullOnFirstError,
manifestProcessingFlags,
out found);
if (found)
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ protected override void ProcessRecord()
{
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);
Expand Down