admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1049 from PowerShell/andschwa/revert-history-merge

Browse Source 
Revert EndProcessing to original code
This commit is contained in:
Andy Schwartzmeyer
2016-05-31 15:51:47 -07:00
parent 8be00f72d9 20f103b0d4
commit bb6e2f2d49
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/hostifaces/History.cs
+30 -3
View File
@@ -1212,12 +1212,39 @@ namespace Microsoft.PowerShell.Commands
{
ps.AddScript(commandToInvoke);
ps.AddCommand("out-default");
ps.Commands.Commands[0].MergeMyResults(PipelineResultTypes.Error, PipelineResultTypes.Output);
EventHandler<DataAddedEventArgs> debugAdded = delegate(Object sender, DataAddedEventArgs e) { DebugRecord record = (DebugRecord)((PSDataCollection<DebugRecord>)sender)[e.Index]; WriteDebug(record.Message); };
EventHandler<DataAddedEventArgs> errorAdded = delegate(Object sender, DataAddedEventArgs e) { ErrorRecord record = (ErrorRecord)((PSDataCollection<ErrorRecord>)sender)[e.Index]; WriteError(record); };
EventHandler<DataAddedEventArgs> informationAdded = delegate(Object sender, DataAddedEventArgs e) { InformationRecord record = (InformationRecord)((PSDataCollection<InformationRecord>)sender)[e.Index]; WriteInformation(record); };
EventHandler<DataAddedEventArgs> progressAdded = delegate(Object sender, DataAddedEventArgs e) { ProgressRecord record = (ProgressRecord)((PSDataCollection<ProgressRecord>)sender)[e.Index]; WriteProgress(record); };
EventHandler<DataAddedEventArgs> verboseAdded = delegate(Object sender, DataAddedEventArgs e) { VerboseRecord record = (VerboseRecord)((PSDataCollection<VerboseRecord>)sender)[e.Index]; WriteVerbose(record.Message); };
EventHandler<DataAddedEventArgs> warningAdded = delegate(Object sender, DataAddedEventArgs e) { WarningRecord record = (WarningRecord)((PSDataCollection<WarningRecord>)sender)[e.Index]; WriteWarning(record.Message); };
ps.Invoke();
ps.Streams.Debug.DataAdded += debugAdded;
ps.Streams.Error.DataAdded += errorAdded;
ps.Streams.Information.DataAdded += informationAdded;
ps.Streams.Progress.DataAdded += progressAdded;
ps.Streams.Verbose.DataAdded += verboseAdded;
ps.Streams.Warning.DataAdded += warningAdded;
try
{
Collection<PSObject> results = ps.Invoke();
if (results.Count > 0)
{
WriteObject(results, true);
}
pipeline.RemoveFromInvokeHistoryEntryList(entry);
}
finally
{
ps.Streams.Debug.DataAdded -= debugAdded;
ps.Streams.Error.DataAdded -= errorAdded;
ps.Streams.Information.DataAdded -= informationAdded;
ps.Streams.Progress.DataAdded -= progressAdded;
ps.Streams.Verbose.DataAdded -= verboseAdded;
ps.Streams.Warning.DataAdded -= warningAdded;
}
}
}
/// <summary>