From e9dde90da61ab6bc7eccee333612fac1c5e3713e Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 1/8] Revert "Fix typos in DOCSMIGRATION.md (#7094)" This reverts commit bd598f3f1efbdc57b7c10779706bec55d90b8c4f. From 71341aa49ec37dde0d3434f37dbed364869c60a9 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 2/8] Revert "Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead (#7086)" This reverts commit 0487a1be2fb8425a84e60c9445146e7f466e8307. From c6b8346b358cc20737d12d6c8d38a8f2adf3db58 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 3/8] Revert "Fedora 28 was released, Fedora 26 and 25 were EOL'ed. (#7079)" This reverts commit 8489532f2503b956a7feabb3673995fc8d2564bb. From 30041e2a009f0cec0ea368a6ea0eb09167d4cd5a Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 4/8] Revert "Fix conditions for transcription of Write-Information command. (#6917)" This reverts commit 9ac701dbee5d7b9bb0d7875552e661f94b2c22e1. From 2b1fd49c5c42b02019b1ca71710f467f8747f5e2 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 5/8] Revert "Add 'CompatiblePSEditions' to PowerShell Core built-in modules (#7083)" This reverts commit 00b0af13d8963306e8192f5d2a8ed9791dfee4b1. From 520c1cc03cc26228abc35045083aae45665eac96 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 6/8] Revert "Enable NuGet Package Registration for compliance (#7053)" This reverts commit a5ec565cae76d4f9a8c4084111893565deffcf20. From 6e92e26f2e359a509ceae2910e96f44f6b4ff838 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 7/8] Revert "Added copy env vars from ProcessStartInfo to key/pair array used in creating ssh process (#7070)" This reverts commit 6fa1e86f2d60975595c563f923b5633c1341a424. From c90f53fac2e4d9f71e52ef968a9634a601e4cea0 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Tue, 19 Jun 2018 10:54:48 -0700 Subject: [PATCH 8/8] Revert "Set the cursor to the place where a user hits tab key (#7023)" This reverts commit 8805ca20aae583b1e63d9cfd2a2a3b24e0862428. --- .../host/msh/ConsoleHostUserInterfaceProgress.cs | 6 ------ .../host/msh/ProgressPane.cs | 16 ++++------------ .../engine/MshCommandRuntime.cs | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs index 5e182b3e582..d8b19a68812 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs @@ -97,12 +97,6 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt // Update the progress pane only when the timer set up the update flag or WriteProgress is completed. // As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates. _progPane.Show(_pendingProgress); - - // Reset the cursor back to where it started - if (record.RecordType == ProgressRecordType.Completed) - { - _progPane.Hide(); - } } } diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs index d8346b0cbd6..922aad8f174 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs @@ -99,20 +99,12 @@ class ProgressPane //if the cursor is at the bottom, create screen buffer space by scrolling int scrollRows = rows - ((_rawui.BufferSize.Height - 1) - _location.Y); + for (int i = 0; i < rows; i++) + { + Console.Out.Write('\n'); + } if (scrollRows > 0) { - // The following can be possibly replaced by Console.Write ("\x1b[" + scrollRows + "S"); - // For details, see https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences - - // Scroll the console screen up by 'scrollRows' - var bottomLocation = _location; - bottomLocation.Y = _rawui.BufferSize.Height; - _rawui.CursorPosition = bottomLocation; - for (int i = 0; i < scrollRows; i++) - { - Console.Out.Write('\n'); - } - _location.Y -= scrollRows; _savedCursor.Y -= scrollRows; } diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs index 54a98fc0ce9..90ddd5927a3 100644 --- a/src/System.Management.Automation/engine/MshCommandRuntime.cs +++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs @@ -2252,7 +2252,7 @@ internal void ThrowIfWriteNotPermitted(bool needsToWriteToPipeline) { // Only generate these exceptions if a pipeline has already been declared as the 'writing' pipeline. // Otherwise, these are probably infrastructure messages and can be ignored. - if (this.PipelineProcessor?._permittedToWrite != null) + if (this.PipelineProcessor._permittedToWrite != null) { throw PSTraceSource.NewInvalidOperationException( PipelineStrings.WriteNotPermitted);