diff --git a/Cpp.Build.props b/Cpp.Build.props
index facecfcf3f..ed8209a0ac 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -27,6 +27,7 @@
pch.h
Level3
false
+ true
stdcpplatest
/await %(AdditionalOptions)
_UNICODE;UNICODE;%(PreprocessorDefinitions)
@@ -34,6 +35,9 @@
Windows
+
+ true
+
diff --git a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
index 37910551b9..ceeb93ec0e 100644
--- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
+++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
@@ -76,8 +76,6 @@
true
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- stdcpplatest
- true
MultiThreaded
true
../../../src/;%(AdditionalIncludeDirectories)
@@ -98,8 +96,6 @@
Level4
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- stdcpplatest
- true
MultiThreadedDebug
true
../../../src/;%(AdditionalIncludeDirectories)
diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
index 5e68a677e8..f472cf72a7 100644
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -53,7 +53,7 @@
$(WIX)sdk\$(WixPlatformToolset)\lib\x64;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x64;..\..\$(PlatformShortName)\$(Configuration)\;%(AdditionalLibraryDirectories)
- msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;ApplicationUpdate.lib;Notifications.lib;winstore.lib;%(AdditionalDependencies)
+ msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;ApplicationUpdate.lib;Notifications.lib;winstore.lib;Shlwapi.lib;%(AdditionalDependencies)
@@ -65,8 +65,6 @@
MultiThreadedDebug
Level4
ProgramDatabase
- stdcpplatest
- true
CustomAction.def
@@ -84,8 +82,6 @@
true
Level4
ProgramDatabase
- stdcpplatest
- true
CustomAction.def
diff --git a/src/action_runner/action_runner.vcxproj b/src/action_runner/action_runner.vcxproj
index 623f763b73..78b6437a56 100644
--- a/src/action_runner/action_runner.vcxproj
+++ b/src/action_runner/action_runner.vcxproj
@@ -36,7 +36,6 @@
Level4
- true
NotUsing
../;%(AdditionalIncludeDirectories)
diff --git a/src/common/COMUtils/COMUtils.vcxproj b/src/common/COMUtils/COMUtils.vcxproj
index d203825431..7adb2e3375 100644
--- a/src/common/COMUtils/COMUtils.vcxproj
+++ b/src/common/COMUtils/COMUtils.vcxproj
@@ -22,7 +22,6 @@
NotUsing
..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
diff --git a/src/common/Display/Display.vcxproj b/src/common/Display/Display.vcxproj
index 949d3461e8..c5bc2a03fc 100644
--- a/src/common/Display/Display.vcxproj
+++ b/src/common/Display/Display.vcxproj
@@ -28,7 +28,6 @@
NotUsing
..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
NotUsing
diff --git a/src/common/Display/dpi_aware.cpp b/src/common/Display/dpi_aware.cpp
index 9c76800197..da3b0a66ba 100644
--- a/src/common/Display/dpi_aware.cpp
+++ b/src/common/Display/dpi_aware.cpp
@@ -3,8 +3,6 @@
#include
#include
-#pragma comment(lib, "shcore.lib")
-
namespace DPIAware
{
HRESULT GetScreenDPIForWindow(HWND hwnd, UINT& dpi_x, UINT& dpi_y)
diff --git a/src/common/SettingsAPI/SetttingsAPI.vcxproj b/src/common/SettingsAPI/SetttingsAPI.vcxproj
index 344c7b289c..7a4a77284c 100644
--- a/src/common/SettingsAPI/SetttingsAPI.vcxproj
+++ b/src/common/SettingsAPI/SetttingsAPI.vcxproj
@@ -22,7 +22,6 @@
..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
diff --git a/src/common/Themes/Themes.vcxproj b/src/common/Themes/Themes.vcxproj
index c7a7454d3a..e5737a006a 100644
--- a/src/common/Themes/Themes.vcxproj
+++ b/src/common/Themes/Themes.vcxproj
@@ -28,7 +28,6 @@
..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
NotUsing
diff --git a/src/common/WinStore/Winstore.vcxproj b/src/common/WinStore/Winstore.vcxproj
index 6c550a0b9d..bbefd414e4 100644
--- a/src/common/WinStore/Winstore.vcxproj
+++ b/src/common/WinStore/Winstore.vcxproj
@@ -28,7 +28,6 @@
..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
NotUsing
diff --git a/src/common/interop/two_way_pipe_message_ipc.cpp b/src/common/interop/two_way_pipe_message_ipc.cpp
index ec4da61d6b..7c7041c048 100644
--- a/src/common/interop/two_way_pipe_message_ipc.cpp
+++ b/src/common/interop/two_way_pipe_message_ipc.cpp
@@ -3,8 +3,6 @@
#include
-#pragma comment(lib, "advapi32.lib")
-
TwoWayPipeMessageIPC::TwoWayPipeMessageIPC(
std::wstring _input_pipe_name,
std::wstring _output_pipe_name,
diff --git a/src/common/logger/logger.vcxproj b/src/common/logger/logger.vcxproj
index a5ef300c5a..e8417dd42e 100644
--- a/src/common/logger/logger.vcxproj
+++ b/src/common/logger/logger.vcxproj
@@ -28,7 +28,6 @@
_LIB;%(PreprocessorDefinitions)
true
- true
diff --git a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
index 6567eb492d..351e18241d 100644
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -85,36 +85,6 @@
notifications.def
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- stdcpplatest
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- stdcpplatest
-
-
- true
- true
-
-
-
-
- Use
- pch.h
-
-
-
-
- NotUsing
- pch.h
-
-
diff --git a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
index c80957d96b..32dfcd573a 100644
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
@@ -50,7 +50,6 @@
Level4
NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
false
diff --git a/src/common/notifications/notifications.vcxproj b/src/common/notifications/notifications.vcxproj
index 589c308284..2d2e4d6522 100644
--- a/src/common/notifications/notifications.vcxproj
+++ b/src/common/notifications/notifications.vcxproj
@@ -22,7 +22,6 @@
..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj
index e6a2ec4da3..5f0935569f 100644
--- a/src/common/updating/updating.vcxproj
+++ b/src/common/updating/updating.vcxproj
@@ -29,10 +29,9 @@
..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
- Version.lib;shlwapi.lib
+ Version.lib
diff --git a/src/common/utils/processApi.h b/src/common/utils/processApi.h
index e078575248..9f56ce4fe4 100644
--- a/src/common/utils/processApi.h
+++ b/src/common/utils/processApi.h
@@ -6,8 +6,6 @@
#include
#include
-#pragma comment(lib, "Shlwapi.lib")
-
inline std::vector getProcessHandlesByName(const std::wstring_view processName, DWORD handleAccess)
{
std::vector result;
diff --git a/src/common/utils/process_path.h b/src/common/utils/process_path.h
index d6dee06469..4f35b20987 100644
--- a/src/common/utils/process_path.h
+++ b/src/common/utils/process_path.h
@@ -5,8 +5,6 @@
#include
-#pragma comment(lib, "shlwapi.lib")
-
// Get the executable path or module name for modern apps
inline std::wstring get_process_path(DWORD pid) noexcept
{
diff --git a/src/common/utils/window.h b/src/common/utils/window.h
index 0e6f31a59a..1f33109048 100644
--- a/src/common/utils/window.h
+++ b/src/common/utils/window.h
@@ -7,8 +7,6 @@
#include
#include
-#pragma comment(lib, "dwmapi.lib")
-
// Initializes and runs windows message loop
inline int run_message_loop(const bool until_idle = false, const std::optional timeout_seconds = {})
{
diff --git a/src/common/version/version.vcxproj b/src/common/version/version.vcxproj
index 447bc41c6e..b875a9b44b 100644
--- a/src/common/version/version.vcxproj
+++ b/src/common/version/version.vcxproj
@@ -31,7 +31,6 @@
..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
_LIB;%(PreprocessorDefinitions)
- true
NotUsing
diff --git a/src/logging/logging.vcxproj b/src/logging/logging.vcxproj
index 53b70a1cbb..611f787cce 100644
--- a/src/logging/logging.vcxproj
+++ b/src/logging/logging.vcxproj
@@ -34,7 +34,6 @@
$(IntDir)
true
true
- true
%(AdditionalOptions) /machine:x64
diff --git a/src/modules/colorPicker/ColorPicker/pch.cpp b/src/modules/colorPicker/ColorPicker/pch.cpp
index 9a057777b1..ce9b73991b 100644
--- a/src/modules/colorPicker/ColorPicker/pch.cpp
+++ b/src/modules/colorPicker/ColorPicker/pch.cpp
@@ -1,4 +1,2 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "shlwapi.lib")
diff --git a/src/modules/fancyzones/lib/pch.h b/src/modules/fancyzones/lib/pch.h
index c8b985d802..1d1d5796a1 100644
--- a/src/modules/fancyzones/lib/pch.h
+++ b/src/modules/fancyzones/lib/pch.h
@@ -23,8 +23,6 @@
#include
#include
-#pragma comment(lib, "windowsapp")
-
namespace winrt
{
using namespace ::winrt;
diff --git a/src/modules/imageresizer/dll/pch.cpp b/src/modules/imageresizer/dll/pch.cpp
index a83d3bb2cc..1d9f38c57d 100644
--- a/src/modules/imageresizer/dll/pch.cpp
+++ b/src/modules/imageresizer/dll/pch.cpp
@@ -1,2 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
index 4e5f68b554..b1d8c8693d 100644
--- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
+++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
@@ -32,7 +32,6 @@
_CONSOLE;%(PreprocessorDefinitions)
..\;..\..\..\;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories)
- true
4002
%(AdditionalOptions) /Zm200
diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
index fcb38725fc..c3d9b340a9 100644
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -34,11 +34,11 @@
$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)
EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
4002
$(OutDir)$(TargetName)$(TargetExt)
+ Shcore.lib;%(AdditionalDependencies)
diff --git a/src/modules/keyboardmanager/dll/pch.cpp b/src/modules/keyboardmanager/dll/pch.cpp
index 6db1b5fa29..9e6b2e073e 100644
--- a/src/modules/keyboardmanager/dll/pch.cpp
+++ b/src/modules/keyboardmanager/dll/pch.cpp
@@ -1,2 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj
index dd94d82d06..3f39c0718b 100644
--- a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj
+++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj
@@ -34,7 +34,6 @@
$(VCInstallDir)UnitTest\include;$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)
true
- true
4002
diff --git a/src/modules/keyboardmanager/test/pch.h b/src/modules/keyboardmanager/test/pch.h
index 63e4abf8b5..6364eacd48 100644
--- a/src/modules/keyboardmanager/test/pch.h
+++ b/src/modules/keyboardmanager/test/pch.h
@@ -1,5 +1,4 @@
#pragma once
-#pragma comment(lib, "shlwapi.lib")
#define WIN32_LEAN_AND_MEAN
#include
#include
diff --git a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj
index 07adc69169..02da9b8b55 100644
--- a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj
+++ b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj
@@ -36,7 +36,6 @@
Unicode
Spectre
true
- true
4002
$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)
diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
index 7ebbefcb96..2294684a92 100644
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
@@ -29,21 +29,14 @@
-
- $(OutDir)$(TargetName)$(TargetExt)
-
-
-
EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
-
-
-
- EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
-
+
+ Shlwapi.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+
diff --git a/src/modules/launcher/Microsoft.Launcher/pch.cpp b/src/modules/launcher/Microsoft.Launcher/pch.cpp
index a3d1ff4225..1d9f38c57d 100644
--- a/src/modules/launcher/Microsoft.Launcher/pch.cpp
+++ b/src/modules/launcher/Microsoft.Launcher/pch.cpp
@@ -1,3 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "shlwapi.lib")
\ No newline at end of file
diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
index 1f8d01faa1..acd801ab0f 100644
--- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj
+++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
@@ -19,7 +19,6 @@
..\lib\;..\ui\;..\;..\..\..\;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)
- true
Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;shcore.lib;%(AdditionalDependencies)
diff --git a/src/modules/powerrename/dll/pch.cpp b/src/modules/powerrename/dll/pch.cpp
index 58894606d4..1d9f38c57d 100644
--- a/src/modules/powerrename/dll/pch.cpp
+++ b/src/modules/powerrename/dll/pch.cpp
@@ -1,2 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
diff --git a/src/modules/powerrename/lib/PowerRenameRegEx.cpp b/src/modules/powerrename/lib/PowerRenameRegEx.cpp
index 457d395577..266420404f 100644
--- a/src/modules/powerrename/lib/PowerRenameRegEx.cpp
+++ b/src/modules/powerrename/lib/PowerRenameRegEx.cpp
@@ -5,7 +5,7 @@
#include
#include
#include
-#include
+#include
using namespace std;
using std::regex_error;
diff --git a/src/modules/powerrename/lib/pch.h b/src/modules/powerrename/lib/pch.h
index 801576c4b7..607ca6cd92 100644
--- a/src/modules/powerrename/lib/pch.h
+++ b/src/modules/powerrename/lib/pch.h
@@ -20,4 +20,3 @@
#include
-#pragma comment(lib, "windowsapp")
diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj b/src/modules/powerrename/ui/PowerRenameUI.vcxproj
index f32345c869..b5bd6c5376 100644
--- a/src/modules/powerrename/ui/PowerRenameUI.vcxproj
+++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj
@@ -37,7 +37,6 @@
- true
$(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir)
WIN32;_WINDOWS;%(PreprocessorDefinitions)
diff --git a/src/modules/previewpane/powerpreview/pch.cpp b/src/modules/previewpane/powerpreview/pch.cpp
index a3d1ff4225..1d9f38c57d 100644
--- a/src/modules/previewpane/powerpreview/pch.cpp
+++ b/src/modules/previewpane/powerpreview/pch.cpp
@@ -1,3 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "shlwapi.lib")
\ No newline at end of file
diff --git a/src/modules/previewpane/powerpreviewTest/pch.cpp b/src/modules/previewpane/powerpreviewTest/pch.cpp
index a3d1ff4225..1d9f38c57d 100644
--- a/src/modules/previewpane/powerpreviewTest/pch.cpp
+++ b/src/modules/previewpane/powerpreviewTest/pch.cpp
@@ -1,3 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "shlwapi.lib")
\ No newline at end of file
diff --git a/src/modules/shortcut_guide/pch.cpp b/src/modules/shortcut_guide/pch.cpp
index 8eb0adf72b..9e6b2e073e 100644
--- a/src/modules/shortcut_guide/pch.cpp
+++ b/src/modules/shortcut_guide/pch.cpp
@@ -1,9 +1 @@
#include "pch.h"
-#pragma comment(lib, "shlwapi.lib")
-#pragma comment(lib, "shcore.lib")
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "dxgi")
-#pragma comment(lib, "d3d11")
-#pragma comment(lib, "d2d1")
-#pragma comment(lib, "dcomp")
-#pragma comment(lib, "dwmapi")
diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj b/src/modules/shortcut_guide/shortcut_guide.vcxproj
index 2b469dfe67..7d1fdec6be 100644
--- a/src/modules/shortcut_guide/shortcut_guide.vcxproj
+++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj
@@ -50,59 +50,18 @@
-
- false
+
$(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\
$(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\
-
- true
- $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\
- $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\
-
-
+
- Level3
- MaxSpeed
- true
- true
- true
- NDEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreaded
- ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories)
- stdcpplatest
+ ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;%(AdditionalIncludeDirectories)
- Windows
- true
- true
- true
- $(OutDir)$(TargetName)$(TargetExt)
+ Dwmapi.lib;Dcomp.lib;Shlwapi.lib;%(AdditionalDependencies)
-
-
- Level3
- Disabled
- true
- _DEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreadedDebug
- ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories)
- stdcpplatest
-
-
- Windows
- true
- $(OutDir)$(TargetName)$(TargetExt)
-
-
-
-
- Use
- pch.h
- true
-
-
diff --git a/src/runner/auto_start_helper.cpp b/src/runner/auto_start_helper.cpp
index 47e47804da..e72fa31d78 100644
--- a/src/runner/auto_start_helper.cpp
+++ b/src/runner/auto_start_helper.cpp
@@ -5,8 +5,6 @@
#include
#include
-#pragma comment(lib, "taskschd.lib")
-#pragma comment(lib, "comsupp.lib")
// Helper macros from wix.
// TODO: use "s" and "..." parameters to report errors from these functions.
diff --git a/src/runner/pch.cpp b/src/runner/pch.cpp
index e7f9af731d..1d9f38c57d 100644
--- a/src/runner/pch.cpp
+++ b/src/runner/pch.cpp
@@ -1,9 +1 @@
#include "pch.h"
-#pragma comment(lib, "shlwapi.lib")
-#pragma comment(lib, "shcore.lib")
-#pragma comment(lib, "windowsapp")
-#pragma comment(lib, "dxgi")
-#pragma comment(lib, "d3d11")
-#pragma comment(lib, "d2d1")
-#pragma comment(lib, "dcomp")
-#pragma comment(lib, "dwmapi")
\ No newline at end of file
diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj
index 0fd4e687ef..323db06afd 100644
--- a/src/runner/runner.vcxproj
+++ b/src/runner/runner.vcxproj
@@ -38,7 +38,7 @@
AsInvoker
$(OutDir)$(TargetName)$(TargetExt)
- Msi.lib;WindowsApp.lib;Rstrtmgr.lib;Shlwapi.lib;%(AdditionalDependencies)
+ Shcore.lib;Msi.lib;WindowsApp.lib;taskschd.lib;Rstrtmgr.lib;Shlwapi.lib;%(AdditionalDependencies)
false
diff --git a/src/settings/main.cpp b/src/settings/main.cpp
index 834fe5d555..cea0ffedbf 100644
--- a/src/settings/main.cpp
+++ b/src/settings/main.cpp
@@ -11,10 +11,6 @@
#include "trace.h"
#include
-#pragma comment(lib, "shlwapi.lib")
-#pragma comment(lib, "shcore.lib")
-#pragma comment(lib, "windowsapp")
-
#ifdef _DEBUG
#define _DEBUG_WITH_LOCALHOST 0
// Define as 1 For debug purposes, to access localhost servers.
diff --git a/src/settings/old-settings-ui.vcxproj b/src/settings/old-settings-ui.vcxproj
index 8119111161..626e933999 100644
--- a/src/settings/old-settings-ui.vcxproj
+++ b/src/settings/old-settings-ui.vcxproj
@@ -30,6 +30,9 @@
..;..\common\Telemetry;%(AdditionalIncludeDirectories)
+
+ Shlwapi.lib;Shcore.lib;%(AdditionalDependencies)
+
XCOPY "$(ProjectDir)settings-html" "$(TargetDir)\settings-html\" /S /I /Y
diff --git a/tools/project_template/ModuleTemplate/pch.cpp b/tools/project_template/ModuleTemplate/pch.cpp
index a83d3bb2cc..1d9f38c57d 100644
--- a/tools/project_template/ModuleTemplate/pch.cpp
+++ b/tools/project_template/ModuleTemplate/pch.cpp
@@ -1,2 +1 @@
#include "pch.h"
-#pragma comment(lib, "windowsapp")
\ No newline at end of file