diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props new file mode 100644 index 0000000000..facecfcf3f --- /dev/null +++ b/src/Cpp.Build.props @@ -0,0 +1,91 @@ + + + + + + + Debug + x64 + + + Release + x64 + + + + + + + true + Use + + + + + + + pch.h + Level3 + false + stdcpplatest + /await %(AdditionalOptions) + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + Windows + + + + + + + _DEBUG;%(PreprocessorDefinitions) + Disabled + true + MultiThreadedDebug + + + true + + + + + NDEBUG;%(PreprocessorDefinitions) + MaxSpeed + false + MultiThreaded + true + true + + + true + true + true + + + + + + 10.0.17134.0 + + + + + v142 + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + Unicode + Spectre + + + + + true + true + + + false + true + false + + + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9eaf83e309..b487d980ac 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,14 +1,8 @@ + <_PropertySheetDisplayName>PowerToys.Root.Props + $(MsbuildThisFileDirectory)\Cpp.Build.props - - - - false - pch.h - stdcpplatest - - \ No newline at end of file diff --git a/src/action_runner/action_runner.vcxproj b/src/action_runner/action_runner.vcxproj index edfff183f7..9ce34c9803 100644 --- a/src/action_runner/action_runner.vcxproj +++ b/src/action_runner/action_runner.vcxproj @@ -1,24 +1,7 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - + @@ -26,39 +9,13 @@ 16.0 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D} - actionrunner - 10.0.17134.0 + action_runner action_runner - + Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - Spectre - - - Application - false - v142 - true - Unicode - Spectre @@ -78,84 +35,18 @@ - - false - ../;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - true - - - true - ../;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - false - - + Level4 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - stdcpplatest true - MultiThreaded - true + NotUsing + ../;%(AdditionalIncludeDirectories) - Windows - true - true - true WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies) - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - stdcpplatest - true - MultiThreadedDebug - true - - - Windows - true - WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - + @@ -189,4 +80,4 @@ - \ No newline at end of file + diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj index 8134557cf7..10d7ed19b8 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj @@ -1,42 +1,20 @@ - - - Debug - x64 - - - Release - x64 - - 16.0 {1A066C63-64B3-45F8-92FE-664E1CCE8077} Win32Proj UnitTestsCommonLib - 10.0.17134.0 NativeUnitTestProject - + + DynamicLibrary - true - v142 - Unicode false - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - false - Spectre + @@ -49,59 +27,16 @@ - - false - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - MaxSpeed - true - true - true - ..\;..\Telemetry;..\..\..\deps\cpprestsdk\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - MultiThreaded - stdcpplatest + ..\;..\Telemetry;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - Windows - true - true $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) RuntimeObject.lib;%(AdditionalDependencies) - - - Level3 - Disabled - true - $(VCInstallDir)UnitTest\include;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDebug - stdcpplatest - - - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - RuntimeObject.lib;shlwapi.lib;%(AdditionalDependencies) - - - - - Use - pch.h - true - - diff --git a/src/common/common-md-flag/common-md-flag.vcxproj b/src/common/common-md-flag/common-md-flag.vcxproj index fe5e897995..248ec3bb1d 100644 --- a/src/common/common-md-flag/common-md-flag.vcxproj +++ b/src/common/common-md-flag/common-md-flag.vcxproj @@ -1,37 +1,14 @@ - - - Debug - x64 - - - Release - x64 - - 16.0 {985B3F2F-CEED-4C0A-A249-69257E719145} Win32Proj commonmdflag - 10.0.17134.0 - + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -45,53 +22,26 @@ - - false - - - true - - + + - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - false - stdcpplatest + MultiThreadedDebugDLL + + + + + MultiThreadedDLL + + + + + + _LIB;%(PreprocessorDefinitions) inc;telemetry;../../;%(AdditionalIncludeDirectories) - /await /Zc:twoPhase- %(AdditionalOptions) - - - Windows - true - true - true - - - - - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - false - stdcpplatest - inc;telemetry;../../;%(AdditionalIncludeDirectories) - /await /Zc:twoPhase- %(AdditionalOptions) - - - Windows - true - - - - - Use - pch.h - true + /Zc:twoPhase- %(AdditionalOptions) + diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 5a8ce24ca6..c8f448c2f4 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -11,41 +11,20 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {74485049-C722-400F-ABE5-86AC52D929B3} Win32Proj common - 10.0.17134.0 common - + + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre + @@ -58,64 +37,18 @@ - - true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - + - Level3 - Disabled - true _DEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest - MultiThreadedDebug - inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - /await %(AdditionalOptions) - - - Windows - true - - - - - - - - - Use - pch.h - true + inc;telemetry;%(AdditionalIncludeDirectories) - Level3 - MaxSpeed - true - true - true NDEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest - MultiThreaded - inc;telemetry;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - /await %(AdditionalOptions) + inc;telemetry;%(AdditionalIncludeDirectories) - - Windows - true - true - true - - - - - diff --git a/src/common/interop/interop.vcxproj b/src/common/interop/interop.vcxproj index e6ca0dbf4b..707ca211ce 100644 --- a/src/common/interop/interop.vcxproj +++ b/src/common/interop/interop.vcxproj @@ -6,40 +6,17 @@ Microsoft Corp. Copyright (C) 2019 Microsoft Corp. - - - Debug - x64 - - - Release - x64 - - 16.0 {F055103B-F80B-4D0C-BF48-057C55620033} v4.7.2 ManagedCProj - interop - 10.0.17134.0 + PowerToysInterop - + DynamicLibrary - true - v142 true - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre @@ -53,54 +30,33 @@ - + PowerToysInterop $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - PowerToysInterop - $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - _DEBUG;%(PreprocessorDefinitions) - $(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories) MultiThreadedDebugDLL - false - stdcpp17 - - WindowsApp.lib;%(AdditionalDependencies) - - - - + - Level3 - NDEBUG;%(PreprocessorDefinitions) - $(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories) MultiThreadedDLL + + + + + + $(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories) + false + /Zc:twoPhase- stdcpp17 WindowsApp.lib;%(AdditionalDependencies) - - - - - Use - pch.h - true - true - true - - diff --git a/src/common/logger/logger.vcxproj b/src/common/logger/logger.vcxproj index c69e5ea889..ce63d68a52 100644 --- a/src/common/logger/logger.vcxproj +++ b/src/common/logger/logger.vcxproj @@ -1,37 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - + 16.0 Win32Proj {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} logger - 10.0.17134.0 - + StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode + @@ -45,47 +26,12 @@ - - true - - - false - - + - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) + _LIB;%(PreprocessorDefinitions) true - Use - MultiThreadedDebug true - - - - true - - - - - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - Use - MultiThreaded - true - - - - - true - true - true - @@ -97,8 +43,7 @@ - Create - Create + Create diff --git a/src/common/notifications/notifications_dll.vcxproj b/src/common/notifications/notifications_dll.vcxproj index 32f2c685d3..123d887439 100644 --- a/src/common/notifications/notifications_dll.vcxproj +++ b/src/common/notifications/notifications_dll.vcxproj @@ -1,60 +1,18 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - + 16.0 {031AC72E-FA28-4AB7-B690-6F7B9C28AA73} Win32Proj notificationsdll - 10.0.17134.0 - + DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + @@ -73,99 +31,34 @@ - + Notifications - false - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - NOTIFICATIONSDLL - true - - - Notifications - true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - NOTIFICATIONSDLL - false - - + + + + MultiThreadedDebugDLL + + + + + MultiThreadedDLL + + + + Level4 - true - true - true NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdcpplatest - /await %(AdditionalOptions) true - Windows - true - true - true false notifications.def WindowsApp.lib;%(AdditionalDependencies) /ignore:4099 %(AdditionalOptions) - - - Level3 - true - WIN32;_DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - false - - - - - Level4 - true - _DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdcpplatest - /await %(AdditionalOptions) - true - - - Windows - true - false - notifications.def - WindowsApp.lib;%(AdditionalDependencies) - /ignore:4099 %(AdditionalOptions) - - - - - Level3 - true - true - true - WIN32;NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - false - - - - - Use - pch.h - true - - diff --git a/src/common/notifications_winrt/notifications.vcxproj b/src/common/notifications_winrt/notifications.vcxproj index be01f79a4a..06dd9a1e61 100644 --- a/src/common/notifications_winrt/notifications.vcxproj +++ b/src/common/notifications_winrt/notifications.vcxproj @@ -14,44 +14,15 @@ true Windows Store 10.0 - 10.0.17134.0 - 10.0.17134.0 - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - StaticLibrary - v140 - v141 - v142 + v142 Unicode false + true true @@ -84,6 +55,18 @@ notifications $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + + + + MultiThreadedDebugDLL + + + + + MultiThreadedDLL + + + $(IntDir)pch.pch diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj index dfbd25bc30..d01cedf60a 100644 --- a/src/common/updating/updating.vcxproj +++ b/src/common/updating/updating.vcxproj @@ -1,61 +1,17 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - 16.0 {17DA04DF-E393-4397-9CF0-84DABE11032E} Win32Proj updating - 10.0.17134.0 updating - + StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -75,103 +31,18 @@ - - false - ../../;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - true - - - true - ../../;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - false - - + + - Use - pch.h - true - - - - - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest + ..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + _LIB;%(PreprocessorDefinitions) true - MultiThreaded - /await %(AdditionalOptions) - ../;%(AdditionalIncludeDirectories) - - Windows - true - true - true - - - Version.lib - - - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest - true - MultiThreadedDebug - /await %(AdditionalOptions) - ../;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Version.lib - - - - - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - - + diff --git a/src/logging/logging.vcxproj b/src/logging/logging.vcxproj index 7c34c03237..800d28e68d 100644 --- a/src/logging/logging.vcxproj +++ b/src/logging/logging.vcxproj @@ -3,35 +3,17 @@ x64 - - - Debug - x64 - - - Release - x64 - - + {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F} - 10.0.17134.0 Win32Proj - x64 logging - NoUpgrade - + StaticLibrary MultiByte - v142 - - - StaticLibrary - MultiByte - v142 @@ -40,39 +22,21 @@ - - true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - - MultiThreadedDebug - - - - - MaxSpeed - - + - $(IntDir) Default - CompileAsCpp None Sync AnySuitable NotUsing true - false Level4 WIN32;_WINDOWS;SPDLOG_COMPILED_LIB;SPDLOG_WCHAR_FILENAMES;%(PreprocessorDefinitions) $(IntDir) - true true true true - MultiThreaded %(AdditionalOptions) /machine:x64 diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj index 46852d20a8..193e0fab78 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj @@ -1,16 +1,7 @@ - - - Debug - x64 - - - Release - x64 - - + @@ -19,25 +10,13 @@ Win32Proj {655c9af2-18d3-4da6-80e4-85504a7722ba} ColorPicker - 10.0.17134.0 ColorPicker - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + @@ -50,57 +29,20 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - - + + - Level3 - Disabled - true - _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - stdcpplatest + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - Windows - true $(OutDir)$(TargetName)$(TargetExt) - - - Level3 - MaxSpeed - true - true - true - NDEBUG;COLORPICKER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - - - - - Use - pch.h - true - - + diff --git a/src/modules/colorPicker/ColorPicker/dllmain.cpp b/src/modules/colorPicker/ColorPicker/dllmain.cpp index b7b7a77da5..5376a6b896 100644 --- a/src/modules/colorPicker/ColorPicker/dllmain.cpp +++ b/src/modules/colorPicker/ColorPicker/dllmain.cpp @@ -4,8 +4,8 @@ #include #include "trace.h" #include "Generated Files/resource.h" -#include -#include +#include +#include #include extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj index f988b983bb..91bb34b8a4 100644 --- a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj +++ b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj @@ -1,40 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {48804216-2A0E-4168-A6D8-9CD068D14227} Win32Proj fancyzones - 10.0.17134.0 fancyzones - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + @@ -49,61 +27,20 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - true - _DEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - stdcpplatest + FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - Windows - true $(OutDir)$(TargetName)$(TargetExt) gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) - - - Level3 - MaxSpeed - true - true - true - NDEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) - - - - - Use - pch.h - true - - diff --git a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj index 5fdaac34b1..e462a72887 100644 --- a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - @@ -19,25 +9,13 @@ {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} Win32Proj lib - 10.0.17134.0 FancyZonesLib - + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre + @@ -50,57 +28,18 @@ - - true + + $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest - ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Windows - true - - - - - Level3 - MaxSpeed - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - stdcpplatest - ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Windows - true - true - true - - - - - Use - pch.h - true + _LIB;%(PreprocessorDefinitions) + ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + @@ -145,17 +84,12 @@ + - - - - - - {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} diff --git a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj.filters b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj.filters index d0d30891c8..c1cfb674ec 100644 --- a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj.filters +++ b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj.filters @@ -71,6 +71,7 @@ Generated Files + Header Files diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj index a5adfc1832..9796ca8054 100644 --- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj @@ -1,42 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - 16.0 {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} Win32Proj UnitTests - 10.0.17134.0 NativeUnitTestProject UnitTests-FancyZones - + DynamicLibrary - true - v142 - Unicode false - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - false - Spectre @@ -50,61 +26,20 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + - Level3 - Disabled - true - ..\..\..\..\common\Telemetry;..\..\..\..\;..\..\..\..\..\deps\cpprestsdk\include;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - UNIT_TESTS;_DEBUG;%(PreprocessorDefinitions) - true - stdcpplatest - MultiThreadedDebug + ..\..\..\..\common\Telemetry;..\..\..\..\;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + UNIT_TESTS;%(PreprocessorDefinitions) - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) - - - - - Use - pch.h - true - - - - - Level3 - MaxSpeed - true - true - true - ..\..\..\..\common\Telemetry;..\..\..\..\;..\..\..\..\..\deps\cpprestsdk\include;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - UNIT_TESTS;NDEBUG;%(PreprocessorDefinitions) - true - stdcpplatest - MultiThreaded - - - Windows - true - true $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) gdiplus.lib;dwmapi.lib;shlwapi.lib;uxtheme.lib;shcore.lib;%(AdditionalDependencies) + diff --git a/src/modules/imageresizer/dll/ContextMenuHandler.cpp b/src/modules/imageresizer/dll/ContextMenuHandler.cpp index b40286faad..a1d4632a49 100644 --- a/src/modules/imageresizer/dll/ContextMenuHandler.cpp +++ b/src/modules/imageresizer/dll/ContextMenuHandler.cpp @@ -4,7 +4,7 @@ #include "ContextMenuHandler.h" #include "HDropIterator.h" #include "Settings.h" -#include "common/icon_helpers.h" +#include #include "trace.h" extern HINSTANCE g_hInst_imageResizer; diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index 4cab15f126..03100c3420 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -1,41 +1,18 @@  - - - Debug - x64 - - - Release - x64 - - {0B43679E-EDFA-4DA0-AD30-F4628B308B1B} - 10.0.17134.0 AtlProj false - + DynamicLibrary - true Static - v142 - Unicode - Spectre - - - DynamicLibrary - false - Static - v142 - Unicode - Spectre @@ -47,28 +24,22 @@ - + true - true $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - true - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + - Level3 - Disabled - _WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDebug - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - stdcpplatest + _WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + + .\ImageResizerExt.def + true + true + + + false _DEBUG;%(PreprocessorDefinitions) @@ -85,24 +56,8 @@ $(IntDir);%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) - - Windows - .\ImageResizerExt.def - true - true - true - - - Level3 - MaxSpeed - _WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreaded - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - stdcpplatest - false NDEBUG;%(PreprocessorDefinitions) @@ -118,23 +73,7 @@ 0x0409 $(IntDir);%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ImageResizerExt.def - true - true - true - true - true - - - - - Use - pch.h - true - + diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj index e1a15f5e5e..49b6a5c36b 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj +++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj @@ -1,37 +1,16 @@ - - - Debug - x64 - - - Release - x64 - - 16.0 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} KeyboardManagerCommon + true 10.0.18362.0 - + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -45,74 +24,26 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ true - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ - true - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - stdcpplatest - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) - MultiThreadedDebug - true - 4002 - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - stdcpplatest - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) - MultiThreaded - true - 4002 - - - Console - true - true - true - - + _CONSOLE;%(PreprocessorDefinitions) + ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) + true + 4002 %(AdditionalOptions) /Zm200 - - - - Use - pch.h - true - - shlwapi.lib; - - - shlwapi.lib; - + shlwapi.lib;%(AdditionalDependencies) + + + Console + + diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index a605fd895f..169b5bdb6d 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -1,39 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {89f34af7-1c34-4a72-aa6e-534bcf972bd9} Win32Proj KeyboardManager + true 10.0.18362.0 KeyboardManager - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre @@ -47,69 +26,20 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ true - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ - true - - - - Level3 - Disabled - true - _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - MultiThreadedDebug - stdcpplatest - - - Windows - true - $(OutDir)$(TargetName)$(TargetExt) - - - - - Level3 - MaxSpeed - true - true - true - NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - - $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - true - true - 4002 - 4002 - - - - - Use - pch.h - true + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + 4002 + + $(OutDir)$(TargetName)$(TargetExt) + diff --git a/src/modules/keyboardmanager/test/AppSpecificShortcutRemappingTests.cpp b/src/modules/keyboardmanager/test/AppSpecificShortcutRemappingTests.cpp index ee71909d63..cde59ed4cd 100644 --- a/src/modules/keyboardmanager/test/AppSpecificShortcutRemappingTests.cpp +++ b/src/modules/keyboardmanager/test/AppSpecificShortcutRemappingTests.cpp @@ -4,7 +4,7 @@ #include #include #include "TestHelpers.h" -#include +#include using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj index 584ed389a6..a783c59006 100644 --- a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj +++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj @@ -1,39 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - 16.0 {62173D9A-6724-4C00-A1C8-FB646480A9EC} Win32Proj KeyboardManagerTest + true 10.0.18362.0 NativeUnitTestProject - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre @@ -47,61 +26,21 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ true - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ - true - - + - Level3 - true $(VCInstallDir)UnitTest\include;$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) true true - MultiThreadedDebug 4002 - Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - Level3 - true - true - true - $(VCInstallDir)UnitTest\include;$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - 4002 - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - pch.h - true - - diff --git a/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp b/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp index ab73775195..7f63d5a9dc 100644 --- a/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp +++ b/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp @@ -1,7 +1,7 @@ #include "pch.h" #include "BufferValidationHelpers.h" #include -#include +#include #include namespace BufferValidationHelpers diff --git a/src/modules/keyboardmanager/ui/Dialog.cpp b/src/modules/keyboardmanager/ui/Dialog.cpp index 1cb2f8ce4c..a2a464f51f 100644 --- a/src/modules/keyboardmanager/ui/Dialog.cpp +++ b/src/modules/keyboardmanager/ui/Dialog.cpp @@ -1,7 +1,7 @@ #include "pch.h" #include "Dialog.h" #include -#include "common/common.h" +#include #include "keyboardmanager/dll/Generated Files/resource.h" extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp index 353b0ff33f..11287b6923 100644 --- a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include "Styles.h" @@ -13,7 +14,6 @@ #include #include "../common/shared_constants.h" #include "keyboardmanager/common/KeyboardManagerState.h" -#include "common/common.h" #include "LoadingAndSavingRemappingHelper.h" #include "UIHelpers.h" extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp index 23e45c28e3..af1b10926e 100644 --- a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp @@ -5,13 +5,13 @@ #include "XamlBridge.h" #include #include +#include #include #include #include "Styles.h" #include "Dialog.h" #include #include -#include "common/common.h" #include "LoadingAndSavingRemappingHelper.h" #include "UIHelpers.h" extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp b/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp index 7feb8f5a3c..1bb9b582f5 100644 --- a/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp +++ b/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp @@ -3,8 +3,8 @@ #include "keyboardmanager/common/Helpers.h" #include #include "BufferValidationHelpers.h" -#include -#include +#include +#include #include // Initialized to null diff --git a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj index 97cc496847..a7a8a9a251 100644 --- a/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj +++ b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj @@ -1,40 +1,19 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {EAF23649-EF6E-478B-980E-81FAD96CCA2A} Win32Proj KeyboardManagerUI - 10.0.18362.0 - true + True KeyboardManagerUI + true + 10.0.18362.0 - + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -48,66 +27,23 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ true - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - $(Platform)\$(Configuration)\obj\$(ProjectName)\ - true - - + - Level3 - Disabled - true - UNICODE;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Unicode + Spectre true - stdcpp17 - $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - MultiThreadedDebug true 4002 - - - true - Windows - 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) - - - - - Level3 - MaxSpeed - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - MultiThreaded - true - 4002 - true - true - true - Windows 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 - true - - diff --git a/src/modules/keyboardmanager/ui/ShortcutControl.cpp b/src/modules/keyboardmanager/ui/ShortcutControl.cpp index 8807013552..a4bc28c16d 100644 --- a/src/modules/keyboardmanager/ui/ShortcutControl.cpp +++ b/src/modules/keyboardmanager/ui/ShortcutControl.cpp @@ -3,9 +3,9 @@ #include "KeyDropDownControl.h" #include "keyboardmanager/common/KeyboardManagerState.h" #include "keyboardmanager/common/Helpers.h" -#include "common/common.h" +#include #include "keyboardmanager/dll/Generated Files/resource.h" -#include +#include extern "C" IMAGE_DOS_HEADER __ImageBase; //Both static members are initialized to null diff --git a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp index d9185f0971..3525d67be6 100644 --- a/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp +++ b/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp @@ -4,9 +4,9 @@ #include "keyboardmanager/common/KeyboardManagerConstants.h" #include "keyboardmanager/common/KeyboardManagerState.h" #include "ShortcutControl.h" -#include "common/common.h" +#include #include "keyboardmanager/dll/Generated Files/resource.h" -#include +#include extern "C" IMAGE_DOS_HEADER __ImageBase; //Both static members are initialized to null diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index d52e9d7f31..a0712a7652 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - @@ -19,25 +9,14 @@ {e364f67b-bb12-4e91-b639-355866ebcd8b} Win32Proj Wox_Launcher - 10.0.17134.0 Microsoft.Launcher - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ + @@ -50,57 +29,26 @@ - - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ - - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ - - - - Level3 - Disabled - true - _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - stdcpplatest - + + - Windows - true $(OutDir)$(TargetName)$(TargetExt) + + + + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + + - Level3 - MaxSpeed - true - true - true - NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - - - - - Use - pch.h - true + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp index d45fe3e58c..3fdce364f0 100644 --- a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj index 122039323a..7614cfc376 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj @@ -1,16 +1,7 @@ - - - Debug - x64 - - - Release - x64 - - + @@ -19,23 +10,10 @@ {0485F45C-EA7A-4BB5-804B-3E8D14699387} Win32Proj PowerRenameUWPUI - 10.0.17134.0 - + Application - true - v142 - Unicode - Spectre - - - Application - false - v142 - true - Unicode - Spectre @@ -49,67 +27,22 @@ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - true - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - stdcpplatest + _WINDOWS;%(PreprocessorDefinitions) $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - MultiThreaded - Windows - true - true - true WindowsApp.lib;Comctl32.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;shcore.lib;%(AdditionalDependencies) $(ProjectDir)..\ui;%(AdditionalIncludeDirectories) - - - Level3 - true - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - stdcpplatest - MultiThreadedDebug - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - Windows - true - WindowsApp.lib;Comctl32.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;shcore.lib;%(AdditionalDependencies) - - - $(ProjectDir)..\ui;%(AdditionalIncludeDirectories) - - - - - Use - pch.h - true - true - true - - diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index 7143071aa3..d8840a6872 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -1,24 +1,6 @@  - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - @@ -26,156 +8,30 @@ 15.0 {B25AC7A5-FB9F-4789-B392-D5C85E948670} PowerRenameExt - 10.0.17134.0 + - + + DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + $(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + - - - - - - - - - - - - - - - - - - - .dll - ..\lib\;..\ui\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - $(ProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - - - ..\lib\;..\ui\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - $(ProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - - - ..\lib\;..\ui\;$(IncludePath) - $(ProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - - ..\lib\;..\ui\;$(IncludePath) - $(ProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - true - stdcpp17 - MultiThreadedDebug - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) + ..\lib\;..\ui\;..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + true - $(SolutionDir)$(Platform)\$(Configuration)\PowerRenameLib.lib;$(SolutionDir)$(Platform)\$(Configuration)\PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;%(AdditionalDependencies) - PowerRenameExt.def - - - - - Level3 - Disabled - true - stdcpplatest - MultiThreadedDebug - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - - - Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;shcore.lib;%(AdditionalDependencies) - PowerRenameExt.def - - - - - Level3 - MaxSpeed - true - true - true - stdcpp17 - MultiThreaded - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) - - - true - true - $(SolutionDir)$(Platform)\$(Configuration)\PowerRenameLib.lib;$(SolutionDir)$(Platform)\$(Configuration)\PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;%(AdditionalDependencies) - PowerRenameExt.def - - - - - Level3 - MaxSpeed - true - true - true - stdcpplatest - MultiThreaded - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - - - true - true Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;shcore.lib;%(AdditionalDependencies) PowerRenameExt.def gdi32.dll;shell32.dll;ole32.dll;shlwapi.dll;oleaut32.dll;%(DelayLoadDLLs) - - - - - Use - pch.h - true - true - true - + + diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index 2432baedd5..882cd91dd4 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -1,58 +1,14 @@  - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - {51920F1F-C28C-4ADF-8660-4238766796C2} Win32Proj PowerRenameLib - 10.0.17134.0 - + StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -72,93 +28,18 @@ - - $(SolutionDir)$(Platform)\$(Configuration)\ - - - $(SolutionDir)$(Platform)\$(Configuration)\ - - + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + Level4 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreadedDebug - - - Windows - - - - - Level4 - Disabled - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreadedDebug + WIN32;_LIB;%(PreprocessorDefinitions) $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - Windows - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - - - Windows - true - true - - - - - Level3 - MaxSpeed - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - Windows - true - true - - - - - - Use - pch.h - true - true - true - + diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index 2273503046..13cd6ac3af 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -1,60 +1,17 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - 15.0 {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} Win32Proj PowerRenameTest - 10.0.17134.0 - + Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - Spectre - - - Application - false - v142 - true - Unicode - Spectre + @@ -73,108 +30,18 @@ - - true - ..\ui\;..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - - - true - ..\ui\;..\lib\;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - ..\ui\;..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - - - false - ..\ui\;..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + - Level3 - Disabled - true - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - MultiThreadedDebug - - - Windows - true - $(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(OutDir)..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;%(AdditionalDependencies) - - - - - Level3 - Disabled - true - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - MultiThreadedDebug $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + WIN32;_WINDOWS;%(PreprocessorDefinitions) - Windows - true $(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;shlwapi.lib;shcore.lib;%(AdditionalDependencies) - - - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - MultiThreaded - - - Windows - true - true - true - $(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(OutDir)..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - MultiThreaded - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - Windows - true - true - true - $(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;Pathcch.lib;comctl32.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;shlwapi.lib;shcore.lib;%(AdditionalDependencies) - gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;shlwapi.dll;%(DelayLoadDLLs) - - - - - Use - pch.h - true - true - true - - diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj b/src/modules/powerrename/ui/PowerRenameUI.vcxproj index 7255121bc3..147a8a2c34 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj @@ -1,16 +1,6 @@  - - - Debug - x64 - - - Release - x64 - - @@ -18,24 +8,11 @@ {0E072714-D127-460B-AFAD-B4C40B412798} Win32Proj PowerRename - 10.0.17134.0 PowerRenameUI - + StaticLibrary - true - v142 - Unicode - Spectre - - - StaticLibrary - false - v142 - true - Unicode - Spectre @@ -55,116 +32,24 @@ - - true - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - true - ..\lib\;$(IncludePath) + + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - false - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreadedDebug + true + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + WIN32;_WINDOWS;%(PreprocessorDefinitions) - Windows - true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies) - - - - Level3 - Disabled - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreadedDebug - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - Windows - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - Windows - true - true - true - - - - - Use - pch.h - true - - - ModuleAddRef,ModuleRelease - - true - - - true - diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 3446f72e20..ff42834172 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -1,64 +1,17 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - {2151F984-E006-4A9F-92EF-C6DDE3DC8413} Win32Proj PowerRenameLibUnitTests - 10.0.17134.0 PowerRenameUnitTests - + DynamicLibrary - true - v142 - Unicode - false - - - DynamicLibrary - false - v142 - true - Unicode - false - - - DynamicLibrary - true - v142 - Unicode - false - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - false - Spectre + @@ -77,111 +30,21 @@ - - false - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - true - ..\lib\;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - false - ..\lib\;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) + ..\;..\lib\;..\..\..\common;..\..\..\common\telemetry;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) true - stdcpp17 - MultiThreadedDebug - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - $(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;$(OutDir)..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;$(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies); - - - - - Level3 - Disabled - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreadedDebug - - - Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) $(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;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies) - - - Level3 - MaxSpeed - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - $(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;$(OutDir)..\..\src\modules\powerrename\UI\$(Platform)\$(Configuration)\PowerRenameUI.res;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - stdcpp17 - MultiThreaded - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - $(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 - true - true - true - - diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index a6aa828c24..2cde6f00f2 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -1,16 +1,7 @@ - - - Debug - x64 - - - Release - x64 - - + @@ -19,25 +10,13 @@ {217DF501-135C-4E38-BFC8-99D4821032EA} Win32Proj examplepowertoy - 10.0.17134.0 powerpreview - + DynamicLibrary - true - v142 - Unicode - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - Spectre + @@ -50,61 +29,21 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - false - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - Disabled - true - _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - stdcpplatest + _WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - Windows - true $(OutDir)$(TargetName)$(TargetExt) powerpreview.def - - - Level3 - MaxSpeed - true - true - true - NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - powerpreview.def - - - - - Use - pch.h - true - - + diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj index 646d7aed78..82a827f48b 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj @@ -1,65 +1,19 @@ - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - 16.0 {47310AB4-9034-4BD1-8D8B-E88AD21A171B} Win32Proj powerpreviewTest - 10.0.17134.0 NativeUnitTestProject - + DynamicLibrary - true - v142 - Unicode false - - DynamicLibrary - false - v142 - true - Unicode - false - - - DynamicLibrary - true - v142 - Unicode - false - Spectre - - - DynamicLibrary - false - v142 - true - Unicode - false - Spectre - + @@ -78,92 +32,27 @@ - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - true - - - false - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Level3 - true - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;..\..\..\..\;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - stdcpplatest - MultiThreadedDebug + ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\;%(AdditionalIncludeDirectories) - Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - + - Level3 - true $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - Level3 - true - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Level3 - true - true - true - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;..\..\..\..\;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - stdcpplatest - MultiThreaded - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - pch.h - true - - + diff --git a/src/modules/shortcut_guide/overlay_window.cpp b/src/modules/shortcut_guide/overlay_window.cpp index 7e4c90f01d..176f11b22c 100644 --- a/src/modules/shortcut_guide/overlay_window.cpp +++ b/src/modules/shortcut_guide/overlay_window.cpp @@ -1,13 +1,13 @@ #include "pch.h" #include "overlay_window.h" -#include "common/monitors.h" -#include "common/tasklist_positions.h" -#include "common/start_visible.h" +#include +#include +#include +#include #include "keyboard_state.h" #include "shortcut_guide.h" #include "trace.h" #include "Generated Files/resource.h" -#include extern "C" IMAGE_DOS_HEADER __ImageBase; diff --git a/src/modules/shortcut_guide/overlay_window.h b/src/modules/shortcut_guide/overlay_window.h index bf78bf329c..fe2c7d22bd 100644 --- a/src/modules/shortcut_guide/overlay_window.h +++ b/src/modules/shortcut_guide/overlay_window.h @@ -2,10 +2,10 @@ #include "d2d_svg.h" #include "d2d_window.h" #include "d2d_text.h" -#include "common/monitors.h" -#include "common/animation.h" -#include "common/windows_colors.h" -#include "common/tasklist_positions.h" +#include +#include +#include +#include struct ScaleResult { diff --git a/src/modules/shortcut_guide/target_state.cpp b/src/modules/shortcut_guide/target_state.cpp index e8ca601695..08d74bf15d 100644 --- a/src/modules/shortcut_guide/target_state.cpp +++ b/src/modules/shortcut_guide/target_state.cpp @@ -1,9 +1,9 @@ #include "pch.h" #include "target_state.h" -#include "common/start_visible.h" +#include #include "keyboard_state.h" -#include "common/shared_constants.h" -#include +#include +#include TargetState::TargetState(int ms_delay) : // TODO: All this processing should be done w/o a separate thread etc. in pre_wnd_proc of winkey_popup to avoid diff --git a/src/runner/restart_elevated.cpp b/src/runner/restart_elevated.cpp index f96a78d2b4..611e6bf93c 100644 --- a/src/runner/restart_elevated.cpp +++ b/src/runner/restart_elevated.cpp @@ -1,6 +1,6 @@ #include "pch.h" #include "restart_elevated.h" -#include "common/common.h" +#include enum State { diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index 8749ddaeb8..8e48758109 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -1,16 +1,7 @@  - - - Debug - x64 - - - Release - x64 - - + @@ -19,25 +10,12 @@ {9412D5C6-2CF2-4FC2-A601-B55508EA9B27} powertoys runner - 10.0.17134.0 - + Application - true - v142 - Unicode - Spectre - - - Application - false - v142 - true - Unicode - Spectre @@ -51,24 +29,12 @@ - + PowerToys - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - PowerToys - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + - Level3 - Disabled - true - stdcpplatest - MultiThreadedDebug ..\common\inc;..\common\os-detection;..\common\Telemetry;..;..\modules;%(AdditionalIncludeDirectories) - _UNICODE;UNICODE;%(PreprocessorDefinitions) - /await %(AdditionalOptions) AsInvoker @@ -79,37 +45,7 @@ false - - - Level3 - MaxSpeed - true - true - true - stdcpplatest - MultiThreaded - ..\common\inc;..\common\os-detection;..\common\Telemetry;..;..\modules;%(AdditionalIncludeDirectories) - _UNICODE;UNICODE;%(PreprocessorDefinitions) - /await %(AdditionalOptions) - - - true - true - AsInvoker - $(OutDir)$(TargetName)$(TargetExt) - Msi.lib;WindowsApp.lib;Rstrtmgr.lib;Shlwapi.lib;%(AdditionalDependencies) - - - false - - - - - Use - pch.h - true - - + @@ -152,86 +88,72 @@ true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs true Document - $(OutDir)\svgs - $(OutDir)\svgs + $(OutDir)\svgs diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp index ba02ba529c..e49c7ff952 100644 --- a/src/runner/settings_window.cpp +++ b/src/runner/settings_window.cpp @@ -8,14 +8,14 @@ #include #include "tray_icon.h" #include "general_settings.h" -#include "common/windows_colors.h" -#include "common/common.h" +#include +#include #include "restart_elevated.h" #include "update_utils.h" #include "centralized_kb_hook.h" #include -#include +#include #include #include #include diff --git a/src/settings/settings.vcxproj b/src/settings/settings.vcxproj index 745f4c10f1..ccb0ed7465 100644 --- a/src/settings/settings.vcxproj +++ b/src/settings/settings.vcxproj @@ -1,39 +1,18 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {07C389E3-6BC8-41CF-923E-307B1265FA2D} PowerToysSettingsEditor - 10.0.17134.0 settings - + + Application - true - v142 - Unicode - Spectre - - - Application - false - v142 - true - Unicode - Spectre + @@ -46,65 +25,14 @@ - + PowerToysSettings - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - PowerToysSettings - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - - + + - Use - pch.h - true - - - - - Level3 - Disabled - true - stdcpplatest - MultiThreadedDebug ..;..\common\Telemetry;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - - - - - - XCOPY "$(ProjectDir)settings-html" "$(TargetDir)\settings-html\" /S /I /Y - - - Copying web assets - - - PerMonitorHighDPIAware - - - - - Level3 - MaxSpeed - true - true - true - stdcpplatest - MultiThreaded - ..;..\common\Telemetry;%(AdditionalIncludeDirectories) - %(AdditionalOptions) - - - true - true - - - - - XCOPY "$(ProjectDir)settings-html" "$(TargetDir)\settings-html\" /S /I /Y