From ecfaa76a895da18a2997c4e7dbd4b3fccdf2d889 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett (MSFT)" Date: Tue, 11 Jun 2019 17:01:26 -0700 Subject: [PATCH] inbox: merge refactoring payload from FI `official/rs_onecore_dep_acioss 6fa4fbe485365ed72be2f557621fe58d4fc75197` --- src/host/sources.inc | 11 ++++++----- src/interactivity/win32/sources.inc | 2 +- .../win32/ut_interactivity_win32/sources | 10 +++++----- src/project.inc | 1 + src/project.unittest.inc | 2 +- src/propsheet/sources | 4 ++-- src/terminal/adapter/sources.inc | 2 +- src/terminal/adapter/ut_adapter/sources | 10 +++++----- src/terminal/parser/ft_fuzzer/sources | 2 +- src/terminal/parser/ft_fuzzwrapper/sources | 2 +- src/terminal/parser/ut_parser/sources | 10 +++++----- src/tools/integrity/exeuwp/sources | 6 +++--- src/tools/integrity/exewin32/sources | 2 +- src/tools/nihilist/sources | 2 +- src/tools/vtpipeterm/sources | 4 ++-- src/tsf/sources | 1 + 16 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/host/sources.inc b/src/host/sources.inc index c4465675f0..e7238dcf28 100644 --- a/src/host/sources.inc +++ b/src/host/sources.inc @@ -132,6 +132,7 @@ INCLUDES = \ $(SHELL_INC_PATH); \ $(INTERNAL_SDK_INC_PATH); \ $(ONECORE_INTERNAL_SDK_INC_PATH); \ + $(ONECORE_EXTERNAL_SDK_INC_PATH); \ # Anything defined here will be defined BEFORE the CRT items the build system adds. CRTLIBS = \ @@ -144,11 +145,11 @@ TARGETLIBS = \ $(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \ $(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \ - $(SDK_LIB_PATH)\propsys.lib \ - $(SDK_LIB_PATH)\d2d1.lib \ - $(SDK_LIB_PATH)\dwrite.lib \ - $(SDK_LIB_PATH)\dxgi.lib \ - $(SDK_LIB_PATH)\d3d11.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \ $(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \ $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \ diff --git a/src/interactivity/win32/sources.inc b/src/interactivity/win32/sources.inc index 5b226c76c3..5e8cdc6cd3 100644 --- a/src/interactivity/win32/sources.inc +++ b/src/interactivity/win32/sources.inc @@ -64,4 +64,4 @@ INCLUDES = \ ..; \ TARGETLIBS = \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \ diff --git a/src/interactivity/win32/ut_interactivity_win32/sources b/src/interactivity/win32/ut_interactivity_win32/sources index f2e32fb63f..3612500c86 100644 --- a/src/interactivity/win32/ut_interactivity_win32/sources +++ b/src/interactivity/win32/ut_interactivity_win32/sources @@ -37,11 +37,11 @@ TARGETLIBS = \ $(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \ $(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \ - $(SDK_LIB_PATH)\propsys.lib \ - $(SDK_LIB_PATH)\d2d1.lib \ - $(SDK_LIB_PATH)\dwrite.lib \ - $(SDK_LIB_PATH)\dxgi.lib \ - $(SDK_LIB_PATH)\d3d11.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \ $(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \ $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \ diff --git a/src/project.inc b/src/project.inc index 5dd90cf0a5..bd1b7ecc09 100644 --- a/src/project.inc +++ b/src/project.inc @@ -41,6 +41,7 @@ INCLUDES= \ $(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \ $(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \ $(ONECORE_INTERNAL_SDK_INC_PATH); \ + $(ONECORE_EXTERNAL_SDK_INC_PATH); \ # ------------------------------------- # Linker Settings diff --git a/src/project.unittest.inc b/src/project.unittest.inc index f6c2e4ca23..13b0caa9f4 100644 --- a/src/project.unittest.inc +++ b/src/project.unittest.inc @@ -31,7 +31,7 @@ INCLUDES = \ TARGETLIBS = \ $(TARGETLIBS) \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \ $(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Common.lib \ $(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Wex.Logger.lib \ $(ONECORESDKTOOLS_INTERNAL_LIB_PATH_L)\WexTest\Cue\Te.Common.lib \ diff --git a/src/propsheet/sources b/src/propsheet/sources index 8b47d1e535..34cc91109d 100644 --- a/src/propsheet/sources +++ b/src/propsheet/sources @@ -77,8 +77,8 @@ INCLUDES = \ ..\host; \ TARGETLIBS = \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ - $(ONECORE_SDK_LIB_VPATH)\onecoreuap.lib \ + $(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 \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecoreuap_internal.lib \ $(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \ diff --git a/src/terminal/adapter/sources.inc b/src/terminal/adapter/sources.inc index b972d02638..0169a0a574 100644 --- a/src/terminal/adapter/sources.inc +++ b/src/terminal/adapter/sources.inc @@ -46,7 +46,7 @@ INCLUDES = \ TARGETLIBS= \ $(TARGETLIBS) \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \ $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-ntuser-keyboard-l1.lib \ DLOAD_ERROR_HANDLER = kernelbase diff --git a/src/terminal/adapter/ut_adapter/sources b/src/terminal/adapter/ut_adapter/sources index fe0669e5cb..d8d332e93e 100644 --- a/src/terminal/adapter/ut_adapter/sources +++ b/src/terminal/adapter/ut_adapter/sources @@ -41,11 +41,11 @@ TARGETLIBS = \ $(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \ $(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \ - $(SDK_LIB_PATH)\propsys.lib \ - $(SDK_LIB_PATH)\d2d1.lib \ - $(SDK_LIB_PATH)\dwrite.lib \ - $(SDK_LIB_PATH)\dxgi.lib \ - $(SDK_LIB_PATH)\d3d11.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \ $(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \ $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \ diff --git a/src/terminal/parser/ft_fuzzer/sources b/src/terminal/parser/ft_fuzzer/sources index f524334a1b..2538a6b832 100644 --- a/src/terminal/parser/ft_fuzzer/sources +++ b/src/terminal/parser/ft_fuzzer/sources @@ -67,5 +67,5 @@ INCLUDES = \ TARGETLIBS = \ $(TARGETLIBS) \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \ diff --git a/src/terminal/parser/ft_fuzzwrapper/sources b/src/terminal/parser/ft_fuzzwrapper/sources index c9cc02aaaf..81d07b7543 100644 --- a/src/terminal/parser/ft_fuzzwrapper/sources +++ b/src/terminal/parser/ft_fuzzwrapper/sources @@ -53,5 +53,5 @@ INCLUDES = \ TARGETLIBS = \ $(TARGETLIBS) \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib \ $(OBJ_PATH)\..\lib\$(O)\ConTermParser.lib \ diff --git a/src/terminal/parser/ut_parser/sources b/src/terminal/parser/ut_parser/sources index 2be0961588..2c910da6ca 100644 --- a/src/terminal/parser/ut_parser/sources +++ b/src/terminal/parser/ut_parser/sources @@ -33,11 +33,11 @@ TARGETLIBS = \ $(ONECORE_INTERNAL_SDK_LIB_PATH)\onecoreuuid.lib \ $(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecore_internal.lib \ - $(SDK_LIB_PATH)\propsys.lib \ - $(SDK_LIB_PATH)\d2d1.lib \ - $(SDK_LIB_PATH)\dwrite.lib \ - $(SDK_LIB_PATH)\dxgi.lib \ - $(SDK_LIB_PATH)\d3d11.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\propsys.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d2d1.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \ + $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \ $(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \ $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \ $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \ diff --git a/src/tools/integrity/exeuwp/sources b/src/tools/integrity/exeuwp/sources index 6bb1d0a60d..63b9597738 100644 --- a/src/tools/integrity/exeuwp/sources +++ b/src/tools/integrity/exeuwp/sources @@ -25,9 +25,9 @@ INCLUDES= \ ..\lib; \ TARGETLIBS= \ - $(MINCORE_SDK_LIB_PATH)\mincore.lib \ - $(MINCORE_SDK_LIB_PATH)\mincore_legacy.lib \ - $(SDK_LIB_PATH)\onecoreuap.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 \ $(WINCORE_OBJ_PATH)\console\open\src\tools\integrity\lib\$(O)\conintegritylib.lib \ SOURCES= \ diff --git a/src/tools/integrity/exewin32/sources b/src/tools/integrity/exewin32/sources index b9efd10f57..680e3842b9 100644 --- a/src/tools/integrity/exewin32/sources +++ b/src/tools/integrity/exewin32/sources @@ -20,7 +20,7 @@ USE_NATIVE_EH = 1 C_DEFINES=-DUNICODE TARGETLIBS=\ - $(MINCORE_SDK_LIB_PATH)\mincore.lib \ + $(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \ $(WINCORE_OBJ_PATH)\console\open\src\tools\integrity\lib\$(O)\conintegritylib.lib \ SOURCES=main.cpp \ diff --git a/src/tools/nihilist/sources b/src/tools/nihilist/sources index 1a34c86ce3..e1df374465 100644 --- a/src/tools/nihilist/sources +++ b/src/tools/nihilist/sources @@ -15,7 +15,7 @@ USE_UNICRT=1 C_DEFINES=-DUNICODE TARGETLIBS=\ - $(MINCORE_SDK_LIB_PATH)\mincore.lib \ + $(MINCORE_EXTERNAL_SDK_LIB_PATH_L)\mincore.lib \ SOURCES=main.cpp \ res.rc \ diff --git a/src/tools/vtpipeterm/sources b/src/tools/vtpipeterm/sources index 068ccf4214..ba06db52eb 100644 --- a/src/tools/vtpipeterm/sources +++ b/src/tools/vtpipeterm/sources @@ -19,8 +19,8 @@ USE_NATIVE_EH = 1 C_DEFINES=-DUNICODE -D__INSIDE_WINDOWS TARGETLIBS=\ - $(MINWIN_SDK_LIB_PATH)\ntdll.lib \ - $(ONECORE_SDK_LIB_VPATH)\onecore.lib + $(MINWIN_EXTERNAL_SDK_LIB_PATH_L)\ntdll.lib \ + $(ONECORE_EXTERNAL_SDK_LIB_VPATH_L)\onecore.lib SOURCES=main.cpp \ VtConsole.cpp \ diff --git a/src/tsf/sources b/src/tsf/sources index 98df12138f..1054a0039e 100644 --- a/src/tsf/sources +++ b/src/tsf/sources @@ -56,3 +56,4 @@ INCLUDES = \ $(ONECORE_PRIV_SDK_INC_PATH); \ $(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \ $(SDK_INC_PATH)\atl30; \ + $(ONECORE_EXTERNAL_SDK_INC_PATH)\atl30; \