Merge branch 'main' into dev/cazamor/sui/search

Author: carlos-zamora

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

@@ -1017,6 +1017,7 @@ minkernel
 MINMAXINFO
 minwin
 minwindef
+misprediction
 MMBB
 mmcc
 MMCPL

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

@@ -133,11 +133,11 @@ jobs:
           $SignFragments += "wpfdotnet"
         }
         If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
+          $BuildTargets += "Terminal\Control\TerminalControl"
           $SignFragments += "wpf"
         }
         If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
+          $BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
           $SignFragments += "conpty"
         }
         Write-Host "Targets: $($BuildTargets -Join ";")"

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

@@ -0,0 +1,8 @@
+# Same as the official arm64-windows-static triplet
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)

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

@@ -1,6 +1,11 @@
+# Same as the official arm64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)
+
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

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

@@ -1,6 +1,11 @@
+# Same as the official x64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)
+
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

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

@@ -1,6 +1,11 @@
+# Same as the official x86-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x86)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)
+
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

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

@@ -0,0 +1,8 @@
+# Same as the official x64-windows-static triplet
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)

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

@@ -0,0 +1,8 @@
+# Same as the official x86-windows-static triplet
+set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# ...but with explicit platform toolset, so that future toolsets
+# aren't automatically picked up (it defaults to the latest one).
+set(VCPKG_PLATFORM_TOOLSET v143)

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -120,25 +120,25 @@ namespace winrt::Microsoft::TerminalApp::implementation
         return ConnectionState::Failed;
     }
 
-    void DebugTapConnection::_OutputHandler(const std::wstring_view str)
+    void DebugTapConnection::_OutputHandler(const winrt::array_view<const char16_t> str)
     {
-        auto output = til::visualize_control_codes(str);
+        auto output = til::visualize_control_codes(winrt_array_to_wstring_view(str));
         // To make the output easier to read, we introduce a line break whenever
         // an LF control is encountered. But at this point, the LF would have
         // been converted to U+240A (␊), so that's what we need to search for.
         for (size_t lfPos = 0; (lfPos = output.find(L'\u240A', lfPos)) != std::wstring::npos;)
         {
             output.insert(++lfPos, L"\r\n");
         }
-        TerminalOutput.raise(output);
+        TerminalOutput.raise(winrt_wstring_to_array_view(output));
     }
 
     // Called by the DebugInputTapConnection to print user input
     void DebugTapConnection::_PrintInput(const std::wstring_view str)
     {
         auto clean{ til::visualize_control_codes(str) };
         auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
-        TerminalOutput.raise(formatted);
+        TerminalOutput.raise(winrt_wstring_to_array_view(formatted));
     }
 
     // Wire us up so that we can forward input through

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -31,7 +31,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
 
     private:
         void _PrintInput(const std::wstring_view data);
-        void _OutputHandler(const std::wstring_view str);
+        void _OutputHandler(const winrt::array_view<const char16_t> str);
 
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::TerminalOutput_revoker _outputRevoker;
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::StateChanged_revoker _stateChangedRevoker;