From 6e2580d47badb855d775dc077ffae065cb70c87f Mon Sep 17 00:00:00 2001 From: Michael Niksa Date: Wed, 26 Jun 2019 14:13:32 -0700 Subject: [PATCH] move version to vs2019, the 1903 sdk, and the 14.2 build tools. (#1012) * move version to vs2019, the 1903 sdk, and the 14.2 build tools. --- .../CascadiaPackage/CascadiaPackage.wapproj | 52 ++-- .../WindowsTerminal/WindowsTerminal.vcxproj | 268 +++++++++--------- 2 files changed, 164 insertions(+), 156 deletions(-) diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index 52e3d3bcaa1..204dbc04731 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -22,7 +22,6 @@ CA5CAD1A-224A-4171-B13A-F16E576FDD12 ..\WindowsTerminal\WindowsTerminal.vcxproj - NativeOnly false @@ -260,6 +259,36 @@ + + + + + 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}. + + + + + + $(WapProjBeforeGenerateAppxManifestDependsOn); + _ConsoleInjectMUXWinmdIntoReferences; + + + + + <_WinmdFilesFromReferences Include="@(Reference)" Condition="'%(Reference.Filename)' == 'Microsoft.UI.Xaml' and '%(Reference.Extension)' == '.winmd'" /> + + + @@ -281,25 +310,4 @@ - - - - <_GenerateProjectPriFileDependsOn>OpenConsoleLiftDesktopBridgePriFiles;$(_GenerateProjectPriFileDependsOn) - - - - <_PriFile Include="@(_NonWapProjProjectOutput)" Condition="'%(Extension)' == '.pri'" /> - - - - - diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index 150331e2c06..bb49434fcc7 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -1,135 +1,135 @@ - - - - - - Application - Windows - false - Windows Store - - - - 15.0 - {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} - Win32Proj - WindowsTerminal - WindowsTerminal - WindowsTerminal - - - 10.0.17763.0 - - - - true - - - - - $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories); - - - - "$(OpenConsoleDir)src\cascadia\TerminalCore\lib\Generated Files";%(AdditionalIncludeDirectories); - - - gdi32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies) - - - - true - true - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - true - PreserveNewest - - - - true - PreserveNewest - - - - true - PreserveNewest - - - - - - - - - - - - - - - WindowsLocalDebugger - - - - true - - - - - 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}. - - - - - - - - - - - - + + + + + + Application + Windows + false + Windows Store + + + + 15.0 + {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} + Win32Proj + WindowsTerminal + WindowsTerminal + WindowsTerminal + + + 10.0.18362.0 + + + + true + + + + + $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories); + + + + "$(OpenConsoleDir)src\cascadia\TerminalCore\lib\Generated Files";%(AdditionalIncludeDirectories); + + + gdi32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies) + + + + true + true + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + true + PreserveNewest + + + + true + PreserveNewest + + + + true + PreserveNewest + + + + + + + + + + + + + + + WindowsLocalDebugger + + + + true + + + + + 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}. + + + + + + + + + + + + \ No newline at end of file