From 34e2ce18851fede8f7365b44b7f4d95bd1ef4438 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Fri, 11 Jun 2021 17:57:36 +0000
Subject: [PATCH] Merged PR 6147892: Make til::feature build in the OS

This commit makes the feature staging header build in OS razzle.

Retrieved from https://microsoft.visualstudio.com os.2020 OS official/rs_wdx_dxp_windev cd1428ce557238663b7a748763ea8ce082b88256

Related work items: MSFT-33722503
---
 src/dirs                 | 1 +
 src/project.inc          | 2 ++
 src/staging/makefile.inc | 3 +++
 src/staging/sources      | 7 +++++++
 4 files changed, 13 insertions(+)
 create mode 100644 src/staging/makefile.inc
 create mode 100644 src/staging/sources

diff --git a/src/dirs b/src/dirs
index eccb84a90..f81326139 100644
--- a/src/dirs
+++ b/src/dirs
@@ -1,4 +1,5 @@
 DIRS=\
+     staging \
      buffer \
      interactivity \
      dep \
diff --git a/src/project.inc b/src/project.inc
index 41fd0a480..8c3f92206 100644
--- a/src/project.inc
+++ b/src/project.inc
@@ -37,6 +37,8 @@ USER_C_FLAGS            = $(USER_C_FLAGS) /utf-8
 CONSOLE_SRC_PATH        = $(PROJECT_ROOT)\core\console\open\src
 CONSOLE_OBJ_PATH        = $(WINCORE_OBJ_PATH)\console\open\src
 
+USER_C_FLAGS            = $(USER_C_FLAGS) /FI$(CONSOLE_OBJ_PATH)\staging\$(O)\TilFeatureStaging.h
+
 INCLUDES= \
     $(INCLUDES); \
     $(CONSOLE_SRC_PATH)\inc; \
diff --git a/src/staging/makefile.inc b/src/staging/makefile.inc
new file mode 100644
index 000000000..cd46d2866
--- /dev/null
+++ b/src/staging/makefile.inc
@@ -0,0 +1,3 @@
+$(OBJ_PATH)\$(O)\TilFeatureStaging.h: ..\features.xml
+	set BUILDMSG=Building til::feature flag header...
+	powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command ..\..\tools\Generate-FeatureStagingHeader.ps1 "$**" -Branding WindowsInbox -Branch $(BUILDBRANCH) -OutputPath "$@"
diff --git a/src/staging/sources b/src/staging/sources
new file mode 100644
index 000000000..f0390360c
--- /dev/null
+++ b/src/staging/sources
@@ -0,0 +1,7 @@
+_NEED_BUILDBRANCH=1
+TARGETTYPE=NOTARGET
+
+NTTARGETFILE0=\
+    $(OBJ_PATH)\$(O)\TilFeatureStaging.h
+
+# See build rules in makefile.inc