diff --git a/dep/gsl b/dep/gsl index 1212beae7..7e99e76c9 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 de2e64644..d43e52457 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 fba7432b6..e74944240 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 8053b3f83..7725d9cdb 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 011b83652..5bdfc5fa2 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 ca62ceb08..9dcb059fe 100644 --- a/src/tools/U8U16Test/packages.config +++ b/src/tools/U8U16Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file