Revert to a simplified scriptblock

Had to revert to scriptblock, due to interrupt handling being inconsistent with direct invocation. New implementation avoids leaking variables still.

Author: FriedrichWeinmann

PSFramework/bin/PSFramework.dll

@@ -354,6 +354,11 @@
             Error message to post when execution fails
             </summary>
         </member>
+        <member name="F:PSFramework.Commands.InvokePSFProtectedCommand._ErrorScript">
+            <summary>
+            script used to write horrible errors on screen
+            </summary>
+        </member>
         <member name="M:PSFramework.Commands.InvokePSFProtectedCommand.BeginProcessing">
             <summary>
             Prepare runtime information, such as calling command or cmdlet object

PSFramework/bin/PSFramework.pdb

@@ -160,7 +160,18 @@ private string _ErrorMessage
                 return Localization.LocalizationHost.Read("PSFramework", "FlowControl.Invoke-PSFProtectedCommand.Failed", new object[] { _Message });
             }
         }
-#endregion Private Fields
+
+        /// <summary>
+        /// script used to write horrible errors on screen
+        /// </summary>
+        private string _ErrorScript = @"
+param (
+	$__PSFramework__Parameters
+)
+Stop-PSFFunction @__PSFramework__Parameters
+return
+";
+        #endregion Private Fields
 
         #region Cmdlet Implementation
         /// <summary>
@@ -243,7 +254,7 @@ protected override void ProcessRecord()
                 Thread.Sleep(nextWait);
                 nextWait = (int)((double)nextWait * RetryWaitEscalation);
             }
-            
+
         }
         #endregion Cmdlet Implementation
 
@@ -267,30 +278,30 @@ private void Terminate(Exception error)
                             )
                         );
                 }
-                    
+
                 if (Continue)
                     DoContinue(ContinueLabel);
                 return;
             }
 
-            using (PowerShell ps = PowerShell.Create(RunspaceMode.CurrentRunspace))
-            {
-                ps.AddCommand("PSFramework\\Stop-PSFFunction")
-                    .AddParameter("Message", _ErrorMessage)
-                    .AddParameter("Exception", error)
-                    .AddParameter("Target", Target)
-                    .AddParameter("Continue", Continue)
-                    .AddParameter("FunctionName", _Caller.CallerFunction)
-                    .AddParameter("ModuleName", _Caller.CallerModule)
-                    .AddParameter("File", _Caller.CallerFile)
-                    .AddParameter("Line", _Caller.CallerLine)
-                    .AddParameter("Cmdlet", PSCmdlet)
-                    .AddParameter("EnableException", EnableException);
-                if (!String.IsNullOrEmpty(ContinueLabel))
-                    ps.AddParameter("ContinueLabel", ContinueLabel);
-
-                ps.Invoke();
-            }
+            Hashtable parameters = new Hashtable(StringComparer.OrdinalIgnoreCase);
+            parameters["Message"] = _ErrorMessage;
+            parameters["Exception"] = error;
+            parameters["Target"] = Target;
+            parameters["Continue"] = Continue;
+            if (!String.IsNullOrEmpty(ContinueLabel))
+                parameters["ContinueLabel"] = ContinueLabel;
+            parameters["FunctionName"] = _Caller.CallerFunction;
+            parameters["ModuleName"] = _Caller.CallerModule;
+            parameters["File"] = _Caller.CallerFile;
+            parameters["Line"] = _Caller.CallerLine;
+            parameters["Cmdlet"] = PSCmdlet;
+            parameters["EnableException"] = EnableException;
+            parameters["StepsUpward"] = 1;
+
+            ScriptBlock errorBlock = ScriptBlock.Create(_ErrorScript);
+            object[] arguments = new object[] { parameters };
+            PSCmdlet.InvokeCommand.InvokeScript(false, errorBlock, null, arguments);
         }
 
         private void ErrorEventAction(Exception error)
@@ -301,7 +312,8 @@ private void ErrorEventAction(Exception error)
             object errorRecord = error;
             if (error is RuntimeException)
                 errorRecord = ((RuntimeException)error).ErrorRecord;
-            try {
+            try
+            {
                 WriteMessage(Localization.LocalizationHost.Read("PSFramework.FlowControl.Invoke-PSFProtectedCommand.ErrorEvent", new object[] { _Message, Target }), Level, _Caller.CallerFunction, _Caller.CallerModule, _Caller.CallerFile, _Caller.CallerLine, Tag, Target);
                 table["Result"] = PSCmdlet.InvokeCommand.InvokeScript(false, ErrorEvent, null, errorRecord);
                 WriteMessage(Localization.LocalizationHost.Read("PSFramework.FlowControl.Invoke-PSFProtectedCommand.ErrorEvent.Success", new object[] { _Message, Target }), Level, _Caller.CallerFunction, _Caller.CallerModule, _Caller.CallerFile, _Caller.CallerLine, Tag, Target, table);
@@ -313,4 +325,4 @@ private void ErrorEventAction(Exception error)
             }
         }
     }
-}
+}