From orbit, nuke the Telnet connection and all supporting infra. (#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 (cherry picked from commit d33ca7e)
microsoft · Oct 19, 2020 · 1279c63 · 1279c63
1 parent cf25fd0
commit 1279c63
Show file tree

Hide file tree

Showing 21 changed files with 116 additions and 545 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/LegacyProfileGeneratorNamespaces.h b/src/cascadia/TerminalApp/LegacyProfileGeneratorNamespaces.h
@@ -18,5 +18,4 @@ Author(s):
 
 static constexpr std::wstring_view WslGeneratorNamespace{ L"Windows.Terminal.Wsl" };
 static constexpr std::wstring_view AzureGeneratorNamespace{ L"Windows.Terminal.Azure" };
-static constexpr std::wstring_view TelnetGeneratorNamespace{ L"Windows.Terminal.Telnet" };
 static constexpr std::wstring_view PowershellCoreGeneratorNamespace{ L"Windows.Terminal.PowershellCore" };
diff --git a/src/cascadia/TerminalApp/TelnetGenerator.h b/src/cascadia/TerminalApp/TelnetGenerator.h
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -129,7 +129,6 @@
     <ClInclude Include="PowershellCoreProfileGenerator.h" />
     <ClInclude Include="WslDistroGenerator.h" />
     <ClInclude Include="AzureCloudShellGenerator.h" />
-    <ClInclude Include="TelnetGenerator.h" />
     <ClInclude Include="ColorHelper.h" />
     <ClInclude Include="TerminalSettings.h">
       <DependentUpon>TerminalSettings.idl</DependentUpon>

diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -117,9 +117,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
@@ -16,7 +16,6 @@
 
 #include "KeyChordSerialization.h"
 #include "AzureCloudShellGenerator.h" // For AzureConnectionType
-#include "TelnetGenerator.h" // For TelnetConnectionType
 #include "TabRowControl.h"
 #include "ColorHelper.h"
 #include "DebugTapConnection.h"
@@ -792,12 +791,6 @@ namespace winrt::TerminalApp::implementation
                                                               winrt::guid());
         }
 
