Skip to content

Commit 48e2d93

Browse files
committed
Remove TerminalAzBridge and use AzureConnection directly (#19528)
We used to run the cloud shell connector in an intermediate process because our VT implementation lived mostly in conhost. James fixed that up over the intervening years, and since #17510 landed Terminal is exposed to 100% of application-originated VT. That means we no longer need this workaround, its build steps, or anything else about it. Closes #4661 (cherry picked from commit 4b946c0) Service-Card-Id: PVTI_lADOAF3p4s4BBcTlzgkCt5k Service-Version: 1.24
1 parent 6ba10c1 commit 48e2d93

10 files changed

Lines changed: 2 additions & 391 deletions

File tree

build/config/esrp.build.batch.terminal_constituents.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"PackageContents/WindowsTerminalShellExt.dll",
1818

1919
// The rest
20-
"PackageContents/TerminalAzBridge.exe",
2120
"PackageContents/wt.exe",
2221
"PackageContents/WindowsTerminal.exe",
2322
"PackageContents/elevate-shim.exe"

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@
7777
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
7878
<Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
7979
</ProjectReference>
80-
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
81-
<Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
82-
</ProjectReference>
8380
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
8481
<Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
8582
</ProjectReference>

src/cascadia/TerminalApp/TerminalPage.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,18 +1490,8 @@ namespace winrt::TerminalApp::implementation
14901490
if (connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
14911491
TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
14921492
{
1493-
std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
1494-
azBridgePath.replace_filename(L"TerminalAzBridge.exe");
1495-
if constexpr (Feature_AzureConnectionInProc::IsEnabled())
1496-
{
1497-
connection = TerminalConnection::AzureConnection{};
1498-
}
1499-
else
1500-
{
1501-
connection = TerminalConnection::ConptyConnection{};
1502-
}
1503-
1504-
valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
1493+
connection = TerminalConnection::AzureConnection{};
1494+
valueSet = TerminalConnection::ConptyConnection::CreateSettings(winrt::hstring{},
15051495
L".",
15061496
L"Azure",
15071497
false,

src/cascadia/TerminalAzBridge/ConsoleInputReader.cpp

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/cascadia/TerminalAzBridge/ConsoleInputReader.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

Lines changed: 0 additions & 93 deletions
This file was deleted.

src/cascadia/TerminalAzBridge/main.cpp

Lines changed: 0 additions & 108 deletions
This file was deleted.

src/cascadia/TerminalAzBridge/pch.cpp

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)