From d21036d313ab5bda7c93451b14245338cd229b72 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Wed, 14 Sep 2022 18:03:49 +0000 Subject: [PATCH] Merged PR 7847415: [Git2Git] Migrate all GSL Golden Path references to use VCPkg Retrieved from https://microsoft.visualstudio.com os.2020 OS official/rs_we_adept_e4d2 7ea9457533db712ee8e8a5a11e1fbbdfc9430027 Related work items: MSFT:40841395 --- src/audio/midi/lib/sources.dep | 3 +++ src/buffer/out/lib/sources.dep | 3 +++ src/buffer/out/ut_textbuffer/sources.dep | 3 +++ src/host/exe/sources.dep | 3 +++ src/host/ft_host/sources.dep | 3 +++ src/host/lib/sources.dep | 3 +++ src/host/ut_host/sources.dep | 3 +++ src/host/ut_lib/sources.dep | 3 +++ src/interactivity/base/lib/sources.dep | 3 +++ src/interactivity/onecore/lib/sources.dep | 3 +++ src/interactivity/win32/lib/sources.dep | 3 +++ src/interactivity/win32/ut_interactivity_win32/sources.dep | 3 +++ src/project.inc | 2 +- src/propsheet/sources.dep | 3 +++ src/propslib/sources.dep | 3 +++ src/renderer/base/lib/sources.dep | 3 +++ src/renderer/gdi/lib/sources.dep | 3 +++ src/renderer/vt/lib/sources.dep | 3 +++ src/renderer/vt/ut_lib/sources.dep | 3 +++ src/renderer/wddmcon/lib/sources.dep | 3 +++ src/server/lib/sources.dep | 3 +++ src/terminal/adapter/lib/sources.dep | 3 +++ src/terminal/adapter/ut_adapter/sources.dep | 3 +++ src/terminal/input/lib/sources.dep | 3 +++ src/terminal/parser/ft_fuzzer/sources | 2 +- src/terminal/parser/ft_fuzzer/sources.dep | 3 +++ src/terminal/parser/ft_fuzzwrapper/sources.dep | 3 +++ src/terminal/parser/lib/sources.dep | 3 +++ src/terminal/parser/ut_parser/sources.dep | 3 +++ src/til/ut_til/sources.dep | 3 +++ src/tsf/sources.dep | 3 +++ src/types/lib/sources.dep | 3 +++ src/types/ut_types/sources.dep | 3 +++ 33 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 src/audio/midi/lib/sources.dep create mode 100644 src/buffer/out/lib/sources.dep create mode 100644 src/buffer/out/ut_textbuffer/sources.dep create mode 100644 src/host/exe/sources.dep create mode 100644 src/host/lib/sources.dep create mode 100644 src/host/ut_host/sources.dep create mode 100644 src/host/ut_lib/sources.dep create mode 100644 src/interactivity/base/lib/sources.dep create mode 100644 src/interactivity/onecore/lib/sources.dep create mode 100644 src/interactivity/win32/lib/sources.dep create mode 100644 src/interactivity/win32/ut_interactivity_win32/sources.dep create mode 100644 src/propsheet/sources.dep create mode 100644 src/propslib/sources.dep create mode 100644 src/renderer/base/lib/sources.dep create mode 100644 src/renderer/gdi/lib/sources.dep create mode 100644 src/renderer/vt/lib/sources.dep create mode 100644 src/renderer/vt/ut_lib/sources.dep create mode 100644 src/renderer/wddmcon/lib/sources.dep create mode 100644 src/server/lib/sources.dep create mode 100644 src/terminal/adapter/lib/sources.dep create mode 100644 src/terminal/adapter/ut_adapter/sources.dep create mode 100644 src/terminal/input/lib/sources.dep create mode 100644 src/terminal/parser/ft_fuzzer/sources.dep create mode 100644 src/terminal/parser/ft_fuzzwrapper/sources.dep create mode 100644 src/terminal/parser/lib/sources.dep create mode 100644 src/terminal/parser/ut_parser/sources.dep create mode 100644 src/til/ut_til/sources.dep create mode 100644 src/tsf/sources.dep create mode 100644 src/types/lib/sources.dep create mode 100644 src/types/ut_types/sources.dep diff --git a/src/audio/midi/lib/sources.dep b/src/audio/midi/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/audio/midi/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/buffer/out/lib/sources.dep b/src/buffer/out/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/buffer/out/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/buffer/out/ut_textbuffer/sources.dep b/src/buffer/out/ut_textbuffer/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/buffer/out/ut_textbuffer/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/host/exe/sources.dep b/src/host/exe/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/host/exe/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/host/ft_host/sources.dep b/src/host/ft_host/sources.dep index 4803f8d6bcb..11b0599b179 100644 --- a/src/host/ft_host/sources.dep +++ b/src/host/ft_host/sources.dep @@ -1,3 +1,6 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + BUILD_PASS2_CONSUMES= \ onecore\windows\core\console\open\src\tools\nihilist|PASS2 \ diff --git a/src/host/lib/sources.dep b/src/host/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/host/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/host/ut_host/sources.dep b/src/host/ut_host/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/host/ut_host/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/host/ut_lib/sources.dep b/src/host/ut_lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/host/ut_lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/interactivity/base/lib/sources.dep b/src/interactivity/base/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/interactivity/base/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/interactivity/onecore/lib/sources.dep b/src/interactivity/onecore/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/interactivity/onecore/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/interactivity/win32/lib/sources.dep b/src/interactivity/win32/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/interactivity/win32/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/interactivity/win32/ut_interactivity_win32/sources.dep b/src/interactivity/win32/ut_interactivity_win32/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/interactivity/win32/ut_interactivity_win32/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/project.inc b/src/project.inc index c1093144ef8..eb6de8821ca 100644 --- a/src/project.inc +++ b/src/project.inc @@ -3,7 +3,7 @@ # - Common Project Configuration # ------------------------------------- -!include $(OSDEPENDSROOT)\OSS\gsl\3.1.0\consume.inc +!include $(PROJECT_ROOT)\vcpkg\consume.inc # ------------------------------------- # Preprocessor Settings diff --git a/src/propsheet/sources.dep b/src/propsheet/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/propsheet/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/propslib/sources.dep b/src/propslib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/propslib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/renderer/base/lib/sources.dep b/src/renderer/base/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/renderer/base/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/renderer/gdi/lib/sources.dep b/src/renderer/gdi/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/renderer/gdi/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/renderer/vt/lib/sources.dep b/src/renderer/vt/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/renderer/vt/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/renderer/vt/ut_lib/sources.dep b/src/renderer/vt/ut_lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/renderer/vt/ut_lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/renderer/wddmcon/lib/sources.dep b/src/renderer/wddmcon/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/renderer/wddmcon/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/server/lib/sources.dep b/src/server/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/server/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/adapter/lib/sources.dep b/src/terminal/adapter/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/adapter/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/adapter/ut_adapter/sources.dep b/src/terminal/adapter/ut_adapter/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/adapter/ut_adapter/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/input/lib/sources.dep b/src/terminal/input/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/input/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/parser/ft_fuzzer/sources b/src/terminal/parser/ft_fuzzer/sources index 2909ddc83f7..7058734d00b 100644 --- a/src/terminal/parser/ft_fuzzer/sources +++ b/src/terminal/parser/ft_fuzzer/sources @@ -3,7 +3,7 @@ # - Console Virtual Terminal Parser Fuzzer # ------------------------------------- -!include $(OSDEPENDSROOT)\OSS\gsl\3.1.0\consume.inc +!include $(PROJECT_ROOT)\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. diff --git a/src/terminal/parser/ft_fuzzer/sources.dep b/src/terminal/parser/ft_fuzzer/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/parser/ft_fuzzer/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/parser/ft_fuzzwrapper/sources.dep b/src/terminal/parser/ft_fuzzwrapper/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/parser/ft_fuzzwrapper/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/parser/lib/sources.dep b/src/terminal/parser/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/parser/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/terminal/parser/ut_parser/sources.dep b/src/terminal/parser/ut_parser/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/terminal/parser/ut_parser/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/til/ut_til/sources.dep b/src/til/ut_til/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/til/ut_til/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/tsf/sources.dep b/src/tsf/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/tsf/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/types/lib/sources.dep b/src/types/lib/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/types/lib/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ + diff --git a/src/types/ut_types/sources.dep b/src/types/ut_types/sources.dep new file mode 100644 index 00000000000..bc61c95c6b0 --- /dev/null +++ b/src/types/ut_types/sources.dep @@ -0,0 +1,3 @@ +BUILD_PASS1_CONSUMES= \ + onecore\windows\vcpkg|PASS1 \ +