From 17daa4aed871f41c6d7f751b99602eb10ed8da32 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Thu, 6 Aug 2020 12:42:17 -0700
Subject: [PATCH 1/2] Disable MinimalCoreWin when OpenConsoleUniversalApp is
 false

This fixes the build the rest of the way in VS 16.7. Something about the
way we were using the Store/Container flags caused some of our projects
to end up linking kernel32.lib only (MinimalCoreWin==KernelOnly).
The best way to solve it once and for all is to make sure MinimalCoreWin
is always set.

References 313568d0e5c.
---
 src/cppwinrt.build.pre.props | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props
index cd89880fdd6..e26935a58d1 100644
--- a/src/cppwinrt.build.pre.props
+++ b/src/cppwinrt.build.pre.props
@@ -22,12 +22,20 @@
        at the winmd we build to generate type info.
        In general, cppwinrt projects all want this.
   -->
-  <PropertyGroup Condition="'$(OpenConsoleUniversalApp)'!='false'">
+  <PropertyGroup Condition="'$(OpenConsoleUniversalApp)'=='true'">
     <MinimalCoreWin>true</MinimalCoreWin>
     <AppContainerApplication>true</AppContainerApplication>
     <WindowsStoreApp>true</WindowsStoreApp>
     <ApplicationType>Windows Store</ApplicationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(OpenConsoleUniversalApp)'!='true'">
+	  <!-- Some of our projects include the cppwinrt build options to
+         just build cppwinrt things, but don't want the store bits
+         in full swing. MinimalCoreWin != false means "don't let me
+         use win32 APIs"
+    -->
+    <MinimalCoreWin>false</MinimalCoreWin>
+  </PropertyGroup>
 
   <!-- This is magic that tells msbuild to link against the Desktop platform
        instead of the App platform. This you definitely want, because we're not

From 2328e824c3c870c6c4646c1f4504ee1553c88a65 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Thu, 6 Aug 2020 12:47:26 -0700
Subject: [PATCH 2/2] tabs v spaces: tabs 2: tabs harder

---
 src/cppwinrt.build.pre.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props
index e26935a58d1..c7ac9550f61 100644
--- a/src/cppwinrt.build.pre.props
+++ b/src/cppwinrt.build.pre.props
@@ -29,7 +29,7 @@
     <ApplicationType>Windows Store</ApplicationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(OpenConsoleUniversalApp)'!='true'">
-	  <!-- Some of our projects include the cppwinrt build options to
+    <!-- Some of our projects include the cppwinrt build options to
          just build cppwinrt things, but don't want the store bits
          in full swing. MinimalCoreWin != false means "don't let me
          use win32 APIs"