From 69d99a7a2b43765e7b3ffac6e33c5540eb27e828 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett (MSFT)" Date: Mon, 23 Mar 2020 10:15:24 -0700 Subject: [PATCH] deps: upgrade CppWinRT to 2.0.200316.3, gsl to v2.1.0 (#4536) This commit upgrades C++/WinRT to 2.0.200316.3 and fixes a couple of the transitive dependency issues we had in the process. Because the latest version has better dependency resolution, we're able to properly depend on Microsoft.UI.Xaml and the Toolkit in TerminalApp and TerminalAppLib so we no longer need to manually include .dll and .pri files. Because of nebulous _other_ changes in dependency resolution, WindowsTerminalUniversal isn't picking up transitive .winmd dependencies from TerminalApp, and needs to include them as ProjectReferences directly. This was already happening transitively, so now it's explicit. I've also taken the time to upgrade GSL to v2.1.0, the last release before they removed span::at and blew up our world. --- dep/gsl | 2 +- src/cascadia/TerminalApp/TerminalApp.vcxproj | 17 ++++++--- src/cascadia/TerminalApp/TerminalPage.cpp | 3 +- .../TerminalApp/lib/TerminalAppLib.vcxproj | 38 +++---------------- src/cascadia/TerminalApp/packages.config | 2 +- src/cascadia/TerminalAzBridge/packages.config | 2 +- .../TerminalConnection/packages.config | 2 +- src/cascadia/TerminalControl/packages.config | 2 +- src/cascadia/TerminalCore/packages.config | 2 +- src/cascadia/TerminalSettings/packages.config | 2 +- src/cascadia/WinRTUtils/packages.config | 2 +- src/cascadia/WindowsTerminal/packages.config | 2 +- .../WindowsTerminalUniversal.vcxproj | 15 +++++--- .../WindowsTerminalUniversal/packages.config | 2 +- src/cppwinrt.build.post.props | 6 +-- src/cppwinrt.build.pre.props | 2 +- src/tools/U8U16Test/U8U16Test.vcxproj | 8 ++-- src/tools/U8U16Test/packages.config | 2 +- 18 files changed, 48 insertions(+), 63 deletions(-) diff --git a/dep/gsl b/dep/gsl index 1212beae77..7e99e76c97 160000 --- a/dep/gsl +++ b/dep/gsl @@ -1 +1 @@ -Subproject commit 1212beae777dba02c230ece8c0c0ec12790047ea +Subproject commit 7e99e76c9761d0d0b0848b91f8648830670ee872 diff --git a/src/cascadia/TerminalApp/TerminalApp.vcxproj b/src/cascadia/TerminalApp/TerminalApp.vcxproj index de2e646443..d43e524570 100644 --- a/src/cascadia/TerminalApp/TerminalApp.vcxproj +++ b/src/cascadia/TerminalApp/TerminalApp.vcxproj @@ -19,6 +19,7 @@ + @@ -77,11 +78,17 @@ true - - - <_BinRoot Condition="'$(Platform)' != 'Win32'">$(OpenConsoleDir)$(Platform)\$(Configuration)\ - <_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\ - + + + + + + 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}. + + + + + $(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories); diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index fba7432b64..e749442406 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -673,8 +673,9 @@ namespace winrt::TerminalApp::implementation const RoutedEventArgs&) { const auto feedbackUriValue = RS_(L"FeedbackUriValue"); + winrt::Windows::Foundation::Uri feedbackUri{ feedbackUriValue }; - winrt::Windows::System::Launcher::LaunchUriAsync({ feedbackUriValue }); + winrt::Windows::System::Launcher::LaunchUriAsync(feedbackUri); } // Method Description: diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj index 8053b3f834..7725d9cdb8 100644 --- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj @@ -26,6 +26,7 @@ + @@ -283,39 +284,9 @@ - - - x86 - $(Platform) - <_MUXRoot>$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\ - <_MUXAppRoot>$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\ - - - - - Microsoft.UI.Xaml.dll - true - false - true - - - - - - Microsoft.Toolkit.Win32.UI.XamlHost.dll - true - false - false - - - - - + + + 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}. @@ -323,6 +294,7 @@ + diff --git a/src/tools/U8U16Test/U8U16Test.vcxproj b/src/tools/U8U16Test/U8U16Test.vcxproj index 011b836528..5bdfc5fa21 100644 --- a/src/tools/U8U16Test/U8U16Test.vcxproj +++ b/src/tools/U8U16Test/U8U16Test.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -117,13 +117,13 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. See "http://go.microsoft.com/fwlink/?LinkID=322105" for further information. The missing file is "{0}". - - + + \ No newline at end of file diff --git a/src/tools/U8U16Test/packages.config b/src/tools/U8U16Test/packages.config index ca62ceb080..9dcb059fed 100644 --- a/src/tools/U8U16Test/packages.config +++ b/src/tools/U8U16Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file