From c923e96f3e589abac632eb171351fdc0486e86bd Mon Sep 17 00:00:00 2001 From: Andrey Nekrasov Date: Mon, 25 May 2020 10:59:05 +0300 Subject: [PATCH] sln: do not use PCH on CI (#3106) --- .pipelines/build-installer.cmd | 2 +- .pipelines/build.cmd | 2 +- .../ci/templates/build-powertoys-ci.yml | 2 +- .../ci/templates/build-powertoys-steps.yml | 1 - .../PowerToysSetupCustomActions.vcxproj | 11 +++-- .../UnitTests-CommonLib.vcxproj | 13 +++--- .../common-md-flag/common-md-flag.vcxproj | 14 ++++--- src/common/common.vcxproj | 13 +++--- src/common/interop/interop.vcxproj | 13 +++--- .../notifications/notifications_dll.vcxproj | 19 ++++----- .../notifications_winrt/notifications.vcxproj | 16 ++++++-- src/common/os-detection/os-detection.vcxproj | 11 +++-- src/common/updating/updating.vcxproj | 19 ++++----- .../example_powertoy/example_powertoy.vcxproj | 15 ++++--- .../fancyzones/dll/FancyZonesModule.vcxproj | 15 ++++--- .../fancyzones/lib/FancyZonesLib.vcxproj | 13 +++--- .../tests/UnitTests/UnitTests.vcxproj | 13 +++--- .../imageresizer/dll/ImageResizerExt.vcxproj | 41 +++++-------------- .../common/KeyboardManagerCommon.vcxproj | 13 +++--- .../dll/KeyboardManager.vcxproj | 15 ++++--- .../ui/KeyboardManagerUI.vcxproj | 13 +++--- .../Microsoft.Launcher.vcxproj | 15 ++++--- .../UWPui/PowerRenameUWPUI.vcxproj | 11 +++-- .../powerrename/dll/PowerRenameExt.vcxproj | 10 ++++- .../powerrename/lib/PowerRenameLib.vcxproj | 19 ++++----- .../testapp/PowerRenameTest.vcxproj | 15 ++++--- .../powerrename/ui/PowerRenameUI.vcxproj | 15 ++++--- .../unittests/PowerRenameLibUnitTests.vcxproj | 15 ++++--- .../powerpreview/powerpreview.vcxproj | 15 ++++--- .../powerpreviewTest/powerpreviewTest.vcxproj | 19 ++++----- .../shortcut_guide/shortcut_guide.vcxproj | 13 +++--- src/runner/runner.vcxproj | 13 +++--- src/settings/settings.vcxproj | 13 +++--- .../ModuleTemplate/ModuleTemplate.vcxproj | 15 ++++--- 34 files changed, 227 insertions(+), 235 deletions(-) diff --git a/.pipelines/build-installer.cmd b/.pipelines/build-installer.cmd index 9c3b9c1972..75d136c429 100644 --- a/.pipelines/build-installer.cmd +++ b/.pipelines/build-installer.cmd @@ -2,4 +2,4 @@ cd /D "%~dp0" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 SET IsPipeline=1 -call msbuild ../installer/PowerToysSetup.sln /p:Configuration=Release /p:Platform=x64 || exit /b 1 +call msbuild ../installer/PowerToysSetup.sln /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1 diff --git a/.pipelines/build.cmd b/.pipelines/build.cmd index 20de919cc8..4e3a1f15a3 100644 --- a/.pipelines/build.cmd +++ b/.pipelines/build.cmd @@ -1,6 +1,6 @@ cd /D "%~dp0" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 -call msbuild ../PowerToys.sln /p:Configuration=Release /p:Platform=x64 || exit /b 1 +call msbuild ../PowerToys.sln /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1 SET PTRoot=.. call "..\installer\PowerToysSetup\publish.cmd" diff --git a/.pipelines/ci/templates/build-powertoys-ci.yml b/.pipelines/ci/templates/build-powertoys-ci.yml index bfffbea6f8..6461014658 100644 --- a/.pipelines/ci/templates/build-powertoys-ci.yml +++ b/.pipelines/ci/templates/build-powertoys-ci.yml @@ -1,7 +1,7 @@ parameters: configuration: 'Release' platform: '' - additionalBuildArguments: '' + additionalBuildArguments: '/p:CIBuild=true' jobs: - job: Build${{ parameters.platform }}${{ parameters.configuration }} diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index eb8bd43c9f..3e7948c1f8 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -32,7 +32,6 @@ steps: platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' msbuildArgs: ${{ parameters.additionalBuildArguments }} - clean: true maximumCpuCount: true - task: VSTest@2 diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj index 0e5cfb8c4e..4a9e2e892a 100644 --- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj +++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj @@ -54,7 +54,6 @@ WIN64;_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug - Use Level4 ProgramDatabase stdcpplatest @@ -77,7 +76,6 @@ WIN64;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions) MultiThreaded true - Use Level4 ProgramDatabase stdcpplatest @@ -95,11 +93,16 @@ HighestAvailable + + + Use + stdafx.h + + - Create - Create + Create diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj index b91843919a..afc08cd6f7 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj @@ -59,7 +59,6 @@ - Use Level3 MaxSpeed true @@ -68,7 +67,6 @@ ..\;..\Telemetry;..\..\..\deps\cpprestsdk\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) true - pch.h MultiThreaded stdcpplatest @@ -82,14 +80,12 @@ - Use Level3 Disabled true $(VCInstallDir)UnitTest\include;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true - pch.h MultiThreadedDebug stdcpplatest @@ -99,12 +95,17 @@ RuntimeObject.lib;shlwapi.lib;%(AdditionalDependencies) + + + Use + pch.h + + - Create - Create + Create diff --git a/src/common/common-md-flag/common-md-flag.vcxproj b/src/common/common-md-flag/common-md-flag.vcxproj index 7a567a280c..f727236772 100644 --- a/src/common/common-md-flag/common-md-flag.vcxproj +++ b/src/common/common-md-flag/common-md-flag.vcxproj @@ -53,14 +53,12 @@ - NotUsing Level3 true true true NDEBUG;_LIB;%(PreprocessorDefinitions) true - pch.h stdcpplatest inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -73,12 +71,10 @@ - NotUsing Level3 true _DEBUG;_LIB;%(PreprocessorDefinitions) true - pch.h stdcpplatest inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -87,6 +83,12 @@ true + + + Use + pch.h + + @@ -98,7 +100,9 @@ - + + Create + diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 748d538476..467b6ced1b 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -68,12 +68,10 @@ - Use Level3 Disabled true _DEBUG;_LIB;%(PreprocessorDefinitions) - pch.h stdcpplatest MultiThreadedDebug inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -87,9 +85,14 @@ Shlwapi.lib; - + Use + pch.h + + + + Level3 MaxSpeed true @@ -97,7 +100,6 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) stdcpplatest - pch.h MultiThreaded inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) /await %(AdditionalOptions) @@ -157,8 +159,7 @@ - Create - Create + Create diff --git a/src/common/interop/interop.vcxproj b/src/common/interop/interop.vcxproj index 40086cd2c6..0d7ffd264a 100644 --- a/src/common/interop/interop.vcxproj +++ b/src/common/interop/interop.vcxproj @@ -65,8 +65,6 @@ - Use - pch.h Level3 _DEBUG;%(PreprocessorDefinitions) $(SolutionDir)src\common\interop;$(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -82,8 +80,6 @@ - Use - pch.h Level3 NDEBUG;%(PreprocessorDefinitions) $(SolutionDir)src\common\interop;$(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -96,6 +92,12 @@ + + + Use + pch.h + + @@ -130,8 +132,7 @@ - Create - Create + Create diff --git a/src/common/notifications/notifications_dll.vcxproj b/src/common/notifications/notifications_dll.vcxproj index edfbdc3b10..a343db04be 100644 --- a/src/common/notifications/notifications_dll.vcxproj +++ b/src/common/notifications/notifications_dll.vcxproj @@ -93,13 +93,11 @@ - Use Level4 true true true NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h stdcpplatest /await %(AdditionalOptions) true @@ -117,11 +115,9 @@ - Use Level3 true WIN32;_DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h Windows @@ -131,11 +127,9 @@ - Use Level4 true _DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h stdcpplatest /await %(AdditionalOptions) true @@ -151,13 +145,11 @@ - Use Level3 true true true WIN32;NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h Windows @@ -167,6 +159,12 @@ false + + + Use + pch.h + + @@ -180,10 +178,7 @@ - Create - Create - Create - Create + Create diff --git a/src/common/notifications_winrt/notifications.vcxproj b/src/common/notifications_winrt/notifications.vcxproj index 07908e0ef2..4f3a0dbdbe 100644 --- a/src/common/notifications_winrt/notifications.vcxproj +++ b/src/common/notifications_winrt/notifications.vcxproj @@ -86,8 +86,6 @@ - Use - pch.h $(IntDir)pch.pch Level4 %(AdditionalOptions) /bigobj @@ -122,6 +120,18 @@ true + + + Use + pch.h + + + + + NotUsing + pch.h + + @@ -132,7 +142,7 @@ - Create + Create BackgroundHandler.idl diff --git a/src/common/os-detection/os-detection.vcxproj b/src/common/os-detection/os-detection.vcxproj index b1c9bcd8f4..fe7eca3d40 100644 --- a/src/common/os-detection/os-detection.vcxproj +++ b/src/common/os-detection/os-detection.vcxproj @@ -53,7 +53,6 @@ - Use Level3 true _DEBUG;OSDETECTION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,7 +66,6 @@ - Use Level3 true true @@ -83,6 +81,12 @@ false + + + Use + pch.h + + @@ -92,8 +96,7 @@ - Create - Create + Create diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj index 19091f9e4f..3cc8581b94 100644 --- a/src/common/updating/updating.vcxproj +++ b/src/common/updating/updating.vcxproj @@ -90,15 +90,19 @@ false - + Use + pch.h + + + + Level3 true true true NDEBUG;_LIB;%(PreprocessorDefinitions) - pch.h stdcpplatest true MultiThreaded @@ -118,11 +122,9 @@ - Use Level3 true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - pch.h ../;%(AdditionalIncludeDirectories) @@ -132,11 +134,9 @@ - Use Level3 true _DEBUG;_LIB;%(PreprocessorDefinitions) - pch.h stdcpplatest true MultiThreadedDebug @@ -154,13 +154,11 @@ - Use Level3 true true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - pch.h ../;%(AdditionalIncludeDirectories) @@ -177,10 +175,7 @@ - Create - Create - Create - Create + Create diff --git a/src/modules/example_powertoy/example_powertoy.vcxproj b/src/modules/example_powertoy/example_powertoy.vcxproj index 0cdf93bedd..ce65d23f36 100644 --- a/src/modules/example_powertoy/example_powertoy.vcxproj +++ b/src/modules/example_powertoy/example_powertoy.vcxproj @@ -58,12 +58,10 @@ - Use Level3 Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\..\common\inc;..\..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug stdcpplatest @@ -76,14 +74,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\..\common\inc;..\..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded stdcpplatest @@ -96,6 +92,12 @@ $(OutDir)$(TargetName)$(TargetExt) + + + Use + pch.h + + @@ -104,10 +106,7 @@ - Create - Create - pch.h - pch.h + Create diff --git a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj index 2961cbba83..e804d083b3 100644 --- a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj +++ b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj @@ -61,12 +61,10 @@ - Use Level3 Disabled true _DEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug stdcpplatest @@ -80,14 +78,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded stdcpplatest @@ -101,6 +97,12 @@ gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) + + + Use + pch.h + + @@ -108,10 +110,7 @@ - Create - Create - pch.h - pch.h + Create diff --git a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj index f879cf0cd6..02ebfa1242 100644 --- a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj @@ -59,12 +59,10 @@ - Use Level3 Disabled true _DEBUG;_LIB;%(PreprocessorDefinitions) - pch.h stdcpplatest ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -76,14 +74,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;_LIB;%(PreprocessorDefinitions) - pch.h stdcpplatest ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -95,6 +91,12 @@ true + + + Use + pch.h + + @@ -115,8 +117,7 @@ - Create - Create + Create diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj index d6a87a6a25..7f2c25bb43 100644 --- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj @@ -62,14 +62,12 @@ - Use Level3 Disabled true ..\..\..\..\common\Telemetry;..\..\..\..\;..\..\..\..\..\deps\cpprestsdk\include;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) UNIT_TESTS;_DEBUG;%(PreprocessorDefinitions) true - pch.h stdcpplatest MultiThreadedDebug @@ -79,9 +77,14 @@ gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) - + Use + pch.h + + + + Level3 MaxSpeed true @@ -90,7 +93,6 @@ ..\..\..\..\common\Telemetry;..\..\..\..\;..\..\..\..\..\deps\cpprestsdk\include;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) UNIT_TESTS;NDEBUG;%(PreprocessorDefinitions) true - pch.h stdcpplatest MultiThreaded @@ -107,8 +109,7 @@ - Create - Create + Create diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index 6054cf5765..93bb39ac44 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -96,7 +96,6 @@ - Use Level3 Disabled WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) @@ -132,7 +131,6 @@ - Use Level3 Disabled _WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) @@ -167,7 +165,6 @@ - Use Level3 MaxSpeed WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) @@ -205,7 +202,6 @@ - Use Level3 MaxSpeed _WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) @@ -240,44 +236,29 @@ true + + + Use + pch.h + + - false - - - false - - - false - - - false - + false + - false - - - false - - - false - - - false - + false + - Create - Create - Create - Create + Create diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj index 5c5ed1ce2c..482ff40dcb 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj +++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj @@ -63,8 +63,6 @@ stdcpplatest ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) MultiThreadedDebug - Use - pch.h Console @@ -82,8 +80,6 @@ stdcpplatest ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) MultiThreaded - Use - pch.h Console @@ -92,13 +88,18 @@ true + + + Use + pch.h + + - Create - Create + Create diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index 4ea51acaa1..bbd12b210a 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -58,13 +58,11 @@ - Use Level3 Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - pch.h MultiThreadedDebug stdcpplatest @@ -76,7 +74,6 @@ - Use Level3 MaxSpeed true @@ -84,7 +81,6 @@ true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - pch.h MultiThreaded stdcpplatest @@ -107,6 +103,12 @@ shcore.lib;shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Use + pch.h + + @@ -114,10 +116,7 @@ - Create - Create - pch.h - pch.h + Create diff --git a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj index ffc676a7ab..6da7d96011 100644 --- a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj +++ b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj @@ -68,8 +68,6 @@ stdcpp17 $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) MultiThreadedDebug - Use - pch.h true @@ -88,8 +86,6 @@ true $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) MultiThreaded - Use - pch.h true @@ -99,14 +95,19 @@ windowsapp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Use + pch.h + + - Create - Create + Create diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 9fb9b43951..32e8bde6ed 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -57,12 +57,10 @@ - Use Level3 Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug stdcpplatest @@ -75,14 +73,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded stdcpplatest @@ -95,6 +91,12 @@ $(OutDir)$(TargetName)$(TargetExt) + + + Use + pch.h + + @@ -103,10 +105,7 @@ - Create - Create - pch.h - pch.h + Create diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj index 04754080d8..615b9a4252 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj @@ -58,7 +58,6 @@ - Use Level3 true true @@ -82,7 +81,6 @@ - Use Level3 true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -100,6 +98,12 @@ $(ProjectDir)..\ui;%(AdditionalIncludeDirectories) + + + Use + pch.h + + @@ -109,8 +113,7 @@ - Create - Create + Create diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index 66354d7ba5..60c40fadcf 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -164,6 +164,12 @@ gdi32.dll;shell32.dll;ole32.dll;shlwapi.dll;oleaut32.dll;%(DelayLoadDLLs) + + + Use + pch.h + + @@ -177,7 +183,9 @@ - + + Create + diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index 604e389b3f..49f089db8c 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -88,14 +88,12 @@ - Create Level4 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 MultiThreadedDebug - pch.h Windows @@ -103,7 +101,6 @@ - Create Level4 Disabled _DEBUG;_LIB;%(PreprocessorDefinitions) @@ -111,7 +108,6 @@ stdcpp17 MultiThreadedDebug $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - pch.h Windows @@ -121,7 +117,6 @@ Level3 - Create MaxSpeed true true @@ -129,7 +124,6 @@ true stdcpp17 MultiThreaded - pch.h Windows @@ -140,7 +134,6 @@ Level3 - Create MaxSpeed true true @@ -149,7 +142,6 @@ stdcpp17 MultiThreaded $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - pch.h Windows @@ -158,6 +150,12 @@ + + + Use + pch.h + + @@ -177,10 +175,7 @@ - Create - Create - Create - Create + Create diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index e47935d3f0..9cad3ad00c 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -97,7 +97,6 @@ - Use Level3 Disabled true @@ -113,7 +112,6 @@ - Use Level3 Disabled true @@ -130,7 +128,6 @@ - Use Level3 MaxSpeed true @@ -150,7 +147,6 @@ - Use Level3 MaxSpeed true @@ -170,6 +166,12 @@ gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;shlwapi.dll;%(DelayLoadDLLs) + + + Use + pch.h + + @@ -179,10 +181,7 @@ - Create - Create - Create - Create + Create diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj b/src/modules/powerrename/ui/PowerRenameUI.vcxproj index fc4e9c6d6d..13950bc48b 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj @@ -78,7 +78,6 @@ - Use Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -94,7 +93,6 @@ - Use Level3 Disabled _DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -112,7 +110,6 @@ Level3 - Use MaxSpeed true true @@ -131,7 +128,6 @@ Level3 - Use MaxSpeed true true @@ -148,6 +144,12 @@ true + + + Use + pch.h + + @@ -163,10 +165,7 @@ - Create - Create - Create - Create + Create diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index e78220e023..932d581bc9 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -103,7 +103,6 @@ - Use Level3 Disabled $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) @@ -120,7 +119,6 @@ - Use Level3 Disabled ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) @@ -138,7 +136,6 @@ Level3 - Use MaxSpeed true true @@ -159,7 +156,6 @@ Level3 - Use MaxSpeed true true @@ -177,6 +173,12 @@ $(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;%(AdditionalDependencies) + + + Use + pch.h + + @@ -191,10 +193,7 @@ - Create - Create - Create - Create + Create diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index 4d4dd9a13d..a88154f85a 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -59,12 +59,10 @@ - Use Level3 Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug stdcpplatest @@ -78,14 +76,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h ..\..\..\common\Telemetry;..\..\..\common;..\..\common\inc;..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded stdcpplatest @@ -99,6 +95,12 @@ powerpreview.def + + + Use + pch.h + + @@ -111,10 +113,7 @@ - Create - Create - pch.h - pch.h + Create diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj index 4aa72b6a33..397873d778 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj @@ -95,13 +95,11 @@ - Use Level3 true ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;..\..\..\..\;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true - pch.h stdcpplatest MultiThreadedDebug @@ -112,13 +110,11 @@ - Use Level3 true $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) true - pch.h Windows @@ -127,7 +123,6 @@ - Use Level3 true true @@ -135,7 +130,6 @@ $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) true - pch.h Windows @@ -146,7 +140,6 @@ - Use Level3 true true @@ -154,7 +147,6 @@ ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;..\..\..\..\;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) true - pch.h stdcpplatest MultiThreaded @@ -165,13 +157,16 @@ $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) + + + Use + pch.h + + - Create - Create - Create - Create + Create diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj b/src/modules/shortcut_guide/shortcut_guide.vcxproj index 4dde3f37b6..e0b2b2e575 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj @@ -58,14 +58,12 @@ - Use Level3 MaxSpeed true true true NDEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h MultiThreaded ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) stdcpplatest @@ -80,12 +78,10 @@ - Use Level3 Disabled true _DEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - pch.h MultiThreadedDebug ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) stdcpplatest @@ -96,6 +92,12 @@ $(OutDir)$(TargetName)$(TargetExt) + + + Use + pch.h + + @@ -111,8 +113,7 @@ - Create - Create + Create diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index daae00d685..11c5199fd9 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -62,8 +62,6 @@ true stdcpplatest MultiThreadedDebug - Use - pch.h ..\common\inc;..\common\os-detection;..\common\Telemetry;..;..\modules;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) _UNICODE;UNICODE;%(PreprocessorDefinitions) /await %(AdditionalOptions) @@ -86,8 +84,6 @@ true stdcpplatest MultiThreaded - Use - pch.h ..\common\inc;..\common\os-detection;..\common\Telemetry;..;..\modules;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) _UNICODE;UNICODE;%(PreprocessorDefinitions) /await %(AdditionalOptions) @@ -103,14 +99,19 @@ false + + + Use + pch.h + + - Create - Create + Create diff --git a/src/settings/settings.vcxproj b/src/settings/settings.vcxproj index 9d303db902..41751bd825 100644 --- a/src/settings/settings.vcxproj +++ b/src/settings/settings.vcxproj @@ -54,14 +54,18 @@ PowerToysSettings $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + + + Use + pch.h + + Level3 Disabled true stdcpplatest - Use - pch.h MultiThreadedDebug ..;..\common\Telemetry;%(AdditionalIncludeDirectories) /Zm150 %(AdditionalOptions) @@ -88,8 +92,6 @@ true true stdcpplatest - Use - pch.h MultiThreaded ..;..\common\Telemetry;%(AdditionalIncludeDirectories) /Zm150 %(AdditionalOptions) @@ -121,8 +123,7 @@ - Create - Create + Create diff --git a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj index e08bc7247d..930fad9ccf 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj @@ -54,13 +54,11 @@ - Use Level3 Disabled true _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - pch.h MultiThreadedDebug stdcpplatest @@ -72,7 +70,6 @@ - Use Level3 MaxSpeed true @@ -80,7 +77,6 @@ true NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - pch.h MultiThreaded stdcpplatest @@ -97,6 +93,12 @@ $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) + + + Use + pch.h + + @@ -105,10 +107,7 @@ - Create - Create - pch.h - pch.h + Create