Skip to content

Commit fe4069d

Browse files
carlos-zamoracarlos-zamora
committed
Merge branch 'main' into fix-tab-acrylic-unfocused
2 parents 3abee35 + 7f91e94 commit fe4069d

File tree

65 files changed

+4770
-619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4770
-619
lines changed

‎.github/actions/spelling/expect/expect.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ minkernel
10171017
MINMAXINFO
10181018
minwin
10191019
minwindef
1020+
misprediction
10201021
MMBB
10211022
mmcc
10221023
MMCPL

‎build/pipelines/templates-v2/job-build-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ jobs:
133133
$SignFragments += "wpfdotnet"
134134
}
135135
If ([bool]::Parse("${{ parameters.buildWPF }}")) {
136-
$BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
136+
$BuildTargets += "Terminal\Control\TerminalControl"
137137
$SignFragments += "wpf"
138138
}
139139
If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
140-
$BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
140+
$BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
141141
$SignFragments += "conpty"
142142
}
143143
Write-Host "Targets: $($BuildTargets -Join ";")"

‎dep/vcpkg-overlay-triplets/arm64-windows-static.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Same as the official arm64-windows-static triplet
2+
set(VCPKG_TARGET_ARCHITECTURE arm64)
3+
set(VCPKG_CRT_LINKAGE static)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)

‎dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
# Same as the official arm64-windows-static triplet
12
set(VCPKG_TARGET_ARCHITECTURE arm64)
23
set(VCPKG_CRT_LINKAGE static)
34
set(VCPKG_LIBRARY_LINKAGE static)
45

6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)
9+
510
set(VCPKG_CXX_FLAGS /fsanitize=address)
611
set(VCPKG_C_FLAGS /fsanitize=address)

‎dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
# Same as the official x64-windows-static triplet
12
set(VCPKG_TARGET_ARCHITECTURE x64)
23
set(VCPKG_CRT_LINKAGE static)
34
set(VCPKG_LIBRARY_LINKAGE static)
45

6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)
9+
510
set(VCPKG_CXX_FLAGS /fsanitize=address)
611
set(VCPKG_C_FLAGS /fsanitize=address)

‎dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
# Same as the official x86-windows-static triplet
12
set(VCPKG_TARGET_ARCHITECTURE x86)
23
set(VCPKG_CRT_LINKAGE static)
34
set(VCPKG_LIBRARY_LINKAGE static)
45

6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)
9+
510
set(VCPKG_CXX_FLAGS /fsanitize=address)
611
set(VCPKG_C_FLAGS /fsanitize=address)

‎dep/vcpkg-overlay-triplets/x64-windows-static.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Same as the official x64-windows-static triplet
2+
set(VCPKG_TARGET_ARCHITECTURE x64)
3+
set(VCPKG_CRT_LINKAGE static)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)

‎dep/vcpkg-overlay-triplets/x86-windows-static.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Same as the official x86-windows-static triplet
2+
set(VCPKG_TARGET_ARCHITECTURE x86)
3+
set(VCPKG_CRT_LINKAGE static)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
6+
# ...but with explicit platform toolset, so that future toolsets
7+
# aren't automatically picked up (it defaults to the latest one).
8+
set(VCPKG_PLATFORM_TOOLSET v143)

‎src/cascadia/CascadiaPackage/Resources/uk-UA/Resources.resw‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@
122122
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
123123
</data>
124124
<data name="AppNameCan" xml:space="preserve">
125-
<value>Термінал Canary</value>
125+
<value>Terminal Canary</value>
126126
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
127127
</data>
128128
<data name="AppNamePre" xml:space="preserve">
129-
<value>Попередній перегляд Терміналу</value>
129+
<value>Попередній перегляд Термінала</value>
130130
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
131131
</data>
132132
<data name="AppStoreName" xml:space="preserve">
133133
<value>Термінал Windows</value>
134134
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
135135
</data>
136136
<data name="AppStoreNameCan" xml:space="preserve">
137-
<value>Термінал Windows Canary</value>
137+
<value>Windows Terminal Canary</value>
138138
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}. "Canary" in this context means an unstable or nightly build of a software product, not the bird.</comment>
139139
</data>
140140
<data name="AppStoreNamePre" xml:space="preserve">
@@ -146,11 +146,11 @@
146146
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
147147
</data>
148148
<data name="AppShortNameCan" xml:space="preserve">
149-
<value>Термінал Canary</value>
149+
<value>Terminal Canary</value>
150150
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
151151
</data>
152152
<data name="AppShortNamePre" xml:space="preserve">
153-
<value>Попередній перегляд Терміналу</value>
153+
<value>Попередній перегляд Термінала</value>
154154
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
155155
</data>
156156
<data name="AppDescription" xml:space="preserve">
@@ -164,11 +164,11 @@
164164
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
165165
</data>
166166
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
167-
<value>Відкрити в &amp;підготовчій версії Терміналу</value>
167+
<value>Відкрити в &amp;підготовчій версії Terminal</value>
168168
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
169169
</data>
170170
<data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
171-
<value>Відкрити в &amp;Терміналі</value>
171+
<value>Відкрити в &amp;Terminal</value>
172172
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
173173
</data>
174-
</root>
174+
</root>

‎src/cascadia/TerminalApp/DebugTapConnection.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,25 +120,25 @@ namespace winrt::Microsoft::TerminalApp::implementation
120120
return ConnectionState::Failed;
121121
}
122122

123-
void DebugTapConnection::_OutputHandler(const std::wstring_view str)
123+
void DebugTapConnection::_OutputHandler(const winrt::array_view<const char16_t> str)
124124
{
125-
auto output = til::visualize_control_codes(str);
125+
auto output = til::visualize_control_codes(winrt_array_to_wstring_view(str));
126126
// To make the output easier to read, we introduce a line break whenever
127127
// an LF control is encountered. But at this point, the LF would have
128128
// been converted to U+240A (␊), so that's what we need to search for.
129129
for (size_t lfPos = 0; (lfPos = output.find(L'\u240A', lfPos)) != std::wstring::npos;)
130130
{
131131
output.insert(++lfPos, L"\r\n");
132132
}
133-
TerminalOutput.raise(output);
133+
TerminalOutput.raise(winrt_wstring_to_array_view(output));
134134
}
135135

136136
// Called by the DebugInputTapConnection to print user input
137137
void DebugTapConnection::_PrintInput(const std::wstring_view str)
138138
{
139139
auto clean{ til::visualize_control_codes(str) };
140140
auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
141-
TerminalOutput.raise(formatted);
141+
TerminalOutput.raise(winrt_wstring_to_array_view(formatted));
142142
}
143143

144144
// Wire us up so that we can forward input through

0 commit comments

Comments
 (0)
⚡