-        else if (hasConnectionType &&
-                 connectionType == TelnetConnectionType)
-        {
-            connection = TerminalConnection::TelnetConnection(settings.Commandline());
-        }
-
         else
         {
             std::wstring guidWString = Utils::GuidToString(profileGuid);

diff --git a/src/cascadia/TerminalApp/defaults-universal.json b/src/cascadia/TerminalApp/defaults-universal.json
@@ -1,46 +1,73 @@
 // THIS IS AN AUTO-GENERATED FILE! Changes to this file will be ignored.
 {
-    "defaultProfile": "{550ce7b8-d500-50ad-8a1a-c400c3262db3}",
+    "defaultProfile": "{70bfecf4-bcbb-443b-a8fa-d7ac4f7ad201}",
 
     // Launch Settings
     "initialCols": 120,
     "initialRows": 30,
     "launchMode": "default",
+    "alwaysOnTop": false,
 
     // Selection
     "copyOnSelect": false,
-    "copyFormatting": false,
+    "copyFormatting": true,
     "wordDelimiters": " /\\()\"'-.,:;<>~!@#$%^&*|+=[]{}~?\u2502",
 
     // Tab UI
     "alwaysShowTabs": true,
     "showTabsInTitlebar": true,
     "showTerminalTitleInTitlebar": true,
     "tabWidthMode": "equal",
+    "useTabSwitcher": true,
 
     // Miscellaneous
     "confirmCloseAllTabs": true,
+    "startOnUserLogin":  false,
     "theme": "system",
     "snapToGridOnResize": true,
 
     "profiles":
     [
         {
-            "guid": "{550ce7b8-d500-50ad-8a1a-c400c3262db3}",
-            "name": "Telnet Loopback",
-            "commandline": "ms-telnet-loop://127.0.0.1:23",
-            "connectionType" : "{311153fb-d3f0-4ac6-b920-038de7cf5289}",
+            "guid": "{70bfecf4-bcbb-443b-a8fa-d7ac4f7ad201}",
+            "name": "PowerShell",
+            "commandline": "pwsh.exe",
+            "icon": "ms-appx:///ProfileIcons/pwsh.png",
+            "colorScheme": "Campbell",
+            "antialiasingMode": "grayscale",
+            "closeOnExit": "graceful",
+            "cursorShape": "bar",
+            "fontFace": "Cascadia Mono",
+            "fontSize": 12,
             "hidden": false,
-            "startingDirectory": "%USERPROFILE%",
+            "historySize": 9001,
+            "padding": "8, 8, 8, 8",
+            "snapOnInput": true,
+            "altGrAliasing": true,
+            "startingDirectory": "%SystemRoot%",
+            "useAcrylic": false,
+            "backgroundImage": "ms-appx:///internal-background.png",
+            "backgroundImageAlignment": "bottomRight",
+            "backgroundImageOpacity": 0.4,
+            "backgroundImageStretchMode": "none"
+        },
+        {
+            "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+            "name": "Command Prompt",
+            "commandline": "%SystemRoot%\\System32\\cmd.exe",
+            "icon": "ms-appx:///ProfileIcons/{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.png",
+            "colorScheme": "Campbell",
+            "antialiasingMode": "grayscale",
             "closeOnExit": "graceful",
-            "colorScheme": "Vintage",
-            "cursorColor": "#FFFFFF",
             "cursorShape": "bar",
             "fontFace": "Cascadia Mono",
-            "icon": "ms-appx:///ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.png",
+            "fontSize": 12,
+            "hidden": false,
+            "historySize": 9001,
             "padding": "8, 8, 8, 8",
             "snapOnInput": true,
             "altGrAliasing": true,
+            "startingDirectory": "%SystemRoot%",
             "useAcrylic": false,
             "backgroundImage": "ms-appx:///internal-background.png",
             "backgroundImageAlignment": "bottomRight",
@@ -51,25 +78,26 @@
     "schemes":
     [
         {
-            "name": "Vintage",
-            "foreground": "#C0C0C0",
-            "background": "#000000",
-            "black": "#000000",
-            "red": "#800000",
-            "green": "#008000",
-            "yellow": "#808000",
-            "blue": "#000080",
-            "purple": "#800080",
-            "cyan": "#008080",
-            "white": "#C0C0C0",
-            "brightBlack": "#808080",
-            "brightRed": "#FF0000",
-            "brightGreen": "#00FF00",
-            "brightYellow": "#FFFF00",
-            "brightBlue": "#0000FF",
-            "brightPurple": "#FF00FF",
-            "brightCyan": "#00FFFF",
-            "brightWhite": "#FFFFFF"
+            "name": "Campbell",
+            "foreground": "#CCCCCC",
+            "background": "#0C0C0C",
+            "cursorColor": "#FFFFFF",
+            "black": "#0C0C0C",
+            "red": "#C50F1F",
+            "green": "#13A10E",
+            "yellow": "#C19C00",
+            "blue": "#0037DA",
+            "purple": "#881798",
+            "cyan": "#3A96DD",
+            "white": "#CCCCCC",
+            "brightBlack": "#767676",
+            "brightRed": "#E74856",
+            "brightGreen": "#16C60C",
+            "brightYellow": "#F9F1A5",
+            "brightBlue": "#3B78FF",
+            "brightPurple": "#B4009E",
+            "brightCyan": "#61D6D6",
+            "brightWhite": "#F2F2F2"
         }
     ],
     "actions":
@@ -78,14 +106,21 @@
         { "command": "closeWindow", "keys": "alt+f4" },
         { "command": "toggleFullscreen", "keys": "alt+enter" },
         { "command": "toggleFullscreen", "keys": "f11" },
+        { "command": "toggleFocusMode" },
+        { "command": "toggleAlwaysOnTop" },
         { "command": "openNewTabDropdown", "keys": "ctrl+shift+space" },
         { "command": "openSettings", "keys": "ctrl+," },
+        { "command": { "action": "openSettings", "target": "defaultsFile" }, "keys": "ctrl+alt+," },
         { "command": "find", "keys": "ctrl+shift+f" },
+        { "command": "toggleRetroEffect" },
+        { "command": "openTabColorPicker" },
         { "command": "commandPalette", "keys":"ctrl+shift+p" },
 
         // Tab Management
         // "command": "closeTab" is unbound by default.
         //   The closeTab command closes a tab without confirmation, even if it has multiple panes.
+        { "command": "closeOtherTabs" },
+        { "command": "closeTabsAfter" },
         { "command": "newTab", "keys": "ctrl+shift+t" },
         { "command": { "action": "newTab", "index": 0 }, "keys": "ctrl+shift+1" },
         { "command": { "action": "newTab", "index": 1 }, "keys": "ctrl+shift+2" },
@@ -121,6 +156,7 @@
         { "command": { "action": "moveFocus", "direction": "left" }, "keys": "alt+left" },
         { "command": { "action": "moveFocus", "direction": "right" }, "keys": "alt+right" },
         { "command": { "action": "moveFocus", "direction": "up" }, "keys": "alt+up" },
+        { "command": "togglePaneZoom" },
 
         // Clipboard Integration
         { "command": { "action": "copy", "singleLine": false }, "keys": "ctrl+shift+c" },
@@ -137,6 +173,53 @@
         // Visual Adjustments
         { "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+=" },
         { "command": { "action": "adjustFontSize", "delta": -1 }, "keys": "ctrl+-" },
-        { "command": "resetFontSize", "keys": "ctrl+0" }
+        { "command": "resetFontSize", "keys": "ctrl+0" },
+
+        // Other commands
+        {
+            // Select color scheme...
+            "name": { "key": "SetColorSchemeParentCommandName" },
+            "commands": [
+                {
+                    "iterateOn": "schemes",
+                    "name": "${scheme.name}",
+                    "command": { "action": "setColorScheme", "colorScheme": "${scheme.name}" }
+                }
+            ]
+        },
+        {
+            // New tab...
+            "name": { "key": "NewTabParentCommandName" },
+            "commands": [
+                {
+                    "iterateOn": "profiles",
+                    "icon": "${profile.icon}",
+                    "name": "${profile.name}",
+                    "command": { "action": "newTab", "profile": "${profile.name}" }
+                }
+            ]
+        },
+        {
+            // Split pane...
+            "name": { "key": "SplitPaneParentCommandName" },
+            "commands": [
+                {
+                    "iterateOn": "profiles",
+                    "icon": "${profile.icon}",
+                    "name": "${profile.name}...",
+                    "commands": [
+                        {
+                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "auto" }
+                        },
+                        {
+                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "vertical" }
+                        },
+                        {
+                            "command": { "action": "splitPane", "profile": "${profile.name}", "split": "horizontal" }
+                        }
+                    ]
+                }
+            ]
+        }
     ]
 }
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>