From orbit, nuke the Telnet connection and all supporting infra. (mic…

…rosoft#7840) This is not going to be our plan of record for Universal going forward. This updates the Universal configuration to 1) match non-universal and 2) switch to local applications
skyline75489 · Oct 10, 2020 · 1014d3a · 1014d3a
1 parent 855cf07
commit 1014d3a
Show file tree

Hide file tree

Showing 19 changed files with 116 additions and 535 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -48,36 +48,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
-## telnetpp
-
-**Source**: https://github.com/KazDragon/telnetpp
-
-### License 
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2015-2017 Matthew Chaplain a.k.a KazDragon
-
-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.
-```
-
 ## chromium/base/numerics
 
 **Source**: https://github.com/chromium/chromium/tree/master/base/numerics

diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -45,9 +45,6 @@
     <ClInclude Include="Commandline.h" />
     <ClInclude Include="DebugTapConnection.h" />
     <ClInclude Include="ColorHelper.h" />
-    <ClInclude Include="TelnetGenerator.h">
-      <Filter>profileGeneration</Filter>
-    </ClInclude>
     <ClInclude Include="TerminalSettings.h">
       <Filter>settings</Filter>
     </ClInclude>

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -761,12 +761,6 @@ namespace winrt::TerminalApp::implementation
                                                               winrt::guid());
         }
 
-        else if (hasConnectionType &&
-                 connectionType == TerminalConnection::TelnetConnection::ConnectionType())
-        {
-            connection = TerminalConnection::TelnetConnection(settings.Commandline());
-        }
-
         else
         {
             std::wstring guidWString = Utils::GuidToString(profileGuid);

diff --git a/src/cascadia/TerminalConnection/AzureConnection.cpp b/src/cascadia/TerminalConnection/AzureConnection.cpp
@@ -3,10 +3,6 @@
 
 #include "pch.h"
 
-// We have to define GSL here, not PCH
-// because TelnetConnection has a conflicting GSL implementation.
-#include <gsl/gsl>
-
 #include "AzureConnection.h"
 #include "AzureClientID.h"
 #include <sstream>

diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -3,10 +3,6 @@
 
 #include "pch.h"
 
-// We have to define GSL here, not PCH
-// because TelnetConnection has a conflicting GSL implementation.
-#include <gsl/gsl>
-
 #include "ConptyConnection.h"
 
 #include <windows.h>

diff --git a/src/cascadia/TerminalConnection/EchoConnection.cpp b/src/cascadia/TerminalConnection/EchoConnection.cpp
@@ -5,10 +5,6 @@
 #include "EchoConnection.h"
 #include <sstream>
 
-// We have to define GSL here, not PCH
-// because TelnetConnection has a conflicting GSL implementation.
-#include <gsl/gsl>
-
 #include "EchoConnection.g.cpp"
 
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

diff --git a/src/cascadia/TerminalConnection/Resources/en-US/Resources.resw b/src/cascadia/TerminalConnection/Resources/en-US/Resources.resw
@@ -212,7 +212,4 @@
     <comment>The first argument {0...} is the hexadecimal error code. The second argument {1} is the user-specified path to a program.
       If this string is broken to multiple lines, it will not be displayed properly.</comment>
   </data>
-  <data name="TelnetInternetOrServerIssue" xml:space="preserve">
-    <value>Could not connect to telnet server.</value>
-  </data>
 </root>