Optimise out some Linq operations within the logging code.

Author: mjr4077au

src/PSADT/PSAppDeployToolkit/Foundation/ModuleDatabase.cs

@@ -167,7 +167,7 @@ internal static SessionState GetSessionState()
         /// <param name="args">An array of arguments to pass to the script block. This parameter can be null or empty if no arguments are
         /// required.</param>
         /// <returns>A read-only collection of PSObject instances that represent the results of the script execution.</returns>
-        internal static ReadOnlyCollection<PSObject> InvokeScript(ScriptBlock scriptBlock, params object[]? args)
+        internal static ReadOnlyCollection<PSObject> InvokeScript(ScriptBlock scriptBlock, params object[] args)
         {
             SessionState sessionState = GetSessionState(); return new(sessionState.InvokeCommand.InvokeScript(sessionState, scriptBlock, args));
         }

src/PSADT/PSAppDeployToolkit/Logging/LogUtilities.cs

@@ -85,7 +85,7 @@ public static IReadOnlyList<LogEntry> WriteLogEntry(IReadOnlyList<string> messag
             else
             {
                 // Get the first PowerShell stack frame that contains a valid command.
-                CallStackFrame invoker = ModuleDatabase.InvokeScript(ScriptBlock.Create("& $Script:CommandTable.'Get-PSCallStack'"), null).Skip(1).Select(static o => (CallStackFrame)o.BaseObject).First(static f => f.GetCommand() is string command && !string.IsNullOrWhiteSpace(command) && (!CallerCommandRegex.IsMatch(command) || (CallerScriptBlockRegex.IsMatch(command) && CallerScriptLocationRegex.IsMatch(f.GetScriptLocation()))));
+                CallStackFrame invoker = ModuleDatabase.InvokeScript(ScriptBlock.Create("& $Script:CommandTable.'Get-PSCallStack'")).Skip(1).Select(static o => (CallStackFrame)o.BaseObject).First(static f => f.GetCommand() is string command && !string.IsNullOrWhiteSpace(command) && (!CallerCommandRegex.IsMatch(command) || (CallerScriptBlockRegex.IsMatch(command) && CallerScriptLocationRegex.IsMatch(f.GetScriptLocation()))));
                 callerFileName = !string.IsNullOrWhiteSpace(invoker.ScriptName) ? invoker.ScriptName : invoker.GetScriptLocation();
                 callerSource = invoker.GetCommand();
             }
@@ -126,9 +126,19 @@ public static IReadOnlyList<LogEntry> WriteLogEntry(IReadOnlyList<string> messag
             if (canLogToDisk)
             {
                 using StreamWriter logFileWriter = new(Path.Combine(logFileDirectory!, logFileName!), true, LogEncoding);
-                foreach (string line in logStyle.Value == LogStyle.CMTrace ? logEntries.Select(static e => e.CMTraceLogLine) : logEntries.Select(static e => e.LegacyLogLine))
+                if (logStyle.Value == LogStyle.CMTrace)
                 {
-                    logFileWriter.WriteLine(line);
+                    foreach (LogEntry logEntry in logEntries)
+                    {
+                        logFileWriter.WriteLine(logEntry.CMTraceLogLine);
+                    }
+                }
+                else
+                {
+                    foreach (LogEntry logEntry in logEntries)
+                    {
+                        logFileWriter.WriteLine(logEntry.LegacyLogLine);
+                    }
                 }
             }
 
@@ -146,16 +156,16 @@ public static IReadOnlyList<LogEntry> WriteLogEntry(IReadOnlyList<string> messag
                     }
                     if (severity == LogSeverity.Error)
                     {
-                        foreach (string line in logEntries.Select(static e => e.LegacyLogLine))
+                        foreach (LogEntry logEntry in logEntries)
                         {
-                            Console.Error.WriteLine(line);
+                            Console.Error.WriteLine(logEntry.LegacyLogLine);
                         }
                     }
                     else
                     {
-                        foreach (string line in logEntries.Select(static e => e.LegacyLogLine))
+                        foreach (LogEntry logEntry in logEntries)
                         {
-                            Console.WriteLine(line);
+                            Console.WriteLine(logEntry.LegacyLogLine);
                         }
                     }
                     if (colouredOutput)
@@ -166,12 +176,14 @@ public static IReadOnlyList<LogEntry> WriteLogEntry(IReadOnlyList<string> messag
                 else if (hostLogStreamType != HostLogStreamType.Verbose)
                 {
                     // Write the host output to PowerShell's InformationStream.
-                    _ = ModuleDatabase.InvokeScript(WriteHostDelegate, logEntries.Select(static e => e.LegacyLogLine), LogSeverityColors[(int)severity]);
+                    string[] infoMessages = [.. logEntries.Select(static e => e.LegacyLogLine)];
+                    _ = ModuleDatabase.InvokeScript(WriteHostDelegate, infoMessages, LogSeverityColors[(int)severity]);
                 }
                 else
                 {
                     // Write the host output to PowerShell's VerboseStream.
-                    _ = ModuleDatabase.InvokeScript(WriteVerboseDelegate, logEntries.Select(static e => e.Message));
+                    string[] verboseMessages = [.. logEntries.Select(static e => e.Message)];
+                    _ = ModuleDatabase.InvokeScript(WriteVerboseDelegate, verboseMessages);
                 }
             }
             return logEntries;