From 1e788820e029e161fcb09362b17374d057e35676 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Tue, 13 Oct 2026 12:59:57 -0500 Subject: [PATCH] Fix OS build after ingesting e90f9a534cae (!17124121) (#20801) This also updates the git2git filter. --- consolegit2gitfilters.json | 9 ++++++--- src/terminal/adapter/ut_adapter/sources | 1 + src/tools/integrity/exeuwp/sources | 1 + src/tools/integrity/exewin32/sources | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/consolegit2gitfilters.json b/consolegit2gitfilters.json index 639a9ec549..c1808177d8 100644 --- a/consolegit2gitfilters.json +++ b/consolegit2gitfilters.json @@ -4,6 +4,7 @@ ], "ContainsFilters": [ "/.", + "/AGENTS.md", "/.git/", "/obj/", "/bin/", @@ -31,8 +32,8 @@ "/src/tools/schemes-fragment/", "/scratch/", "/tools/ReleaseEngineering/", - "/policies/", - "Scratch.sln", + "/tools/GenerateSettingsIndex.ps1", + "/policies/" ], "SuffixFilters": [ ".dbb", @@ -54,6 +55,8 @@ ".vcxproj.filters", ".Build.props", ".Build.targets", - "OpenConsole.slnx" + ".sln", + ".slnx", + ".slnf" ] } diff --git a/src/terminal/adapter/ut_adapter/sources b/src/terminal/adapter/ut_adapter/sources index 171cda32ea..604cb1233e 100644 --- a/src/terminal/adapter/ut_adapter/sources +++ b/src/terminal/adapter/ut_adapter/sources @@ -28,6 +28,7 @@ SOURCES = \ inputTest.cpp \ kittyKeyboardProtocol.cpp \ MouseInputTest.cpp \ + TestHook.cpp \ INCLUDES = \ $(INCLUDES); \ diff --git a/src/tools/integrity/exeuwp/sources b/src/tools/integrity/exeuwp/sources index bae40934cd..5de7788d9d 100644 --- a/src/tools/integrity/exeuwp/sources +++ b/src/tools/integrity/exeuwp/sources @@ -24,6 +24,7 @@ INCLUDES= \ ..\lib; \ TARGETLIBS= \ + $(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \ $(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \ $(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore_legacy.lib \ $(ONECORE_EXTERNAL_SDK_LIB_PATH)\onecoreuap.lib \ diff --git a/src/tools/integrity/exewin32/sources b/src/tools/integrity/exewin32/sources index fe1f618345..7a49687d3f 100644 --- a/src/tools/integrity/exewin32/sources +++ b/src/tools/integrity/exewin32/sources @@ -21,6 +21,7 @@ C_DEFINES=-DUNICODE TARGETLIBS=\ $(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \ $(WINCORE_OBJ_PATH)\console\open\src\tools\integrity\lib\$(O)\conintegritylib.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_PATH)\ntdll.lib \ SOURCES=main.cpp \ res.rc \