Port OSS consumption changes from OS PR !12826284 (#18853)

DHowett · web-flow · commit a233b18d74b3 · 2025-04-29T20:23:23.000Z
sources and sources.dep goo mostly.
diff --git a/src/audio/midi/lib/sources.dep b/src/audio/midi/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/buffer/out/lib/sources.dep b/src/buffer/out/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/buffer/out/ut_textbuffer/sources.dep b/src/buffer/out/ut_textbuffer/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/host/exe/sources.dep b/src/host/exe/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/host/ft_host/sources.dep b/src/host/ft_host/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/host/lib/sources.dep b/src/host/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/host/ut_host/sources.dep b/src/host/ut_host/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/host/ut_lib/sources.dep b/src/host/ut_lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/interactivity/base/lib/sources.dep b/src/interactivity/base/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/interactivity/onecore/lib/sources.dep b/src/interactivity/onecore/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/interactivity/win32/lib/sources.dep b/src/interactivity/win32/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/interactivity/win32/sources.inc b/src/interactivity/win32/sources.inc
@@ -60,4 +60,5 @@ INCLUDES = \
     ..; \
 
 TARGETLIBS = \
+    $(TARGETLIBS) \
     $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib  \
diff --git a/src/interactivity/win32/ut_interactivity_win32/sources.dep b/src/interactivity/win32/ut_interactivity_win32/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/project.inc b/src/project.inc
@@ -4,16 +4,16 @@
 # -------------------------------------
 
 # Pull our dependencies from vcpkg. This includes gsl - if you run into errors
-# from a missing gsl, make sure you go build onecore/window/vcpkg first.
+# from a missing gsl or fmt, make sure you go build .../console/vcpkg first.
 
-!include $(PROJECT_ROOT)\vcpkg\consume.inc
+!include $(PROJECT_ROOT)\core\console\vcpkg\consume.inc
 
 # -------------------------------------
 # Preprocessor Settings
 # -------------------------------------
 
 UNICODE                 = 1
-C_DEFINES               = $(C_DEFINES) -DUNICODE -D_UNICODE -DFMT_HEADER_ONLY -D__INSIDE_WINDOWS -DBUILD_ONECORE_INTERACTIVITY
+C_DEFINES               = $(C_DEFINES) -DUNICODE -D_UNICODE -D__INSIDE_WINDOWS -DBUILD_ONECORE_INTERACTIVITY
 
 # -------------------------------------
 # CRT Configuration
@@ -50,7 +50,6 @@ INCLUDES= \
     $(CONSOLE_SRC_PATH)\inc; \
     $(CONSOLE_SRC_PATH)\..\..\inc; \
     $(CONSOLE_SRC_PATH)\..\oss\chromium; \
-    $(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
     $(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
     $(CONSOLE_SRC_PATH)\..\oss\pcg\include; \
     $(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
diff --git a/src/project.unittest.inc b/src/project.unittest.inc
@@ -9,7 +9,7 @@
 # Preprocessor Settings
 # -------------------------------------
 
-C_DEFINES               = $(C_DEFINES) -DINLINE_TEST_METHOD_MARKUP -DUNIT_TESTING -DFMT_HEADER_ONLY
+C_DEFINES               = $(C_DEFINES) -DINLINE_TEST_METHOD_MARKUP -DUNIT_TESTING
 
 # -------------------------------------
 # Program Information
diff --git a/src/propsheet/sources b/src/propsheet/sources
@@ -78,6 +78,7 @@ INCLUDES = \
     ..\host; \
 
 TARGETLIBS = \
+    $(TARGETLIBS) \
     $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \
     $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecoreuap.lib \
     $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \
diff --git a/src/propsheet/sources.dep b/src/propsheet/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/propslib/sources.dep b/src/propslib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/renderer/base/lib/sources.dep b/src/renderer/base/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/renderer/gdi/lib/sources.dep b/src/renderer/gdi/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/renderer/wddmcon/lib/sources.dep b/src/renderer/wddmcon/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/server/lib/sources.dep b/src/server/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/adapter/lib/sources.dep b/src/terminal/adapter/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/adapter/ut_adapter/sources.dep b/src/terminal/adapter/ut_adapter/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/input/lib/sources.dep b/src/terminal/input/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/parser/ft_fuzzer/sources b/src/terminal/parser/ft_fuzzer/sources
@@ -3,7 +3,7 @@
 # - Console Virtual Terminal Parser Fuzzer
 # -------------------------------------
 
-!include $(PROJECT_ROOT)\vcpkg\consume.inc
+!include ..\..\..\..\..\vcpkg\consume.inc
 
 # This program will generate fuzz input for the parsing engine
 # and is to be used in conjunction with the fuzz wrapper tool.
@@ -47,6 +47,7 @@ C_DEFINES               = $(C_DEFINES) -DUNICODE -D_UNICODE
 
 USE_STD_CPP20           = 1
 MSC_WARNING_LEVEL       = /W4 /WX
+USER_C_FLAGS            = $(USER_C_FLAGS) /Zc:preprocessor /fp:contract /utf-8
 
 # -------------------------------------
 # Build System Settings
@@ -68,7 +69,6 @@ SOURCES = \
 INCLUDES = \
     ..\..\..\inc; \
     $(CONSOLE_SRC_PATH)\..\oss\chromium; \
-    $(CONSOLE_SRC_PATH)\..\oss\fmt\include; \
     $(CONSOLE_SRC_PATH)\..\oss\interval_tree; \
     $(INCLUDES) \
 
diff --git a/src/terminal/parser/ft_fuzzer/sources.dep b/src/terminal/parser/ft_fuzzer/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/parser/ft_fuzzwrapper/sources.dep b/src/terminal/parser/ft_fuzzwrapper/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/parser/lib/sources.dep b/src/terminal/parser/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/terminal/parser/ut_parser/sources.dep b/src/terminal/parser/ut_parser/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/til/ut_til/sources.dep b/src/til/ut_til/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/tools/vtpipeterm/sources b/src/tools/vtpipeterm/sources
@@ -18,6 +18,7 @@ USE_NATIVE_EH           = 1
 C_DEFINES=-DUNICODE -D__INSIDE_WINDOWS
 
 TARGETLIBS=\
+    $(TARGETLIBS) \
     $(MINWIN_EXTERNAL_SDK_LIB_PATH_L)\ntdll.lib \
     $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib
 
diff --git a/src/tsf/sources.dep b/src/tsf/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/types/lib/sources.dep b/src/types/lib/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 
diff --git a/src/types/ut_types/sources.dep b/src/types/ut_types/sources.dep
@@ -1,3 +1,3 @@
 BUILD_PASS1_CONSUMES= \
-    onecore\windows\vcpkg|PASS1 \
+    onecore\windows\core\console\vcpkg|PASS1 \
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`BUILD_PASS1_CONSUMES= \`
`2`		`- onecore\windows\vcpkg\|PASS1 \`
	`2`	`+ onecore\windows\core\console\vcpkg\|PASS1 \`
`3`	`3`