Move LibraryResourceLoader to PCH (#19184)

It is foundational enough that everyone should have access by now.

src/cascadia/TerminalApp/AboutDialog.cpp

@@ -6,7 +6,6 @@
 #include "AboutDialog.h"
 #include "AboutDialog.g.cpp"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 
 #include "../../types/inc/utils.hpp"

src/cascadia/TerminalApp/ActionPreviewHandlers.cpp

@@ -7,8 +7,6 @@
 #include "../../types/inc/utils.hpp"
 #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -5,7 +5,6 @@
 #include "AppCommandlineArgs.h"
 #include "../types/inc/utils.hpp"
 #include "TerminalSettingsModel/ModelSerializationHelpers.h"
-#include <LibraryResources.h>
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace TerminalApp;

src/cascadia/TerminalApp/AppLogic.cpp

@@ -6,7 +6,6 @@
 #include "AppLogic.g.cpp"
 #include "SettingsLoadEventArgs.h"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 #include <wil/token_helpers.h>
 

src/cascadia/TerminalApp/ColorPickupFlyout.cpp

@@ -1,7 +1,6 @@
 #include "pch.h"
 #include "ColorPickupFlyout.h"
 #include "ColorPickupFlyout.g.cpp"
-#include <LibraryResources.h>
 
 namespace winrt::TerminalApp::implementation
 {

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "CommandPalette.h"
 #include "CommandPaletteItems.h"
-#include <LibraryResources.h>
 
 #include "CommandPalette.g.cpp"
 

src/cascadia/TerminalApp/CommandPaletteItems.cpp

@@ -4,8 +4,6 @@
 #include "pch.h"
 #include "Tab.h"
 
-#include <LibraryResources.h>
-
 #include "CommandPaletteItems.h"
 
 using namespace winrt;

src/cascadia/TerminalApp/FilteredCommand.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "CommandPalette.h"
-#include <LibraryResources.h>
 #include "fzf/fzf.h"
 
 #include "FilteredCommand.g.cpp"

src/cascadia/TerminalApp/MarkdownPaneContent.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "MarkdownPaneContent.h"
-#include <LibraryResources.h>
 #include "MarkdownPaneContent.g.cpp"
 #include <til/io.h>
 

src/cascadia/TerminalApp/MinMaxCloseControl.cpp

@@ -5,7 +5,6 @@
 
 #include "MinMaxCloseControl.h"
 #include "MinMaxCloseControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt::Windows::UI::Xaml;
 

src/cascadia/TerminalApp/SettingsPaneContent.h

@@ -3,7 +3,6 @@
 
 #pragma once
 #include "winrt/TerminalApp.h"
-#include <LibraryResources.h>
 #include "BasicPaneEvents.h"
 
 namespace winrt::TerminalApp::implementation

src/cascadia/TerminalApp/SnippetsPaneContent.h

@@ -7,7 +7,6 @@
 #include "BasicPaneEvents.h"
 #include "FilteredCommand.h"
 #include "CommandPaletteItems.h"
-#include <LibraryResources.h>
 
 namespace winrt::TerminalApp::implementation
 {

src/cascadia/TerminalApp/SuggestionsControl.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "SuggestionsControl.h"
-#include <LibraryResources.h>
 
 #include "CommandPaletteItems.h"
 

src/cascadia/TerminalApp/Tab.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include "ColorPickupFlyout.h"
 #include "Tab.h"
 #include "SettingsPaneContent.h"

src/cascadia/TerminalApp/TabManagement.cpp

@@ -15,8 +15,6 @@
 #include "../../inc/til/string.h"
 #include <til/io.h>
 
-#include <LibraryResources.h>
-
 #include "TabRowControl.h"
 #include "DebugTapConnection.h"
 #include "..\TerminalSettingsModel\FileUtils.h"

src/cascadia/TerminalApp/TabRowControl.cpp

@@ -5,7 +5,6 @@
 #include "TabRowControl.h"
 
 #include "TabRowControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -5,7 +5,6 @@
 #include "pch.h"
 #include "TerminalPage.h"
 
-#include <LibraryResources.h>
 #include <TerminalThemeHelpers.h>
 #include <Utils.h>
 #include <TerminalCore/ControlKeyStates.hpp>

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -6,7 +6,6 @@
 
 #include "AppLogic.h"
 
-#include <LibraryResources.h>
 #include <til/env.h>
 
 #include "TerminalWindow.g.cpp"

src/cascadia/TerminalApp/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // Note: Generate GUID using TlgGuid.exe tool

src/cascadia/TerminalApp/pch.h

@@ -96,3 +96,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
 
 #include <til/winrt.h>
+
+#include <LibraryResources.h>

src/cascadia/TerminalConnection/AzureConnection.cpp

@@ -7,7 +7,6 @@
 #include "AzureClientID.h"
 #include <sstream>
 #include <cstdlib>
-#include <LibraryResources.h>
 #include <unicode.hpp>
 
 #include "AzureConnection.g.cpp"

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -8,7 +8,6 @@
 #include <winmeta.h>
 
 #include "CTerminalHandoff.h"
-#include "LibraryResources.h"
 #include "../../types/inc/utils.hpp"
 
 #include "ConptyConnection.g.cpp"

src/cascadia/TerminalConnection/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // Note: Generate GUID using TlgGuid.exe tool

src/cascadia/TerminalConnection/pch.h

@@ -40,3 +40,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalConnectionProvider);
 #include <til/winrt.h>
 
 #include <cppwinrt_utils.h>
+
+#include <LibraryResources.h>

src/cascadia/TerminalControl/ControlCore.cpp

@@ -9,7 +9,6 @@
 #include <dsound.h>
 
 #include <DefaultSettings.h>
-#include <LibraryResources.h>
 #include <unicode.hpp>
 #include <utils.hpp>
 #include <WinUser.h>

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -6,7 +6,6 @@
 #include <DefaultSettings.h>
 #include <unicode.hpp>
 #include <Utils.h>
-#include <LibraryResources.h>
 #include "../../types/inc/GlyphWidth.hpp"
 #include "../../types/inc/Utils.hpp"
 #include "../../buffer/out/search.h"

src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include <UIAutomationCore.h>
-#include <LibraryResources.h>
 #include "InteractivityAutomationPeer.h"
 #include "InteractivityAutomationPeer.g.cpp"
 

src/cascadia/TerminalControl/SearchBoxControl.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "SearchBoxControl.h"
 #include "SearchBoxControl.g.cpp"
-#include <LibraryResources.h>
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalControl/TermControl.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "TermControl.h"
 
-#include <LibraryResources.h>
 #include <inputpaneinterop.h>
 
 #include "TermControlAutomationPeer.h"

src/cascadia/TerminalControl/TermControlAutomationPeer.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include <UIAutomationCore.h>
-#include <LibraryResources.h>
 #include "TermControlAutomationPeer.h"
 #include "TermControl.h"
 #include "TermControlAutomationPeer.g.cpp"

src/cascadia/TerminalControl/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // For g_hCTerminalCoreProvider

src/cascadia/TerminalControl/pch.h

@@ -81,3 +81,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalControlProvider);
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>

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;

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;

src/cascadia/TerminalSettingsEditor/AddProfile.cpp

@@ -7,8 +7,6 @@
 #include "AddProfilePageNavigationState.g.cpp"
 #include "EnumEntry.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI::Core;

src/cascadia/TerminalSettingsEditor/Appearances.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "Appearances.h"
 
-#include <LibraryResources.h>
 #include "../WinRTUtils/inc/Utils.h"
 
 #include "EnumEntry.h"

src/cascadia/TerminalSettingsEditor/Appearances.h

@@ -23,7 +23,6 @@ Author(s):
 #include "Utils.h"
 #include "ViewModelHelpers.h"
 #include "SettingContainer.h"
-#include <LibraryResources.h>
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {

src/cascadia/TerminalSettingsEditor/ColorSchemeViewModel.cpp

@@ -5,7 +5,6 @@
 #include "ColorSchemeViewModel.h"
 #include "ColorSchemeViewModel.g.cpp"
 
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -6,8 +6,6 @@
 #include "ColorTableEntry.g.cpp"
 #include "ColorSchemes.g.cpp"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp

@@ -5,8 +5,6 @@
 #include "EditColorScheme.h"
 #include "EditColorScheme.g.cpp"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsEditor/Extensions.cpp

@@ -9,7 +9,6 @@
 #include "FragmentProfileViewModel.g.cpp"
 #include "ExtensionPackageTemplateSelector.g.cpp"
 
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 using namespace winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp

@@ -5,7 +5,6 @@
 #include "GlobalAppearance.h"
 #include "GlobalAppearance.g.cpp"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 
 using namespace winrt;

src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp

@@ -6,8 +6,6 @@
 #include "GlobalAppearanceViewModel.g.cpp"
 #include "EnumEntry.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Navigation;

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;

src/cascadia/TerminalSettingsEditor/Launch.cpp

@@ -7,8 +7,6 @@
 #include "EnumEntry.h"
 #include "LaunchViewModel.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 using namespace winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp

@@ -6,7 +6,6 @@
 #include "LaunchViewModel.g.cpp"
 #include "EnumEntry.h"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 
 using namespace winrt::Windows::UI::Xaml::Navigation;

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -22,7 +22,6 @@
 #include "..\types\inc\utils.hpp"
 #include <..\WinRTUtils\inc\Utils.h>
 
-#include <LibraryResources.h>
 #include <dwmapi.h>
 
 namespace winrt

src/cascadia/TerminalSettingsEditor/NewTabMenu.cpp

@@ -9,8 +9,6 @@
 
 #include "NewTabMenuViewModel.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 using namespace winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "NewTabMenuViewModel.h"
-#include <LibraryResources.h>
 
 #include "NewTabMenuViewModel.g.cpp"
 #include "FolderTreeViewEntry.g.cpp"

src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp

@@ -5,8 +5,6 @@
 #include "NullableColorPicker.h"
 #include "NullableColorPicker.g.cpp"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "PreviewConnection.h"
-#include <LibraryResources.h>
 
 using namespace ::winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp

@@ -7,7 +7,6 @@
 #include "EnumEntry.h"
 #include "Appearances.h"
 
-#include <LibraryResources.h>
 #include "../WinRTUtils/inc/Utils.h"
 #include "../../renderer/base/FontCache.h"
 #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"

src/cascadia/TerminalSettingsEditor/Profiles_Advanced.cpp

@@ -7,7 +7,6 @@
 #include "ProfileViewModel.h"
 
 #include "EnumEntry.h"
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 using namespace winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp

@@ -6,7 +6,6 @@
 #include "Profiles_Base.g.cpp"
 #include "ProfileViewModel.h"
 
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsEditor/Profiles_Base_Orphaned.cpp

@@ -6,7 +6,6 @@
 #include "Profiles_Base_Orphaned.g.cpp"
 #include "ProfileViewModel.h"
 
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp

@@ -7,7 +7,6 @@
 #include "ProfileViewModel.h"
 
 #include "EnumEntry.h"
-#include <LibraryResources.h>
 #include "..\WinRTUtils\inc\Utils.h"
 
 using namespace winrt::Windows::UI::Xaml::Navigation;

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;
 

src/cascadia/TerminalSettingsEditor/Utils.cpp

@@ -6,8 +6,6 @@
 #include "pch.h"
 #include "Utils.h"
 
-#include <LibraryResources.h>
-
 using namespace winrt;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::Foundation;

src/cascadia/TerminalSettingsEditor/pch.h

@@ -73,3 +73,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalSettingsEditorProvider);
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>

src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp

@@ -7,7 +7,6 @@
 #include "JsonUtils.h"
 #include "HashUtils.h"
 
-#include <LibraryResources.h>
 #include <til/static_map.h>
 #include <ScopedResourceLoader.h>
 

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -51,7 +51,6 @@
 #include "SelectOutputArgs.g.cpp"
 #include "ColorSelectionArgs.g.cpp"
 
-#include <LibraryResources.h>
 #include <WtExeUtils.h>
 #include <ScopedResourceLoader.h>
 

src/cascadia/TerminalSettingsModel/ActionArgs.h

@@ -60,7 +60,6 @@
 
 #include "TerminalSettingsSerializationHelpers.h"
 
-#include <LibraryResources.h>
 #include <ScopedResourceLoader.h>
 
 #include "ActionArgsMagic.h"

src/cascadia/TerminalSettingsModel/ActionMap.cpp

@@ -5,7 +5,6 @@
 #include "AllShortcutActions.h"
 #include "ActionMap.h"
 #include "Command.h"
-#include <LibraryResources.h>
 #include <til/io.h>
 
 #include "ActionMap.g.cpp"

src/cascadia/TerminalSettingsModel/AzureCloudShellGenerator.cpp

@@ -8,7 +8,6 @@
 
 #include "../../inc/DefaultSettings.h"
 #include "DynamicProfileUtils.h"
-#include <LibraryResources.h>
 
 using namespace ::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Settings::Model;

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

@@ -9,7 +9,6 @@
 #include "DefaultTerminal.h"
 #include "FileUtils.h"
 
-#include <LibraryResources.h>
 #include <VersionHelpers.h>
 #include <WtExeUtils.h>
 

src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "CascadiaSettings.h"
 
-#include <LibraryResources.h>
 #include <fmt/chrono.h>
 #include <shlobj.h>
 #include <til/latch.h>

src/cascadia/TerminalSettingsModel/Command.cpp

@@ -5,7 +5,6 @@
 #include "Command.h"
 #include "Command.g.cpp"
 
-#include <LibraryResources.h>
 #include <til/replace.h>
 #include <ScopedResourceLoader.h>
 

src/cascadia/TerminalSettingsModel/DefaultTerminal.cpp

@@ -5,8 +5,6 @@
 #include "DefaultTerminal.h"
 #include "DefaultTerminal.g.cpp"
 
-#include <LibraryResources.h>
-
 using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
 

src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp

@@ -11,8 +11,6 @@
 
 #include "MediaResourceSupport.h"
 
-#include <LibraryResources.h>
-
 using namespace Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
 using namespace winrt::Windows::UI::Xaml;

src/cascadia/TerminalSettingsModel/PowershellCoreProfileGenerator.cpp

@@ -15,7 +15,6 @@
 #include <winrt/Windows.Management.Deployment.h>
 #include <appmodel.h>
 #include <shlobj.h>
-#include <LibraryResources.h>
 
 static constexpr std::wstring_view POWERSHELL_PFN{ L"Microsoft.PowerShell_8wekyb3d8bbwe" };
 static constexpr std::wstring_view POWERSHELL_PREVIEW_PFN{ L"Microsoft.PowerShellPreview_8wekyb3d8bbwe" };

src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp

@@ -7,7 +7,6 @@
 #include "../../inc/DefaultSettings.h"
 
 #include "DynamicProfileUtils.h"
-#include <LibraryResources.h>
 
 static constexpr std::wstring_view SshHostGeneratorNamespace{ L"Windows.Terminal.SSH" };
 

src/cascadia/TerminalSettingsModel/VisualStudioGenerator.cpp

@@ -6,7 +6,6 @@
 #include "VisualStudioGenerator.h"
 #include "VsDevCmdGenerator.h"
 #include "VsDevShellGenerator.h"
-#include <LibraryResources.h>
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 

src/cascadia/TerminalSettingsModel/WslDistroGenerator.cpp

@@ -8,7 +8,6 @@
 #include "../../inc/DefaultSettings.h"
 
 #include "DynamicProfileUtils.h"
-#include <LibraryResources.h>
 
 static constexpr std::wstring_view WslHomeDirectory{ L"~" };
 static constexpr std::wstring_view DockerDistributionPrefix{ L"docker-desktop" };

src/cascadia/TerminalSettingsModel/init.cpp

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include <LibraryResources.h>
 #include <WilErrorReporting.h>
 
 // Note: Generate GUID using TlgGuid.exe tool

src/cascadia/TerminalSettingsModel/pch.h

@@ -64,3 +64,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>

src/cascadia/UIHelpers/TextMenuFlyout.cpp

@@ -4,8 +4,6 @@
 #include "pch.h"
 #include "TextMenuFlyout.h"
 
-#include <LibraryResources.h>
-
 #include "TextMenuFlyout.g.cpp"
 
 using namespace ::winrt::Windows::UI::Xaml;

src/cascadia/UIHelpers/init.cpp

@@ -3,8 +3,6 @@
 
 #include "pch.h"
 
-#include <LibraryResources.h>
-
 #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*/)
 {

src/cascadia/UIHelpers/pch.h

@@ -43,3 +43,5 @@
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>

src/cascadia/UIMarkdown/CodeBlock.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "CodeBlock.h"
-#include <LibraryResources.h>
 
 #include "CodeBlock.g.cpp"
 #include "RequestRunCommandsArgs.g.cpp"

src/cascadia/UIMarkdown/pch.h

@@ -43,3 +43,5 @@
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>

src/cascadia/UnitTests_SettingsModel/SettingsModel.UnitTests.vcxproj

@@ -61,6 +61,11 @@
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
+
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
+      <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->

src/cascadia/WindowsTerminal/WindowEmperor.cpp

@@ -5,7 +5,6 @@
 #include "WindowEmperor.h"
 
 #include <CoreWindow.h>
-#include <LibraryResources.h>
 #include <ScopedResourceLoader.h>
 #include <WtExeUtils.h>
 #include <til/hash.h>

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 <LibraryResources.h>
 UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"TerminalApp/Resources");
 
 // Routine Description:

src/cascadia/WindowsTerminal/pch.h

@@ -95,3 +95,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider);
 
 #include <cppwinrt_utils.h>
 #include <wil/cppwinrt_helpers.h> // must go after the CoreDispatcher type is defined
+
+#include <LibraryResources.h>