Fix minor CodeFactor style issues in ModuleCmdletBase (#9915)
This commit is contained in:
parent
4d3f74eddc
commit
92f13b9b60
|
@ -585,7 +585,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
// Check for PowerShell Version before checking other keys
|
// Check for PowerShell Version before checking other keys
|
||||||
// If a PowerShellVersion exists and does not match the requirements, then the error is InsufficientPowerShellVersion
|
// If a PowerShellVersion exists and does not match the requirements, then the error is InsufficientPowerShellVersion
|
||||||
// Else, the error is InvalidManifestMember
|
// Else, the error is InvalidManifestMember
|
||||||
|
|
||||||
Version powerShellVersion;
|
Version powerShellVersion;
|
||||||
Version currentPowerShellVersion = PSVersionInfo.PSVersion;
|
Version currentPowerShellVersion = PSVersionInfo.PSVersion;
|
||||||
if (GetScalarFromData<Version>(data, moduleManifestPath, "PowerShellVersion", manifestProcessingFlags, out powerShellVersion) &&
|
if (GetScalarFromData<Version>(data, moduleManifestPath, "PowerShellVersion", manifestProcessingFlags, out powerShellVersion) &&
|
||||||
|
@ -1482,21 +1481,16 @@ namespace Microsoft.PowerShell.Commands
|
||||||
|
|
||||||
// START: Check if the ModuleToProcess is already loaded..if it is, ignore the this load manifest
|
// START: Check if the ModuleToProcess is already loaded..if it is, ignore the this load manifest
|
||||||
// call and return
|
// call and return
|
||||||
|
|
||||||
string moduleToProcess = null;
|
string moduleToProcess = null;
|
||||||
|
|
||||||
if (
|
if (!GetScalarFromData<string>(data, moduleManifestPath, "ModuleToProcess", manifestProcessingFlags, out moduleToProcess))
|
||||||
!GetScalarFromData<string>(data, moduleManifestPath, "ModuleToProcess", manifestProcessingFlags,
|
|
||||||
out moduleToProcess))
|
|
||||||
{
|
{
|
||||||
containedErrors = true;
|
containedErrors = true;
|
||||||
if (bailOnFirstError) return null;
|
if (bailOnFirstError) return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
string rootModule = null;
|
string rootModule = null;
|
||||||
if (
|
if (!GetScalarFromData<string>(data, moduleManifestPath, "RootModule", manifestProcessingFlags, out rootModule))
|
||||||
!GetScalarFromData<string>(data, moduleManifestPath, "RootModule", manifestProcessingFlags,
|
|
||||||
out rootModule))
|
|
||||||
{
|
{
|
||||||
containedErrors = true;
|
containedErrors = true;
|
||||||
if (bailOnFirstError) return null;
|
if (bailOnFirstError) return null;
|
||||||
|
@ -1651,7 +1645,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
}
|
}
|
||||||
|
|
||||||
// END: Check if the ModuleToProcess is already loaded..
|
// END: Check if the ModuleToProcess is already loaded..
|
||||||
|
|
||||||
string author = string.Empty;
|
string author = string.Empty;
|
||||||
if (!GetScalarFromData(data, moduleManifestPath, "Author", manifestProcessingFlags, out author))
|
if (!GetScalarFromData(data, moduleManifestPath, "Author", manifestProcessingFlags, out author))
|
||||||
{
|
{
|
||||||
|
@ -4474,9 +4467,7 @@ namespace Microsoft.PowerShell.Commands
|
||||||
// After input from GP team for this behavior, need to revisit the commented out part
|
// After input from GP team for this behavior, need to revisit the commented out part
|
||||||
// if ((status & ModuleLoggingGroupPolicyStatus.Enabled) != 0)
|
// if ((status & ModuleLoggingGroupPolicyStatus.Enabled) != 0)
|
||||||
// {
|
// {
|
||||||
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
if (((status & ModuleLoggingGroupPolicyStatus.Enabled) != 0) && moduleNames != null)
|
if (((status & ModuleLoggingGroupPolicyStatus.Enabled) != 0) && moduleNames != null)
|
||||||
{
|
{
|
||||||
foreach (string currentGPModuleName in moduleNames)
|
foreach (string currentGPModuleName in moduleNames)
|
||||||
|
@ -4927,7 +4918,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
// First remove cmdlets from the session state
|
// First remove cmdlets from the session state
|
||||||
// (can't just go through module.ExportedCmdlets
|
// (can't just go through module.ExportedCmdlets
|
||||||
// because the names of the cmdlets might have been changed by the -Prefix parameter of Import-Module)
|
// because the names of the cmdlets might have been changed by the -Prefix parameter of Import-Module)
|
||||||
|
|
||||||
List<string> keysToRemoveFromCmdletCache = new List<string>();
|
List<string> keysToRemoveFromCmdletCache = new List<string>();
|
||||||
foreach (KeyValuePair<string, List<CmdletInfo>> cmdlet in Context.EngineSessionState.GetCmdletTable())
|
foreach (KeyValuePair<string, List<CmdletInfo>> cmdlet in Context.EngineSessionState.GetCmdletTable())
|
||||||
{
|
{
|
||||||
|
@ -6009,7 +5999,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
|
|
||||||
// If we are in module analysis and the parent module declares non-wildcarded exports, then we don't need to
|
// If we are in module analysis and the parent module declares non-wildcarded exports, then we don't need to
|
||||||
// actually process the script module.
|
// actually process the script module.
|
||||||
|
|
||||||
if (parentModule != null)
|
if (parentModule != null)
|
||||||
{
|
{
|
||||||
if (shouldProcessModule && (parentModule.DeclaredFunctionExports != null) && (parentModule.DeclaredFunctionExports.Count > 0))
|
if (shouldProcessModule && (parentModule.DeclaredFunctionExports != null) && (parentModule.DeclaredFunctionExports.Count > 0))
|
||||||
|
@ -6545,7 +6534,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
// Passing module as a parameter here so that the providers can have the module property populated.
|
// Passing module as a parameter here so that the providers can have the module property populated.
|
||||||
// For engine providers, the module should point to top-level module name
|
// For engine providers, the module should point to top-level module name
|
||||||
// For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
|
// For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
|
||||||
|
|
||||||
if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
|
if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
|
||||||
{
|
{
|
||||||
iss.ImportCmdletsFromAssembly(assemblyToLoad, parentModule);
|
iss.ImportCmdletsFromAssembly(assemblyToLoad, parentModule);
|
||||||
|
@ -6653,7 +6641,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
// Passing module as a parameter here so that the providers can have the module property populated.
|
// Passing module as a parameter here so that the providers can have the module property populated.
|
||||||
// For engine providers, the module should point to top-level module name
|
// For engine providers, the module should point to top-level module name
|
||||||
// For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
|
// For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
|
||||||
|
|
||||||
if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
|
if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
|
||||||
{
|
{
|
||||||
iss.ImportCmdletsFromAssembly(assembly, parentModule);
|
iss.ImportCmdletsFromAssembly(assembly, parentModule);
|
||||||
|
@ -6696,7 +6683,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the types table entries
|
// Add the types table entries
|
||||||
|
|
||||||
List<string> typesFileNames = new List<string>();
|
List<string> typesFileNames = new List<string>();
|
||||||
foreach (SessionStateTypeEntry sste in iss.Types)
|
foreach (SessionStateTypeEntry sste in iss.Types)
|
||||||
{
|
{
|
||||||
|
@ -6709,7 +6695,6 @@ namespace Microsoft.PowerShell.Commands
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the format file entries
|
// Add the format file entries
|
||||||
|
|
||||||
List<string> formatsFileNames = new List<string>();
|
List<string> formatsFileNames = new List<string>();
|
||||||
foreach (SessionStateFormatEntry ssfe in iss.Formats)
|
foreach (SessionStateFormatEntry ssfe in iss.Formats)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue