diff --git a/dep/nuget/packages.config b/dep/nuget/packages.config index 935d004a72..0375989854 100644 --- a/dep/nuget/packages.config +++ b/dep/nuget/packages.config @@ -4,7 +4,7 @@ - + diff --git a/scratch/ScratchIslandApp/SampleApp/packages.config b/scratch/ScratchIslandApp/SampleApp/packages.config index 5df52911da..857f429dac 100644 --- a/scratch/ScratchIslandApp/SampleApp/packages.config +++ b/scratch/ScratchIslandApp/SampleApp/packages.config @@ -2,5 +2,5 @@ - + diff --git a/scratch/ScratchIslandApp/WindowExe/packages.config b/scratch/ScratchIslandApp/WindowExe/packages.config index 595507a802..040e8f88be 100644 --- a/scratch/ScratchIslandApp/WindowExe/packages.config +++ b/scratch/ScratchIslandApp/WindowExe/packages.config @@ -1,6 +1,6 @@ - + diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp index 47dc1a3627..ef4d9ab291 100644 --- a/src/cascadia/TerminalApp/Pane.cpp +++ b/src/cascadia/TerminalApp/Pane.cpp @@ -148,7 +148,7 @@ NewTerminalArgs Pane::GetTerminalArgsForPane() const c = til::color(controlSettings.TabColor().Value()); } - args.TabColor(winrt::Windows::Foundation::IReference(c)); + args.TabColor(winrt::Windows::Foundation::IReference{ static_cast(c) }); } // TODO:GH#9800 - we used to be able to persist the color scheme that a diff --git a/src/cascadia/TerminalControl/ControlCore.cpp b/src/cascadia/TerminalControl/ControlCore.cpp index b82709af5f..1e7829940d 100644 --- a/src/cascadia/TerminalControl/ControlCore.cpp +++ b/src/cascadia/TerminalControl/ControlCore.cpp @@ -1259,7 +1259,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation Windows::Foundation::IReference ControlCore::TabColor() noexcept { auto coreColor = _terminal->GetTabColor(); - return coreColor.has_value() ? Windows::Foundation::IReference(til::color{ coreColor.value() }) : + return coreColor.has_value() ? Windows::Foundation::IReference{ static_cast(coreColor.value()) } : nullptr; } diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp b/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp index f64a9eee65..6f54d46b79 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp @@ -156,7 +156,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation } if (newTerminalArgs.TabColor()) { - defaultSettings.StartingTabColor(winrt::Windows::Foundation::IReference{ til::color{ newTerminalArgs.TabColor().Value() } }); + defaultSettings.StartingTabColor(winrt::Windows::Foundation::IReference{ static_cast(til::color{ newTerminalArgs.TabColor().Value() }) }); } if (newTerminalArgs.SuppressApplicationTitle()) { diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index 9b20e3c7aa..906b53e1df 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -1039,7 +1039,7 @@ winrt::fire_and_forget AppHost::_SaveWindowLayoutsRepeat() co_await _SaveWindowLayouts(); // Don't need to save too frequently. - co_await 30s; + co_await winrt::resume_after(30s); // As long as we are supposed to keep saving, request another save. // This will be delayed by the throttler so that at most one save happens diff --git a/src/common.nugetversions.props b/src/common.nugetversions.props index c6945b5d5e..19147f5e97 100644 --- a/src/common.nugetversions.props +++ b/src/common.nugetversions.props @@ -4,7 +4,7 @@ - + diff --git a/src/common.nugetversions.targets b/src/common.nugetversions.targets index 04cda21acb..b9b32706a3 100644 --- a/src/common.nugetversions.targets +++ b/src/common.nugetversions.targets @@ -38,7 +38,7 @@ - + @@ -70,8 +70,8 @@ - - + +