Skip to content

Commit 4b946c0

Browse files
authored
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
1 parent 63d7a19 commit 4b946c0

File tree

11 files changed

+2
-401
lines changed

11 files changed

+2
-401
lines changed

OpenConsole.slnx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -723,16 +723,6 @@
723723
<Build Solution="Fuzzing|x64" Project="false" />
724724
<Build Solution="Fuzzing|x86" Project="false" />
725725
</Project>
726-
<Project Path="src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj" Id="067f0a06-fcb7-472c-96e9-b03b54e8e18d">
727-
<BuildDependency Project="src/cascadia/TerminalConnection/TerminalConnection.vcxproj" />
728-
<BuildType Solution="AuditMode|x64" Project="Release" />
729-
<Platform Solution="*|Any CPU" Project="Win32" />
730-
<Build Solution="*|Any CPU" Project="false" />
731-
<Build Solution="AuditMode|x64" Project="false" />
732-
<Build Solution="Fuzzing|ARM64" Project="false" />
733-
<Build Solution="Fuzzing|x64" Project="false" />
734-
<Build Solution="Fuzzing|x86" Project="false" />
735-
</Project>
736726
<Project Path="src/cascadia/UIHelpers/UIHelpers.vcxproj" Id="6515f03f-e56d-4db4-b23d-ac4fb80db36f">
737727
<Build Solution="*|Any CPU" Project="false" />
738728
<Build Solution="AuditMode|ARM64" Project="false" />

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
@@ -1491,18 +1491,8 @@ namespace winrt::TerminalApp::implementation
14911491
if (connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
14921492
TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
14931493
{
1494-
std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
1495-
azBridgePath.replace_filename(L"TerminalAzBridge.exe");
1496-
if constexpr (Feature_AzureConnectionInProc::IsEnabled())
1497-
{
1498-
connection = TerminalConnection::AzureConnection{};
1499-
}
1500-
else
1501-
{
1502-
connection = TerminalConnection::ConptyConnection{};
1503-
}
1504-
1505-
valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
1494+
connection = TerminalConnection::AzureConnection{};
1495+
valueSet = TerminalConnection::ConptyConnection::CreateSettings(winrt::hstring{},
15061496
L".",
15071497
L"Azure",
15081498
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)