Replace custom method with File.ReadAllText() in ScriptAnalysis.cs (PowerShell#26060)

amritanand-py · web-flow · commit b77c80ec2f9c · 2025-10-15T16:36:24.000Z
diff --git a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
@@ -40,7 +40,7 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
                 // So eat the invalid operation
             }
 
-            string scriptContent = ReadScript(path);
+            string scriptContent = File.ReadAllText(path, Encoding.Default);
 
             ParseError[] errors;
             var moduleAst = (new Parser()).Parse(path, scriptContent, null, out errors, ParseMode.ModuleAnalysis);
@@ -89,19 +89,6 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
             return result;
         }
 
-        internal static string ReadScript(string path)
-        {
-            using (FileStream readerStream = new FileStream(path, FileMode.Open, FileAccess.Read))
-            {
-                Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = readerStream.SafeFileHandle;
-
-                using (StreamReader scriptReader = new StreamReader(readerStream, Encoding.Default))
-                {
-                    return scriptReader.ReadToEnd();
-                }
-            }
-        }
-
         internal List<string> DiscoveredExports { get; set; }
 
         internal Dictionary<string, string> DiscoveredAliases { get; set; }
diff --git a/src/System.Management.Automation/utils/PsUtils.cs b/src/System.Management.Automation/utils/PsUtils.cs
@@ -340,7 +340,7 @@ internal static Hashtable EvaluatePowerShellDataFile(
 
         internal static Hashtable GetModuleManifestProperties(string psDataFilePath, string[] keys)
         {
-            string dataFileContents = ScriptAnalysis.ReadScript(psDataFilePath);
+            string dataFileContents = File.ReadAllText(psDataFilePath, Encoding.Default);
             ParseError[] parseErrors;
             var ast = (new Parser()).Parse(psDataFilePath, dataFileContents, null, out parseErrors, ParseMode.ModuleAnalysis);
             if (parseErrors.Length > 0)

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ internal static Hashtable EvaluatePowerShellDataFile(`
`340`	`340`
`341`	`341`	`internal static Hashtable GetModuleManifestProperties(string psDataFilePath, string[] keys)`
`342`	`342`	`{`
`343`		`- string dataFileContents = ScriptAnalysis.ReadScript(psDataFilePath);`
	`343`	`+ string dataFileContents = File.ReadAllText(psDataFilePath, Encoding.Default);`
`344`	`344`	`ParseError[] parseErrors;`
`345`	`345`	`var ast = (new Parser()).Parse(psDataFilePath, dataFileContents, null, out parseErrors, ParseMode.ModuleAnalysis);`
`346`	`346`	`if (parseErrors.Length > 0)`