Merge pull request #1751 from PowerShell/andschwa/readkey

Re-workaround uncancellable `Console.ReadKey`

Author: andyleejordan

.vsts-ci/templates/release-general.yml

@@ -46,7 +46,6 @@ steps:
       **/Newtonsoft.Json.dll
       **/OmniSharp*.dll
       **/Serilog*.dll
-      **/UnixConsoleEcho.dll
 
 # The SBOM generation requires our original sources with the `dotnet restore`
 # produced `project.assets.json` files.

Third Party Notices.txt

@@ -4,21 +4,6 @@ This file is based on or incorporates material from the projects listed below (T
 
 ---
 
-UnixConsoleEcho
-
-Copyright (c) 2017 Patrick Meinecke
-Provided for Informational Purposes Only
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 Serilog
 
 Copyright 2013-2015 Serilog Contributors

src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs

@@ -12,12 +12,6 @@
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell.EditorServices.Hosting;
 using System.Globalization;
-using System.Collections;
-
-// TODO: Remove this when we drop support for PS6.
-#if CoreCLR
-using System.Runtime.InteropServices;
-#endif
 
 #if DEBUG
 using System.Diagnostics;
@@ -35,14 +29,6 @@ namespace Microsoft.PowerShell.EditorServices.Commands
     [Cmdlet(VerbsLifecycle.Start, "EditorServices", DefaultParameterSetName = "NamedPipe")]
     public sealed class StartEditorServicesCommand : PSCmdlet
     {
-        // TODO: Remove this when we drop support for PS6.
-        private static readonly bool s_isWindows =
-#if CoreCLR
-        RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-#else
-        true;
-#endif
-
         private readonly List<IDisposable> _disposableResources;
 
         private readonly List<IDisposable> _loggerUnsubscribers;
@@ -420,12 +406,7 @@ private ConsoleReplKind GetReplKind()
                 return ConsoleReplKind.None;
             }
 
-            // TODO: Remove this when we drop support for PS6.
-            Hashtable psVersionTable = (Hashtable)SessionState.PSVariable.GetValue("PSVersionTable");
-            dynamic version = psVersionTable["PSVersion"];
-            int majorVersion = (int)version.Major;
-
-            if (UseLegacyReadLine || (!s_isWindows && majorVersion == 6))
+            if (UseLegacyReadLine)
             {
                 _logger.Log(PsesLogLevel.Diagnostic, "REPL configured as Legacy");
                 return ConsoleReplKind.LegacyReadLine;

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -38,7 +38,6 @@
     <PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-    <PackageReference Include="UnixConsoleEcho" Version="0.1.0" />
   </ItemGroup>
 
   <ItemGroup>