From 20998f762838f70152a7d1b905e6191f45fa7592 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Tue, 2 Dec 2025 14:33:02 -0600 Subject: [PATCH] Move LibraryResourceLoader to PCH (#19184) It is foundational enough that everyone should have access by now. --- src/cascadia/TerminalApp/AboutDialog.cpp | 1 - src/cascadia/TerminalApp/ActionPreviewHandlers.cpp | 2 -- src/cascadia/TerminalApp/AppCommandlineArgs.cpp | 1 - src/cascadia/TerminalApp/AppLogic.cpp | 1 - src/cascadia/TerminalApp/ColorPickupFlyout.cpp | 1 - src/cascadia/TerminalApp/CommandPalette.cpp | 1 - src/cascadia/TerminalApp/CommandPaletteItems.cpp | 2 -- src/cascadia/TerminalApp/FilteredCommand.cpp | 1 - src/cascadia/TerminalApp/MarkdownPaneContent.cpp | 1 - src/cascadia/TerminalApp/MinMaxCloseControl.cpp | 1 - src/cascadia/TerminalApp/SettingsPaneContent.h | 1 - src/cascadia/TerminalApp/SnippetsPaneContent.h | 1 - src/cascadia/TerminalApp/SuggestionsControl.cpp | 1 - src/cascadia/TerminalApp/Tab.cpp | 1 - src/cascadia/TerminalApp/TabManagement.cpp | 2 -- src/cascadia/TerminalApp/TabRowControl.cpp | 1 - src/cascadia/TerminalApp/TerminalPage.cpp | 1 - src/cascadia/TerminalApp/TerminalWindow.cpp | 1 - src/cascadia/TerminalApp/init.cpp | 1 - src/cascadia/TerminalApp/pch.h | 2 ++ src/cascadia/TerminalConnection/AzureConnection.cpp | 1 - src/cascadia/TerminalConnection/ConptyConnection.cpp | 1 - src/cascadia/TerminalConnection/init.cpp | 1 - src/cascadia/TerminalConnection/pch.h | 2 ++ src/cascadia/TerminalControl/ControlCore.cpp | 1 - src/cascadia/TerminalControl/ControlInteractivity.cpp | 1 - src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp | 1 - src/cascadia/TerminalControl/SearchBoxControl.cpp | 1 - src/cascadia/TerminalControl/TermControl.cpp | 1 - src/cascadia/TerminalControl/TermControlAutomationPeer.cpp | 1 - src/cascadia/TerminalControl/init.cpp | 1 - src/cascadia/TerminalControl/pch.h | 2 ++ src/cascadia/TerminalSettingsEditor/Actions.cpp | 1 - src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp | 1 - src/cascadia/TerminalSettingsEditor/AddProfile.cpp | 2 -- src/cascadia/TerminalSettingsEditor/Appearances.cpp | 1 - src/cascadia/TerminalSettingsEditor/Appearances.h | 1 - src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp | 1 - src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp | 2 -- src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp | 2 -- src/cascadia/TerminalSettingsEditor/Extensions.cpp | 1 - src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp | 1 - .../TerminalSettingsEditor/GlobalAppearanceViewModel.cpp | 2 -- src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp | 1 - src/cascadia/TerminalSettingsEditor/Launch.cpp | 2 -- src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp | 1 - src/cascadia/TerminalSettingsEditor/MainPage.cpp | 1 - src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp | 2 -- src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp | 1 - src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp | 2 -- src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp | 1 - src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp | 1 - src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp | 1 - src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp | 1 - .../TerminalSettingsEditor/Profiles_Base_Orphaned.cpp | 1 - src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp | 1 - src/cascadia/TerminalSettingsEditor/SettingContainer.cpp | 1 - src/cascadia/TerminalSettingsEditor/Utils.cpp | 2 -- src/cascadia/TerminalSettingsEditor/pch.h | 2 ++ src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp | 1 - src/cascadia/TerminalSettingsModel/ActionArgs.cpp | 1 - src/cascadia/TerminalSettingsModel/ActionArgs.h | 1 - src/cascadia/TerminalSettingsModel/ActionMap.cpp | 1 - .../TerminalSettingsModel/AzureCloudShellGenerator.cpp | 1 - src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp | 1 - .../TerminalSettingsModel/CascadiaSettingsSerialization.cpp | 1 - src/cascadia/TerminalSettingsModel/Command.cpp | 1 - src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp | 2 -- src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp | 2 -- .../TerminalSettingsModel/PowershellCoreProfileGenerator.cpp | 1 - src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp | 1 - src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp | 1 - src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp | 1 - src/cascadia/TerminalSettingsModel/init.cpp | 1 - src/cascadia/TerminalSettingsModel/pch.h | 2 ++ src/cascadia/UIHelpers/TextMenuFlyout.cpp | 2 -- src/cascadia/UIHelpers/init.cpp | 2 -- src/cascadia/UIHelpers/pch.h | 2 ++ src/cascadia/UIMarkdown/CodeBlock.cpp | 1 - src/cascadia/UIMarkdown/pch.h | 2 ++ .../UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj | 5 +++++ src/cascadia/WindowsTerminal/WindowEmperor.cpp | 1 - src/cascadia/WindowsTerminal/main.cpp | 1 - src/cascadia/WindowsTerminal/pch.h | 2 ++ 84 files changed, 21 insertions(+), 90 deletions(-) diff --git a/src/cascadia/TerminalApp/AboutDialog.cpp b/src/cascadia/TerminalApp/AboutDialog.cpp index 40b415871f..ef80fc6b82 100644 --- a/src/cascadia/TerminalApp/AboutDialog.cpp +++ b/src/cascadia/TerminalApp/AboutDialog.cpp @@ -6,7 +6,6 @@ #include "AboutDialog.h" #include "AboutDialog.g.cpp" -#include #include #include "../../types/inc/utils.hpp" diff --git a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp index 84d73c7173..4c85cd04a8 100644 --- a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp +++ b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp @@ -7,8 +7,6 @@ #include "../../types/inc/utils.hpp" #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h" -#include - using namespace winrt; using namespace winrt::Windows::Foundation::Collections; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp index 1b7881dc27..c41eea5431 100644 --- a/src/cascadia/TerminalApp/AppCommandlineArgs.cpp +++ b/src/cascadia/TerminalApp/AppCommandlineArgs.cpp @@ -5,7 +5,6 @@ #include "AppCommandlineArgs.h" #include "../types/inc/utils.hpp" #include "TerminalSettingsModel/ModelSerializationHelpers.h" -#include using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace TerminalApp; diff --git a/src/cascadia/TerminalApp/AppLogic.cpp b/src/cascadia/TerminalApp/AppLogic.cpp index 0563adbd7a..9fdec92368 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -6,7 +6,6 @@ #include "AppLogic.g.cpp" #include "SettingsLoadEventArgs.h" -#include #include #include diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp index 4bed996a64..0e68c14839 100644 --- a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp +++ b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include "ColorPickupFlyout.h" #include "ColorPickupFlyout.g.cpp" -#include namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp index 6caca24036..bd218b1aee 100644 --- a/src/cascadia/TerminalApp/CommandPalette.cpp +++ b/src/cascadia/TerminalApp/CommandPalette.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "CommandPalette.h" #include "CommandPaletteItems.h" -#include #include "CommandPalette.g.cpp" diff --git a/src/cascadia/TerminalApp/CommandPaletteItems.cpp b/src/cascadia/TerminalApp/CommandPaletteItems.cpp index e7e66a5164..1bfac60354 100644 --- a/src/cascadia/TerminalApp/CommandPaletteItems.cpp +++ b/src/cascadia/TerminalApp/CommandPaletteItems.cpp @@ -4,8 +4,6 @@ #include "pch.h" #include "Tab.h" -#include - #include "CommandPaletteItems.h" using namespace winrt; diff --git a/src/cascadia/TerminalApp/FilteredCommand.cpp b/src/cascadia/TerminalApp/FilteredCommand.cpp index 7e71a4a836..f0f0cd7158 100644 --- a/src/cascadia/TerminalApp/FilteredCommand.cpp +++ b/src/cascadia/TerminalApp/FilteredCommand.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "CommandPalette.h" -#include #include "fzf/fzf.h" #include "FilteredCommand.g.cpp" diff --git a/src/cascadia/TerminalApp/MarkdownPaneContent.cpp b/src/cascadia/TerminalApp/MarkdownPaneContent.cpp index 200fc4f4a9..9c961a7087 100644 --- a/src/cascadia/TerminalApp/MarkdownPaneContent.cpp +++ b/src/cascadia/TerminalApp/MarkdownPaneContent.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "MarkdownPaneContent.h" -#include #include "MarkdownPaneContent.g.cpp" #include diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp index 541f7351ae..966106d77b 100644 --- a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp +++ b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp @@ -5,7 +5,6 @@ #include "MinMaxCloseControl.h" #include "MinMaxCloseControl.g.cpp" -#include using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalApp/SettingsPaneContent.h b/src/cascadia/TerminalApp/SettingsPaneContent.h index 10bee3bce1..a119039cf1 100644 --- a/src/cascadia/TerminalApp/SettingsPaneContent.h +++ b/src/cascadia/TerminalApp/SettingsPaneContent.h @@ -3,7 +3,6 @@ #pragma once #include "winrt/TerminalApp.h" -#include #include "BasicPaneEvents.h" namespace winrt::TerminalApp::implementation diff --git a/src/cascadia/TerminalApp/SnippetsPaneContent.h b/src/cascadia/TerminalApp/SnippetsPaneContent.h index 9daf927665..1e25fb0cd2 100644 --- a/src/cascadia/TerminalApp/SnippetsPaneContent.h +++ b/src/cascadia/TerminalApp/SnippetsPaneContent.h @@ -7,7 +7,6 @@ #include "BasicPaneEvents.h" #include "FilteredCommand.h" #include "CommandPaletteItems.h" -#include namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/SuggestionsControl.cpp b/src/cascadia/TerminalApp/SuggestionsControl.cpp index 18e1eef3c6..048fb1968e 100644 --- a/src/cascadia/TerminalApp/SuggestionsControl.cpp +++ b/src/cascadia/TerminalApp/SuggestionsControl.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "SuggestionsControl.h" -#include #include "CommandPaletteItems.h" diff --git a/src/cascadia/TerminalApp/Tab.cpp b/src/cascadia/TerminalApp/Tab.cpp index 7fd4535620..6fc6a9f9f8 100644 --- a/src/cascadia/TerminalApp/Tab.cpp +++ b/src/cascadia/TerminalApp/Tab.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include "ColorPickupFlyout.h" #include "Tab.h" #include "SettingsPaneContent.h" diff --git a/src/cascadia/TerminalApp/TabManagement.cpp b/src/cascadia/TerminalApp/TabManagement.cpp index ed57887cdd..c0c5eb6abe 100644 --- a/src/cascadia/TerminalApp/TabManagement.cpp +++ b/src/cascadia/TerminalApp/TabManagement.cpp @@ -15,8 +15,6 @@ #include "../../inc/til/string.h" #include -#include - #include "TabRowControl.h" #include "DebugTapConnection.h" #include "..\TerminalSettingsModel\FileUtils.h" diff --git a/src/cascadia/TerminalApp/TabRowControl.cpp b/src/cascadia/TerminalApp/TabRowControl.cpp index 373b51a923..aa06994428 100644 --- a/src/cascadia/TerminalApp/TabRowControl.cpp +++ b/src/cascadia/TerminalApp/TabRowControl.cpp @@ -5,7 +5,6 @@ #include "TabRowControl.h" #include "TabRowControl.g.cpp" -#include using namespace winrt::Windows::ApplicationModel::DataTransfer; diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index cc85d5a561..229fd98757 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -5,7 +5,6 @@ #include "pch.h" #include "TerminalPage.h" -#include #include #include #include diff --git a/src/cascadia/TerminalApp/TerminalWindow.cpp b/src/cascadia/TerminalApp/TerminalWindow.cpp index e2fc18002e..498ed163fb 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.cpp +++ b/src/cascadia/TerminalApp/TerminalWindow.cpp @@ -6,7 +6,6 @@ #include "AppLogic.h" -#include #include #include "TerminalWindow.g.cpp" diff --git a/src/cascadia/TerminalApp/init.cpp b/src/cascadia/TerminalApp/init.cpp index 1f1159478d..38ecf7f871 100644 --- a/src/cascadia/TerminalApp/init.cpp +++ b/src/cascadia/TerminalApp/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h index 85b7090a93..ee36db25e3 100644 --- a/src/cascadia/TerminalApp/pch.h +++ b/src/cascadia/TerminalApp/pch.h @@ -96,3 +96,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider); #include // must go after the CoreDispatcher type is defined #include + +#include diff --git a/src/cascadia/TerminalConnection/AzureConnection.cpp b/src/cascadia/TerminalConnection/AzureConnection.cpp index a0f4e0f926..dbc6ec9905 100644 --- a/src/cascadia/TerminalConnection/AzureConnection.cpp +++ b/src/cascadia/TerminalConnection/AzureConnection.cpp @@ -7,7 +7,6 @@ #include "AzureClientID.h" #include #include -#include #include #include "AzureConnection.g.cpp" diff --git a/src/cascadia/TerminalConnection/ConptyConnection.cpp b/src/cascadia/TerminalConnection/ConptyConnection.cpp index ba14ee618c..5db43c04b2 100644 --- a/src/cascadia/TerminalConnection/ConptyConnection.cpp +++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp @@ -8,7 +8,6 @@ #include #include "CTerminalHandoff.h" -#include "LibraryResources.h" #include "../../types/inc/utils.hpp" #include "ConptyConnection.g.cpp" diff --git a/src/cascadia/TerminalConnection/init.cpp b/src/cascadia/TerminalConnection/init.cpp index ffde5a3857..fe3d3c3147 100644 --- a/src/cascadia/TerminalConnection/init.cpp +++ b/src/cascadia/TerminalConnection/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalConnection/pch.h b/src/cascadia/TerminalConnection/pch.h index 3ad67840cf..b9007561e5 100644 --- a/src/cascadia/TerminalConnection/pch.h +++ b/src/cascadia/TerminalConnection/pch.h @@ -40,3 +40,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalConnectionProvider); #include #include + +#include diff --git a/src/cascadia/TerminalControl/ControlCore.cpp b/src/cascadia/TerminalControl/ControlCore.cpp index cdfa5979c0..980da4bb60 100644 --- a/src/cascadia/TerminalControl/ControlCore.cpp +++ b/src/cascadia/TerminalControl/ControlCore.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/src/cascadia/TerminalControl/ControlInteractivity.cpp b/src/cascadia/TerminalControl/ControlInteractivity.cpp index 035d5623ed..0c4e788961 100644 --- a/src/cascadia/TerminalControl/ControlInteractivity.cpp +++ b/src/cascadia/TerminalControl/ControlInteractivity.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "../../types/inc/GlyphWidth.hpp" #include "../../types/inc/Utils.hpp" #include "../../buffer/out/search.h" diff --git a/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp b/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp index c20845cea8..605753bc30 100644 --- a/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp +++ b/src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include -#include #include "InteractivityAutomationPeer.h" #include "InteractivityAutomationPeer.g.cpp" diff --git a/src/cascadia/TerminalControl/SearchBoxControl.cpp b/src/cascadia/TerminalControl/SearchBoxControl.cpp index 6b2c064c0e..b788180df0 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.cpp +++ b/src/cascadia/TerminalControl/SearchBoxControl.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "SearchBoxControl.h" #include "SearchBoxControl.g.cpp" -#include using namespace winrt; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index a8e993cb91..12eab22639 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "TermControl.h" -#include #include #include "TermControlAutomationPeer.h" diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp index b978efd842..aaf6cfaf58 100644 --- a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp +++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include -#include #include "TermControlAutomationPeer.h" #include "TermControl.h" #include "TermControlAutomationPeer.g.cpp" diff --git a/src/cascadia/TerminalControl/init.cpp b/src/cascadia/TerminalControl/init.cpp index 4bc6b53f94..e37ceed6fe 100644 --- a/src/cascadia/TerminalControl/init.cpp +++ b/src/cascadia/TerminalControl/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // For g_hCTerminalCoreProvider diff --git a/src/cascadia/TerminalControl/pch.h b/src/cascadia/TerminalControl/pch.h index 0fc3aa2160..5baf84a359 100644 --- a/src/cascadia/TerminalControl/pch.h +++ b/src/cascadia/TerminalControl/pch.h @@ -81,3 +81,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalControlProvider); #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/TerminalSettingsEditor/Actions.cpp b/src/cascadia/TerminalSettingsEditor/Actions.cpp index f27d89eb27..c9b12953ad 100644 --- a/src/cascadia/TerminalSettingsEditor/Actions.cpp +++ b/src/cascadia/TerminalSettingsEditor/Actions.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "Actions.h" #include "Actions.g.cpp" -#include "LibraryResources.h" #include "../TerminalSettingsModel/AllShortcutActions.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp index 2c1860d1f7..d1ab6c4d20 100644 --- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp @@ -5,7 +5,6 @@ #include "ActionsViewModel.h" #include "ActionsViewModel.g.cpp" #include "KeyBindingViewModel.g.cpp" -#include "LibraryResources.h" #include "../TerminalSettingsModel/AllShortcutActions.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp index 03864e855e..219c0209f3 100644 --- a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp +++ b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp @@ -7,8 +7,6 @@ #include "AddProfilePageNavigationState.g.cpp" #include "EnumEntry.h" -#include - using namespace winrt::Windows::Foundation; using namespace winrt::Windows::System; using namespace winrt::Windows::UI::Core; diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.cpp b/src/cascadia/TerminalSettingsEditor/Appearances.cpp index 236485128e..5483f747ff 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.cpp +++ b/src/cascadia/TerminalSettingsEditor/Appearances.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "Appearances.h" -#include #include "../WinRTUtils/inc/Utils.h" #include "EnumEntry.h" diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h index 1e0528b094..8ea2a5bfc6 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.h +++ b/src/cascadia/TerminalSettingsEditor/Appearances.h @@ -23,7 +23,6 @@ Author(s): #include "Utils.h" #include "ViewModelHelpers.h" #include "SettingContainer.h" -#include namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp index fef533a8f5..d2f10c259e 100644 --- a/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp @@ -5,7 +5,6 @@ #include "ColorSchemeViewModel.h" #include "ColorSchemeViewModel.g.cpp" -#include #include "..\WinRTUtils\inc\Utils.h" namespace winrt::Microsoft::Terminal::Settings::Editor::implementation diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp index 899cc5f826..43a69a1292 100644 --- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp +++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp @@ -6,8 +6,6 @@ #include "ColorTableEntry.g.cpp" #include "ColorSchemes.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp index 1c1d5f0c84..76bee12da2 100644 --- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp +++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp @@ -5,8 +5,6 @@ #include "EditColorScheme.h" #include "EditColorScheme.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Extensions.cpp b/src/cascadia/TerminalSettingsEditor/Extensions.cpp index ecf2cc26ad..5db1ab4db6 100644 --- a/src/cascadia/TerminalSettingsEditor/Extensions.cpp +++ b/src/cascadia/TerminalSettingsEditor/Extensions.cpp @@ -9,7 +9,6 @@ #include "FragmentProfileViewModel.g.cpp" #include "ExtensionPackageTemplateSelector.g.cpp" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp index 2b220b2ddd..eaabcb72ad 100644 --- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp +++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp @@ -5,7 +5,6 @@ #include "GlobalAppearance.h" #include "GlobalAppearance.g.cpp" -#include #include using namespace winrt; diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp b/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp index b5e580666f..7dbfdcc20a 100644 --- a/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp @@ -6,8 +6,6 @@ #include "GlobalAppearanceViewModel.g.cpp" #include "EnumEntry.h" -#include - using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp index d09abf5257..f7a6ce609a 100644 --- a/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp +++ b/src/cascadia/TerminalSettingsEditor/KeyChordListener.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "KeyChordListener.h" #include "KeyChordListener.g.cpp" -#include "LibraryResources.h" using namespace winrt::Windows::UI::Core; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Launch.cpp b/src/cascadia/TerminalSettingsEditor/Launch.cpp index 9c0a933961..0bd9f981b1 100644 --- a/src/cascadia/TerminalSettingsEditor/Launch.cpp +++ b/src/cascadia/TerminalSettingsEditor/Launch.cpp @@ -7,8 +7,6 @@ #include "EnumEntry.h" #include "LaunchViewModel.h" -#include - using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp index 844ed69034..aadcd1918a 100644 --- a/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp @@ -6,7 +6,6 @@ #include "LaunchViewModel.g.cpp" #include "EnumEntry.h" -#include #include using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 19345746aa..6906477044 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -22,7 +22,6 @@ #include "..\types\inc\utils.hpp" #include <..\WinRTUtils\inc\Utils.h> -#include #include namespace winrt diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp index 1587740b68..e20872099b 100644 --- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp +++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp @@ -9,8 +9,6 @@ #include "NewTabMenuViewModel.h" -#include - using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Xaml::Navigation; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp index f9c57cd371..9f5acbd8a2 100644 --- a/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "NewTabMenuViewModel.h" -#include #include "NewTabMenuViewModel.g.cpp" #include "FolderTreeViewEntry.g.cpp" diff --git a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp index 7996535c97..1eaf3b3fe4 100644 --- a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp +++ b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp @@ -5,8 +5,6 @@ #include "NullableColorPicker.h" #include "NullableColorPicker.g.cpp" -#include - using namespace winrt; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp b/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp index aabfb6579c..cc1508cf35 100644 --- a/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp +++ b/src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "PreviewConnection.h" -#include using namespace ::winrt::Microsoft::Terminal::TerminalConnection; using namespace ::winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp index 0836dbac13..6172def810 100644 --- a/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp +++ b/src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp @@ -7,7 +7,6 @@ #include "EnumEntry.h" #include "Appearances.h" -#include #include "../WinRTUtils/inc/Utils.h" #include "../../renderer/base/FontCache.h" #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h" diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp index 64bdecd1d4..e66625f469 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp @@ -7,7 +7,6 @@ #include "ProfileViewModel.h" #include "EnumEntry.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp index 80f9ca8904..f4f4aab8b9 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp @@ -6,7 +6,6 @@ #include "Profiles_Base.g.cpp" #include "ProfileViewModel.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp index dc1de90cb0..381aac3288 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp @@ -6,7 +6,6 @@ #include "Profiles_Base_Orphaned.g.cpp" #include "ProfileViewModel.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp index fd8899dff1..990be350a7 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp @@ -7,7 +7,6 @@ #include "ProfileViewModel.h" #include "EnumEntry.h" -#include #include "..\WinRTUtils\inc\Utils.h" using namespace winrt::Windows::UI::Xaml::Navigation; diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp index 2ab1614123..4bac3ead42 100644 --- a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp +++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "SettingContainer.h" #include "SettingContainer.g.cpp" -#include "LibraryResources.h" using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsEditor/Utils.cpp b/src/cascadia/TerminalSettingsEditor/Utils.cpp index 07fde8471f..f60a554a2c 100644 --- a/src/cascadia/TerminalSettingsEditor/Utils.cpp +++ b/src/cascadia/TerminalSettingsEditor/Utils.cpp @@ -6,8 +6,6 @@ #include "pch.h" #include "Utils.h" -#include - using namespace winrt; using namespace winrt::Windows::System; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsEditor/pch.h b/src/cascadia/TerminalSettingsEditor/pch.h index cc4965ef9a..45842ff548 100644 --- a/src/cascadia/TerminalSettingsEditor/pch.h +++ b/src/cascadia/TerminalSettingsEditor/pch.h @@ -73,3 +73,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalSettingsEditorProvider); #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp index a3eb705351..6c896ca7b4 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp @@ -7,7 +7,6 @@ #include "JsonUtils.h" #include "HashUtils.h" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp index ee01411860..f204e7dadb 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp @@ -51,7 +51,6 @@ #include "SelectOutputArgs.g.cpp" #include "ColorSelectionArgs.g.cpp" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index e861acdad6..6ac762fb71 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -60,7 +60,6 @@ #include "TerminalSettingsSerializationHelpers.h" -#include #include #include "ActionArgsMagic.h" diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp index ebc8c4f931..82f6d9ec5f 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionMap.cpp @@ -5,7 +5,6 @@ #include "AllShortcutActions.h" #include "ActionMap.h" #include "Command.h" -#include #include #include "ActionMap.g.cpp" diff --git a/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp b/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp index 3d42bdd21c..f743f42fea 100644 --- a/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp @@ -8,7 +8,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include using namespace ::Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Model; diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index ada39cea72..a33bbbda89 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -9,7 +9,6 @@ #include "DefaultTerminal.h" #include "FileUtils.h" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp index 18e572cbef..764ca9e321 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "CascadiaSettings.h" -#include #include #include #include diff --git a/src/cascadia/TerminalSettingsModel/Command.cpp b/src/cascadia/TerminalSettingsModel/Command.cpp index ec03277045..112e4ea19f 100644 --- a/src/cascadia/TerminalSettingsModel/Command.cpp +++ b/src/cascadia/TerminalSettingsModel/Command.cpp @@ -5,7 +5,6 @@ #include "Command.h" #include "Command.g.cpp" -#include #include #include diff --git a/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp b/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp index 6a6b903c6f..1c4550091e 100644 --- a/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp +++ b/src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp @@ -5,8 +5,6 @@ #include "DefaultTerminal.h" #include "DefaultTerminal.g.cpp" -#include - using namespace winrt::Microsoft::Terminal::Settings; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp index 0ce2cf9690..ab58450431 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp @@ -11,8 +11,6 @@ #include "MediaResourceSupport.h" -#include - using namespace Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; using namespace winrt::Windows::UI::Xaml; diff --git a/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp b/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp index 01e4c491bd..e537e07182 100644 --- a/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp @@ -15,7 +15,6 @@ #include #include #include -#include static constexpr std::wstring_view POWERSHELL_PFN{ L"Microsoft.PowerShell_8wekyb3d8bbwe" }; static constexpr std::wstring_view POWERSHELL_PREVIEW_PFN{ L"Microsoft.PowerShellPreview_8wekyb3d8bbwe" }; diff --git a/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp b/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp index 7bcf3cd2ae..0f9a5982f3 100644 --- a/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp @@ -7,7 +7,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include static constexpr std::wstring_view SshHostGeneratorNamespace{ L"Windows.Terminal.SSH" }; diff --git a/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp b/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp index 69feb6174e..3838852603 100644 --- a/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp @@ -6,7 +6,6 @@ #include "VisualStudioGenerator.h" #include "VsDevCmdGenerator.h" #include "VsDevShellGenerator.h" -#include using namespace winrt::Microsoft::Terminal::Settings::Model; diff --git a/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp b/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp index 2e0c81e5a5..abb58acd06 100644 --- a/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp +++ b/src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp @@ -8,7 +8,6 @@ #include "../../inc/DefaultSettings.h" #include "DynamicProfileUtils.h" -#include static constexpr std::wstring_view WslHomeDirectory{ L"~" }; static constexpr std::wstring_view DockerDistributionPrefix{ L"docker-desktop" }; diff --git a/src/cascadia/TerminalSettingsModel/init.cpp b/src/cascadia/TerminalSettingsModel/init.cpp index 2ac0825bba..8c6ab3b746 100644 --- a/src/cascadia/TerminalSettingsModel/init.cpp +++ b/src/cascadia/TerminalSettingsModel/init.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. #include "pch.h" -#include #include // Note: Generate GUID using TlgGuid.exe tool diff --git a/src/cascadia/TerminalSettingsModel/pch.h b/src/cascadia/TerminalSettingsModel/pch.h index dcfb26edf1..6867bda3f6 100644 --- a/src/cascadia/TerminalSettingsModel/pch.h +++ b/src/cascadia/TerminalSettingsModel/pch.h @@ -64,3 +64,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider); #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/UIHelpers/TextMenuFlyout.cpp b/src/cascadia/UIHelpers/TextMenuFlyout.cpp index b5cb1aaf5e..8e3b14cdfd 100644 --- a/src/cascadia/UIHelpers/TextMenuFlyout.cpp +++ b/src/cascadia/UIHelpers/TextMenuFlyout.cpp @@ -4,8 +4,6 @@ #include "pch.h" #include "TextMenuFlyout.h" -#include - #include "TextMenuFlyout.g.cpp" using namespace ::winrt::Windows::UI::Xaml; diff --git a/src/cascadia/UIHelpers/init.cpp b/src/cascadia/UIHelpers/init.cpp index 6a22285bac..2566e6f449 100644 --- a/src/cascadia/UIHelpers/init.cpp +++ b/src/cascadia/UIHelpers/init.cpp @@ -3,8 +3,6 @@ #include "pch.h" -#include - #pragma warning(suppress : 26440) // Not interested in changing the specification of DllMain to make it noexcept given it's an interface to the OS. BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD reason, LPVOID /*reserved*/) { diff --git a/src/cascadia/UIHelpers/pch.h b/src/cascadia/UIHelpers/pch.h index 5d22e5e502..d660a8d832 100644 --- a/src/cascadia/UIHelpers/pch.h +++ b/src/cascadia/UIHelpers/pch.h @@ -43,3 +43,5 @@ #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/UIMarkdown/CodeBlock.cpp b/src/cascadia/UIMarkdown/CodeBlock.cpp index 0644157d8e..60a888889c 100644 --- a/src/cascadia/UIMarkdown/CodeBlock.cpp +++ b/src/cascadia/UIMarkdown/CodeBlock.cpp @@ -3,7 +3,6 @@ #include "pch.h" #include "CodeBlock.h" -#include #include "CodeBlock.g.cpp" #include "RequestRunCommandsArgs.g.cpp" diff --git a/src/cascadia/UIMarkdown/pch.h b/src/cascadia/UIMarkdown/pch.h index 562900ebb9..a91ac93c9a 100644 --- a/src/cascadia/UIMarkdown/pch.h +++ b/src/cascadia/UIMarkdown/pch.h @@ -43,3 +43,5 @@ #include #include // must go after the CoreDispatcher type is defined + +#include diff --git a/src/cascadia/UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj b/src/cascadia/UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj index 602f2f42bb..4b488c2dca 100644 --- a/src/cascadia/UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj +++ b/src/cascadia/UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj @@ -61,6 +61,11 @@ _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's --> + + + {CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} + false + diff --git a/src/cascadia/WindowsTerminal/WindowEmperor.cpp b/src/cascadia/WindowsTerminal/WindowEmperor.cpp index 85114486d7..707989995e 100644 --- a/src/cascadia/WindowsTerminal/WindowEmperor.cpp +++ b/src/cascadia/WindowsTerminal/WindowEmperor.cpp @@ -5,7 +5,6 @@ #include "WindowEmperor.h" #include -#include #include #include #include diff --git a/src/cascadia/WindowsTerminal/main.cpp b/src/cascadia/WindowsTerminal/main.cpp index 9f4c5f2c70..b15f7c32c6 100644 --- a/src/cascadia/WindowsTerminal/main.cpp +++ b/src/cascadia/WindowsTerminal/main.cpp @@ -28,7 +28,6 @@ TRACELOGGING_DEFINE_PROVIDER( // we still need to be able to localize strings for the notification icon menu. Anything // you want localized for WindowsTerminal.exe should be stuck in // ...\TerminalApp\Resources\en-US\Resources.resw -#include UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"TerminalApp/Resources"); // Routine Description: diff --git a/src/cascadia/WindowsTerminal/pch.h b/src/cascadia/WindowsTerminal/pch.h index 87a0ade306..2b48aae8c9 100644 --- a/src/cascadia/WindowsTerminal/pch.h +++ b/src/cascadia/WindowsTerminal/pch.h @@ -95,3 +95,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider); #include #include // must go after the CoreDispatcher type is defined + +#include