Skip to content

Wrap and name GetListOfFilesFromData arguments #14194

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
iSazonov merged 1 commit into from
Nov 21, 2020
Merged

Wrap and name GetListOfFilesFromData arguments #14194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 37 additions & 19 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 @@ -2189,10 +2189,15 @@ internal PSModuleInfo LoadModuleManifest(
}

// Set up to load any types files that have been specified...
List<string> exportedTypeFiles;
if (
!GetListOfFilesFromData(data, moduleManifestPath, "TypesToProcess", manifestProcessingFlags, moduleBase,
".ps1xml", true, out exportedTypeFiles))
if (!GetListOfFilesFromData(
data,
moduleManifestPath,
key: "TypesToProcess",
manifestProcessingFlags,
moduleBase,
extension: ".ps1xml",
verifyFilesExist: true,
out List<string> exportedTypeFiles))
{
containedErrors = true;
if (bailOnFirstError) return null;
Expand Down Expand Up @@ -2234,10 +2239,15 @@ internal PSModuleInfo LoadModuleManifest(
}

// Set up to load any format files that have been specified...
List<string> exportedFormatFiles;
if (
!GetListOfFilesFromData(data, moduleManifestPath, "FormatsToProcess", manifestProcessingFlags,
moduleBase, ".ps1xml", true, out exportedFormatFiles))
if (!GetListOfFilesFromData(
data,
moduleManifestPath,
key: "FormatsToProcess",
manifestProcessingFlags,
moduleBase,
extension: ".ps1xml",
verifyFilesExist: true,
out List<string> exportedFormatFiles))
{
containedErrors = true;
if (bailOnFirstError) return null;
Expand Down Expand Up @@ -2276,10 +2286,15 @@ internal PSModuleInfo LoadModuleManifest(
}

// scripts to process
List<string> scriptsToProcess;
if (
!GetListOfFilesFromData(data, moduleManifestPath, "ScriptsToProcess", manifestProcessingFlags,
moduleBase, ".ps1", true, out scriptsToProcess))
if (!GetListOfFilesFromData(
data,
moduleManifestPath,
key: "ScriptsToProcess",
manifestProcessingFlags,
moduleBase,
extension: ".ps1",
verifyFilesExist: true,
out List<string> scriptsToProcess))
{
containedErrors = true;
if (bailOnFirstError) return null;
Expand Down Expand Up @@ -2323,13 +2338,16 @@ internal PSModuleInfo LoadModuleManifest(
}

// Process "FileList"
List<string> fileList;
if (
!GetListOfFilesFromData(data, moduleManifestPath, "FileList", manifestProcessingFlags, moduleBase, ""
/*extension*/,
false
/* don't check file existence - don't want to change current behavior without feature team discussion */,
out fileList))
if (!GetListOfFilesFromData(
data,
moduleManifestPath,
key: "FileList",
manifestProcessingFlags,
moduleBase,
extension: "",
// Don't check file existence - don't want to change current behavior without feature team discussion.
verifyFilesExist: false,
out List<string> fileList))
{
containedErrors = true;
if (bailOnFirstError) return null;
Expand Down