From b72bd9eb73cca9c3a9887e4d7a67ec2696dc6dba Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Fri, 12 Jul 2019 10:55:50 -0500
Subject: [PATCH] Try blindly updating to the newest nuget version

---
 src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj | 2 --
 src/cascadia/TerminalApp/packages.config            | 2 +-
 src/cascadia/TerminalConnection/packages.config     | 2 +-
 src/cascadia/TerminalControl/packages.config        | 2 +-
 src/cascadia/TerminalCore/packages.config           | 2 +-
 src/cascadia/TerminalSettings/packages.config       | 2 +-
 src/cascadia/WindowsTerminal/packages.config        | 2 +-
 src/cppwinrt.build.post.props                       | 6 +++---
 src/cppwinrt.build.pre.props                        | 2 +-
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
index bafdeb5a452..8c95bf1ba97 100644
--- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
@@ -39,7 +39,6 @@
     </ClInclude>
     <ClInclude Include="../TerminalPage.h">
       <DependentUpon>../TerminalPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
     </ClInclude>
     <ClInclude Include="../Tab.h" />
     <ClInclude Include="../Pane.h" />
@@ -64,7 +63,6 @@
     </ClCompile>
     <ClCompile Include="../TerminalPage.cpp">
       <DependentUpon>../TerminalPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="../Tab.cpp" />
     <ClCompile Include="../Pane.cpp" />
diff --git a/src/cascadia/TerminalApp/packages.config b/src/cascadia/TerminalApp/packages.config
index fe0c6e184a5..9062dc21fbe 100644
--- a/src/cascadia/TerminalApp/packages.config
+++ b/src/cascadia/TerminalApp/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.0.0-preview6.2" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.2.190611001-prerelease" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
 </packages>
diff --git a/src/cascadia/TerminalConnection/packages.config b/src/cascadia/TerminalConnection/packages.config
index 58e49c05c1a..27854347178 100644
--- a/src/cascadia/TerminalConnection/packages.config
+++ b/src/cascadia/TerminalConnection/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
 </packages>
diff --git a/src/cascadia/TerminalControl/packages.config b/src/cascadia/TerminalControl/packages.config
index 58e49c05c1a..27854347178 100644
--- a/src/cascadia/TerminalControl/packages.config
+++ b/src/cascadia/TerminalControl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
 </packages>
diff --git a/src/cascadia/TerminalCore/packages.config b/src/cascadia/TerminalCore/packages.config
index 58e49c05c1a..27854347178 100644
--- a/src/cascadia/TerminalCore/packages.config
+++ b/src/cascadia/TerminalCore/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
 </packages>
diff --git a/src/cascadia/TerminalSettings/packages.config b/src/cascadia/TerminalSettings/packages.config
index 58e49c05c1a..27854347178 100644
--- a/src/cascadia/TerminalSettings/packages.config
+++ b/src/cascadia/TerminalSettings/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
 </packages>
diff --git a/src/cascadia/WindowsTerminal/packages.config b/src/cascadia/WindowsTerminal/packages.config
index 80115a0ed72..bc5a087f745 100644
--- a/src/cascadia/WindowsTerminal/packages.config
+++ b/src/cascadia/WindowsTerminal/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" />
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.0.0-preview6.1" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.2.190611001-prerelease" targetFramework="native" />
   <package id="Microsoft.VCRTForwarders.140" version="1.0.0-rc" targetFramework="native" />
diff --git a/src/cppwinrt.build.post.props b/src/cppwinrt.build.post.props
index 38b012cb9ec..68ddd2618e6 100644
--- a/src/cppwinrt.build.post.props
+++ b/src/cppwinrt.build.post.props
@@ -64,13 +64,13 @@
   </ItemDefinitionGroup>
 
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props
index d34a9ef3fcf..9a3d1642cfa 100644
--- a/src/cppwinrt.build.pre.props
+++ b/src/cppwinrt.build.pre.props
@@ -3,7 +3,7 @@
 
   <Import Project="..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
 
-  <Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(OpenConsoleDir)\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" />
 
   <PropertyGroup Label="Globals">
     <!-- 17134 is RS4 -->