diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000000..9eaf83e309 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,14 @@ + + + + <_PropertySheetDisplayName>PowerToys.Root.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 06f5f44e6a..8543460329 100644 --- a/src/action_runner/action_runner.vcxproj +++ b/src/action_runner/action_runner.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -22,7 +23,7 @@ 16.0 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D} actionrunner - 10.0 + 10.0.17134.0 action_runner @@ -93,7 +94,6 @@ true true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true stdcpplatest true MultiThreaded @@ -111,7 +111,6 @@ Level3 true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true Console @@ -123,7 +122,6 @@ Level4 true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true stdcpplatest true MultiThreadedDebug @@ -141,7 +139,6 @@ true true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true Console @@ -164,7 +161,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/action_runner/packages.config b/src/action_runner/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/action_runner/packages.config @@ -0,0 +1,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 9667cf1f52..5cca53553a 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {1A066C63-64B3-45F8-92FE-664E1CCE8077} Win32Proj UnitTestsCommonLib - 10.0 + 10.0.17134.0 NativeUnitTestProject @@ -113,7 +114,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters index 07ce02df23..d130140a5e 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters @@ -33,4 +33,7 @@ Header Files + + + \ No newline at end of file diff --git a/src/common/UnitTests-CommonLib/packages.config b/src/common/UnitTests-CommonLib/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/common/UnitTests-CommonLib/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/common/UnitTests-CommonLib/pch.h b/src/common/UnitTests-CommonLib/pch.h index d7c448a6ed..a3983204aa 100644 --- a/src/common/UnitTests-CommonLib/pch.h +++ b/src/common/UnitTests-CommonLib/pch.h @@ -9,8 +9,9 @@ // add headers that you want to pre-compile here #include -#include - +#include +#include +#include #include "CppUnitTest.h" #endif //PCH_H diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 1cc6b98376..f73252809b 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -1,5 +1,6 @@ + @@ -25,7 +26,7 @@ {74485049-C722-400F-ABE5-86AC52D929B3} Win32Proj common - 10.0 + 10.0.17134.0 common @@ -72,7 +73,6 @@ Disabled true _DEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h stdcpplatest MultiThreadedDebug @@ -96,7 +96,6 @@ true true NDEBUG;_LIB;%(PreprocessorDefinitions) - true stdcpplatest pch.h MultiThreaded @@ -173,11 +172,14 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/common/json.h b/src/common/json.h index 141cc107a4..c0ec8eb14c 100644 --- a/src/common/json.h +++ b/src/common/json.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include diff --git a/src/common/notifications/notifications_dll.vcxproj b/src/common/notifications/notifications_dll.vcxproj index dc7b54cc16..a5b2f8e718 100644 --- a/src/common/notifications/notifications_dll.vcxproj +++ b/src/common/notifications/notifications_dll.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -23,7 +24,7 @@ {031AC72E-FA28-4AB7-B690-6F7B9C28AA73} Win32Proj notificationsdll - 10.0 + 10.0.17134.0 @@ -96,7 +97,6 @@ true true NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h stdcpplatest /await %(AdditionalOptions) @@ -119,7 +119,6 @@ Level3 true WIN32;_DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h @@ -134,7 +133,6 @@ Level4 true _DEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h stdcpplatest /await %(AdditionalOptions) @@ -157,7 +155,6 @@ true true WIN32;NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h @@ -171,6 +168,7 @@ + @@ -187,10 +185,18 @@ + {031AC72E-FA28-4AB7-B690-6F7B9C28AA73} + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/common/notifications/notifications_dll.vcxproj.filters b/src/common/notifications/notifications_dll.vcxproj.filters index daaa21a60d..961fcce8be 100644 --- a/src/common/notifications/notifications_dll.vcxproj.filters +++ b/src/common/notifications/notifications_dll.vcxproj.filters @@ -19,6 +19,7 @@ Resource Files + diff --git a/src/common/notifications/packages.config b/src/common/notifications/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/common/notifications/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/common/notifications_winrt/PropertySheet.props b/src/common/notifications_winrt/PropertySheet.props deleted file mode 100644 index e34141b019..0000000000 --- a/src/common/notifications_winrt/PropertySheet.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/common/notifications_winrt/notifications.vcxproj b/src/common/notifications_winrt/notifications.vcxproj index 0599997ee5..95d699b4a6 100644 --- a/src/common/notifications_winrt/notifications.vcxproj +++ b/src/common/notifications_winrt/notifications.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -14,7 +14,7 @@ true Windows Store 10.0 - 10.0 + 10.0.17134.0 10.0.17134.0 @@ -69,9 +69,6 @@ - - - notifications @@ -105,7 +102,6 @@ _DEBUG;%(PreprocessorDefinitions) true - true stdcpplatest @@ -113,7 +109,6 @@ NDEBUG;%(PreprocessorDefinitions) true - true stdcpplatest @@ -147,13 +142,13 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/src/common/notifications_winrt/notifications.vcxproj.filters b/src/common/notifications_winrt/notifications.vcxproj.filters index 097a6072f1..fe1b061b0d 100644 --- a/src/common/notifications_winrt/notifications.vcxproj.filters +++ b/src/common/notifications_winrt/notifications.vcxproj.filters @@ -18,11 +18,9 @@ - - - + diff --git a/src/common/notifications_winrt/packages.config b/src/common/notifications_winrt/packages.config index c4867c30bf..1447e714af 100644 --- a/src/common/notifications_winrt/packages.config +++ b/src/common/notifications_winrt/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/common/packages.config b/src/common/packages.config index 09cb116327..ce06e0cff6 100644 --- a/src/common/packages.config +++ b/src/common/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/common/pch.h b/src/common/pch.h index 68a805c03a..8b9652ae35 100644 --- a/src/common/pch.h +++ b/src/common/pch.h @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj index 31eba75a8c..a30a467ace 100644 --- a/src/common/updating/updating.vcxproj +++ b/src/common/updating/updating.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -23,7 +24,7 @@ {17DA04DF-E393-4397-9CF0-84DABE11032E} Win32Proj updating - 10.0 + 10.0.17134.0 updating @@ -95,7 +96,6 @@ true true NDEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h stdcpplatest true @@ -120,7 +120,6 @@ Level3 true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h ../;%(AdditionalIncludeDirectories) @@ -135,7 +134,6 @@ Level4 true _DEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h stdcpplatest true @@ -160,7 +158,6 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h ../;%(AdditionalIncludeDirectories) @@ -189,7 +186,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/common/updating/updating.vcxproj.filters b/src/common/updating/updating.vcxproj.filters index c708d3e9f6..6523291f59 100644 --- a/src/common/updating/updating.vcxproj.filters +++ b/src/common/updating/updating.vcxproj.filters @@ -30,4 +30,7 @@ Source Files + + + \ No newline at end of file diff --git a/src/modules/example_powertoy/example_powertoy.vcxproj b/src/modules/example_powertoy/example_powertoy.vcxproj index 786347819a..78506a8057 100644 --- a/src/modules/example_powertoy/example_powertoy.vcxproj +++ b/src/modules/example_powertoy/example_powertoy.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {44CC9375-3E6E-4D99-8913-7FB748807EBD} Win32Proj examplepowertoy - 10.0 + 10.0.17134.0 @@ -60,7 +61,6 @@ Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\..\common\inc;..\..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -81,7 +81,6 @@ true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\..\common\inc;..\..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -118,7 +117,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/example_powertoy/example_powertoy.vcxproj.filters b/src/modules/example_powertoy/example_powertoy.vcxproj.filters index 11a00156ce..e69fd9068f 100644 --- a/src/modules/example_powertoy/example_powertoy.vcxproj.filters +++ b/src/modules/example_powertoy/example_powertoy.vcxproj.filters @@ -13,4 +13,7 @@ + + + \ No newline at end of file diff --git a/src/modules/example_powertoy/packages.config b/src/modules/example_powertoy/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/example_powertoy/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/example_powertoy/pch.h b/src/modules/example_powertoy/pch.h index bf883a660a..fe34ebab4b 100644 --- a/src/modules/example_powertoy/pch.h +++ b/src/modules/example_powertoy/pch.h @@ -1,4 +1,6 @@ #pragma once #define WIN32_LEAN_AND_MEAN #include +#include +#include #include \ No newline at end of file diff --git a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj index 0f8bf3e3ac..44e8d7333c 100644 --- a/src/modules/fancyzones/dll/FancyZonesModule.vcxproj +++ b/src/modules/fancyzones/dll/FancyZonesModule.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {48804216-2A0E-4168-A6D8-9CD068D14227} Win32Proj fancyzones - 10.0 + 10.0.17134.0 fancyzones @@ -37,6 +38,7 @@ + @@ -62,7 +64,6 @@ Disabled true _DEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -84,7 +85,6 @@ true true NDEBUG;FANCYZONES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -132,5 +132,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/modules/fancyzones/dll/packages.config b/src/modules/fancyzones/dll/packages.config index 2e822b86d0..d8eb237bcd 100644 --- a/src/modules/fancyzones/dll/packages.config +++ b/src/modules/fancyzones/dll/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/modules/fancyzones/dll/pch.h b/src/modules/fancyzones/dll/pch.h index 4ec7b87312..8b7ac0aeae 100644 --- a/src/modules/fancyzones/dll/pch.h +++ b/src/modules/fancyzones/dll/pch.h @@ -3,6 +3,8 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include #include +#include +#include #include #include #include diff --git a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj index ee090a28ab..9a8deaaef2 100644 --- a/src/modules/fancyzones/lib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/lib/FancyZonesLib.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} Win32Proj lib - 10.0 + 10.0.17134.0 FancyZonesLib @@ -61,7 +62,6 @@ Disabled true _DEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h stdcpplatest ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -81,7 +81,6 @@ true true NDEBUG;_LIB;%(PreprocessorDefinitions) - true pch.h stdcpplatest ..\;..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -132,11 +131,14 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/modules/fancyzones/lib/packages.config b/src/modules/fancyzones/lib/packages.config index 2e822b86d0..d8eb237bcd 100644 --- a/src/modules/fancyzones/lib/packages.config +++ b/src/modules/fancyzones/lib/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/modules/fancyzones/lib/pch.h b/src/modules/fancyzones/lib/pch.h index 5cbc577ef5..700520d431 100644 --- a/src/modules/fancyzones/lib/pch.h +++ b/src/modules/fancyzones/lib/pch.h @@ -4,6 +4,7 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include #include +#include #include #include #include @@ -13,8 +14,9 @@ #include #include #include -#include +#include #include +#include #pragma comment(lib, "windowsapp") diff --git a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp index 4c12122ac8..0115f35093 100644 --- a/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp @@ -461,12 +461,12 @@ namespace FancyZonesUnitTests TEST_METHOD (CallbackSetConfig) { bool flag = false; - FZCallback callback(&flag); + winrt::com_ptr callback = winrt::make_self(&flag); json::JsonObject json{}; json.SetNamedValue(L"name", json::JsonValue::CreateStringValue(L"name")); - m_settings->SetCallback(&callback); + m_settings->SetCallback(callback.get()); m_settings->SetConfig(json.Stringify().c_str()); Assert::IsTrue(flag); @@ -475,12 +475,12 @@ namespace FancyZonesUnitTests TEST_METHOD (CallbackCallCustomAction) { bool flag = false; - FZCallback callback(&flag); + winrt::com_ptr callback = winrt::make_self(&flag); json::JsonObject action{}; action.SetNamedValue(L"action_name", json::JsonValue::CreateStringValue(L"ToggledFZEditor")); - m_settings->SetCallback(&callback); + m_settings->SetCallback(callback.get()); m_settings->CallCustomAction(action.Stringify().c_str()); Assert::IsTrue(flag); @@ -489,12 +489,12 @@ namespace FancyZonesUnitTests TEST_METHOD (CallbackCallCustomActionNotToggle) { bool flag = false; - FZCallback callback(&flag); + winrt::com_ptr callback = winrt::make_self(&flag); json::JsonObject action{}; action.SetNamedValue(L"action_name", json::JsonValue::CreateStringValue(L"NOT_ToggledFZEditor")); - m_settings->SetCallback(&callback); + m_settings->SetCallback(callback.get()); m_settings->CallCustomAction(action.Stringify().c_str()); Assert::IsFalse(flag); @@ -503,9 +503,9 @@ namespace FancyZonesUnitTests TEST_METHOD (CallbackGetConfig) { bool flag = false; - FZCallback callback(&flag); + winrt::com_ptr callback = winrt::make_self(&flag); - m_settings->SetCallback(&callback); + m_settings->SetCallback(callback.get()); int bufSize = 0; m_settings->GetConfig(L"", &bufSize); @@ -516,9 +516,9 @@ namespace FancyZonesUnitTests TEST_METHOD (CallbackGetSettings) { bool flag = false; - FZCallback callback(&flag); + winrt::com_ptr callback = winrt::make_self(&flag); - m_settings->SetCallback(&callback); + m_settings->SetCallback(callback.get()); m_settings->GetSettings(); Assert::IsFalse(flag); diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj index 864b424d3c..bd4ab6f025 100644 --- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} Win32Proj UnitTests - 10.0 + 10.0.17134.0 NativeUnitTestProject UnitTests-FancyZones @@ -131,11 +132,14 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp b/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp index 96cdf6365b..e0f3ccca09 100644 --- a/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp +++ b/src/modules/fancyzones/tests/UnitTests/ZoneWindow.Spec.cpp @@ -61,8 +61,8 @@ namespace FancyZonesUnitTests HINSTANCE m_hInst{}; HMONITOR m_monitor{}; MONITORINFO m_monitorInfo{}; - MockZoneWindowHost m_zoneWindowHost{}; - IZoneWindowHost* m_hostPtr = m_zoneWindowHost.get_strong().get(); + winrt::com_ptr m_zoneWindowHost = winrt::make_self(); + IZoneWindowHost* m_hostPtr = m_zoneWindowHost.get(); winrt::com_ptr m_zoneWindow; @@ -391,7 +391,7 @@ namespace FancyZonesUnitTests m_fancyZonesData.SetDeviceInfo(m_parentUniqueId.str(), parentDeviceInfo); auto parentZoneWindow = MakeZoneWindow(m_hostPtr, m_hInst, m_monitor, m_parentUniqueId.str(), false, false); - m_zoneWindowHost.m_zoneWindow = parentZoneWindow.get(); + m_zoneWindowHost->m_zoneWindow = parentZoneWindow.get(); // newWorkArea = true - zoneWindow will be cloned from parent auto actualZoneWindow = MakeZoneWindow(m_hostPtr, m_hInst, m_monitor, m_uniqueId.str(), false, true); @@ -420,7 +420,7 @@ namespace FancyZonesUnitTests m_fancyZonesData.SetDeviceInfo(m_parentUniqueId.str(), parentDeviceInfo); auto parentZoneWindow = MakeZoneWindow(m_hostPtr, m_hInst, m_monitor, m_parentUniqueId.str(), false, false); - m_zoneWindowHost.m_zoneWindow = parentZoneWindow.get(); + m_zoneWindowHost->m_zoneWindow = parentZoneWindow.get(); // newWorkArea = false - zoneWindow won't be cloned from parent auto actualZoneWindow = MakeZoneWindow(m_hostPtr, m_hInst, m_monitor, m_uniqueId.str(), false, false); diff --git a/src/modules/fancyzones/tests/UnitTests/packages.config b/src/modules/fancyzones/tests/UnitTests/packages.config index 09cb116327..ce06e0cff6 100644 --- a/src/modules/fancyzones/tests/UnitTests/packages.config +++ b/src/modules/fancyzones/tests/UnitTests/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/modules/fancyzones/tests/UnitTests/pch.h b/src/modules/fancyzones/tests/UnitTests/pch.h index fafb9acece..76b8934733 100644 --- a/src/modules/fancyzones/tests/UnitTests/pch.h +++ b/src/modules/fancyzones/tests/UnitTests/pch.h @@ -9,9 +9,10 @@ // add headers that you want to pre-compile here #include -#include - -#include "lib\pch.h" +#include +#include +#include +#include "lib/pch.h" #include "CppUnitTest.h" #endif //PCH_H diff --git a/src/modules/imageresizer/dll/ContextMenuHandler.cpp b/src/modules/imageresizer/dll/ContextMenuHandler.cpp index b10cdfb91c..b257e62bae 100644 --- a/src/modules/imageresizer/dll/ContextMenuHandler.cpp +++ b/src/modules/imageresizer/dll/ContextMenuHandler.cpp @@ -1,6 +1,6 @@ // ContextMenuHandler.cpp : Implementation of CContextMenuHandler -#include "stdafx.h" +#include "pch.h" #include "ContextMenuHandler.h" #include "HDropIterator.h" #include "Settings.h" diff --git a/src/modules/imageresizer/dll/ContextMenuHandler.h b/src/modules/imageresizer/dll/ContextMenuHandler.h index 975ef17497..256d48a411 100644 --- a/src/modules/imageresizer/dll/ContextMenuHandler.h +++ b/src/modules/imageresizer/dll/ContextMenuHandler.h @@ -2,7 +2,7 @@ #define ID_RESIZE_PICTURES 0 #define RESIZE_PICTURES_VERBW L"resize" -#include "stdafx.h" +#include "pch.h" #include "resource.h" #include "ImageResizerExt_i.h" diff --git a/src/modules/imageresizer/dll/HDropIterator.cpp b/src/modules/imageresizer/dll/HDropIterator.cpp index dad26d2877..bfc23b39ee 100644 --- a/src/modules/imageresizer/dll/HDropIterator.cpp +++ b/src/modules/imageresizer/dll/HDropIterator.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "pch.h" #include "HDropIterator.h" HDropIterator::HDropIterator(IDataObject* pdtobj) diff --git a/src/modules/imageresizer/dll/ImageResizerExt.cpp b/src/modules/imageresizer/dll/ImageResizerExt.cpp index 72ddebe8ca..2999fd4876 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.cpp +++ b/src/modules/imageresizer/dll/ImageResizerExt.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "resource.h" #include "ImageResizerExt_i.h" #include "dllmain.h" diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index eda2904b29..a500b2c7ce 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -20,8 +21,9 @@ {0B43679E-EDFA-4DA0-AD30-F4628B308B1B} - 10.0 + 10.0.17134.0 AtlProj + false @@ -269,7 +271,7 @@ - + Create Create Create @@ -284,7 +286,7 @@ - + @@ -295,6 +297,7 @@ + @@ -309,5 +312,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters index b88c6f562e..dc2723e5b8 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters @@ -19,18 +19,12 @@ - - Source Files - Source Files Source Files - - Generated Files - Source Files @@ -46,11 +40,14 @@ Header Files + + Generated Files + + + Source Files + - - Header Files - Header Files @@ -60,9 +57,6 @@ Header Files - - Generated Files - Header Files @@ -72,6 +66,12 @@ Header Files + + Header Files + + + Header Files + @@ -88,15 +88,16 @@ Resource Files - - - - Source Files - + Resource Files + + + Source Files + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/Settings.cpp b/src/modules/imageresizer/dll/Settings.cpp index f8b446c43d..f3bf74f898 100644 --- a/src/modules/imageresizer/dll/Settings.cpp +++ b/src/modules/imageresizer/dll/Settings.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include #include "Settings.h" diff --git a/src/modules/imageresizer/dll/dllmain.cpp b/src/modules/imageresizer/dll/dllmain.cpp index b6d7adf630..7353ac9ecc 100644 --- a/src/modules/imageresizer/dll/dllmain.cpp +++ b/src/modules/imageresizer/dll/dllmain.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "resource.h" #include "ImageResizerExt_i.h" #include "dllmain.h" diff --git a/src/modules/imageresizer/dll/packages.config b/src/modules/imageresizer/dll/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/imageresizer/dll/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/imageresizer/dll/pch.cpp b/src/modules/imageresizer/dll/pch.cpp new file mode 100644 index 0000000000..a83d3bb2cc --- /dev/null +++ b/src/modules/imageresizer/dll/pch.cpp @@ -0,0 +1,2 @@ +#include "pch.h" +#pragma comment(lib, "windowsapp") \ No newline at end of file diff --git a/src/modules/imageresizer/dll/stdafx.h b/src/modules/imageresizer/dll/pch.h similarity index 83% rename from src/modules/imageresizer/dll/stdafx.h rename to src/modules/imageresizer/dll/pch.h index 5d108dd86e..32d2b50dc3 100644 --- a/src/modules/imageresizer/dll/stdafx.h +++ b/src/modules/imageresizer/dll/pch.h @@ -13,6 +13,8 @@ #include "resource.h" #include +#include +#include #include #include #include diff --git a/src/modules/imageresizer/dll/stdafx.cpp b/src/modules/imageresizer/dll/stdafx.cpp deleted file mode 100644 index a8b5e27d40..0000000000 --- a/src/modules/imageresizer/dll/stdafx.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "stdafx.h" -#pragma comment(lib, "windowsapp") \ No newline at end of file diff --git a/src/modules/imageresizer/dll/trace.cpp b/src/modules/imageresizer/dll/trace.cpp index 8bf2d84280..84171932d0 100644 --- a/src/modules/imageresizer/dll/trace.cpp +++ b/src/modules/imageresizer/dll/trace.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "trace.h" TRACELOGGING_DEFINE_PROVIDER( diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp b/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp index 8ced4e21b7..a3a9468d31 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "resource.h" #include diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj index aebc0a5aee..63c22a9d8d 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {0485F45C-EA7A-4BB5-804B-3E8D14699387} Win32Proj PowerRenameUWPUI - 10.0 + 10.0.17134.0 @@ -45,13 +46,11 @@ false - ..\lib\;..\ui\;..\dll\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration)\modules\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ true - ..\lib\;..\ui\;..\dll\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration)\modules\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ @@ -65,7 +64,7 @@ NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false stdcpplatest - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) MultiThreaded @@ -75,6 +74,9 @@ 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) + @@ -84,24 +86,27 @@ _DEBUG;_WINDOWS;%(PreprocessorDefinitions) false stdcpplatest - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ 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) + - + - + Create Create @@ -123,7 +128,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters index ea6394725d..9914abe928 100644 --- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters +++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters @@ -18,10 +18,10 @@ Header Files - + Header Files - + Header Files @@ -29,10 +29,10 @@ Source Files - + Source Files - + Source Files @@ -46,4 +46,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/powerrename/UWPui/packages.config b/src/modules/powerrename/UWPui/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/UWPui/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/UWPui/pch.cpp b/src/modules/powerrename/UWPui/pch.cpp new file mode 100644 index 0000000000..1d9f38c57d --- /dev/null +++ b/src/modules/powerrename/UWPui/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/src/modules/powerrename/UWPui/stdafx.h b/src/modules/powerrename/UWPui/pch.h similarity index 75% rename from src/modules/powerrename/UWPui/stdafx.h rename to src/modules/powerrename/UWPui/pch.h index ecc0767b50..50c1a6eb8f 100644 --- a/src/modules/powerrename/UWPui/stdafx.h +++ b/src/modules/powerrename/UWPui/pch.h @@ -1,7 +1,6 @@ #pragma once #include "targetver.h" - #include -#include #include +#include "winrt/base.h" \ No newline at end of file diff --git a/src/modules/powerrename/UWPui/stdafx.cpp b/src/modules/powerrename/UWPui/stdafx.cpp deleted file mode 100644 index fd4f341c7b..0000000000 --- a/src/modules/powerrename/UWPui/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/src/modules/powerrename/dll/PowerRenameExt.cpp b/src/modules/powerrename/dll/PowerRenameExt.cpp index 3004a14feb..b1fa1305c4 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.cpp +++ b/src/modules/powerrename/dll/PowerRenameExt.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "PowerRenameExt.h" #include #include diff --git a/src/modules/powerrename/dll/PowerRenameExt.h b/src/modules/powerrename/dll/PowerRenameExt.h index 01906d14ab..ab575ab1d4 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.h +++ b/src/modules/powerrename/dll/PowerRenameExt.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" class __declspec(uuid("0440049F-D1DC-4E46-B27B-98393D79486B")) CPowerRenameMenu : public IShellExtInit, diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index 152bbeba49..1bc1280159 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -22,7 +23,7 @@ 15.0 {B25AC7A5-FB9F-4789-B392-D5C85E948670} PowerRenameExt - 10.0 + 10.0.17134.0 @@ -101,7 +102,6 @@ Level3 Disabled true - true stdcpp17 MultiThreadedDebug ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) @@ -116,7 +116,6 @@ Level3 Disabled true - true stdcpplatest MultiThreadedDebug ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -133,7 +132,6 @@ true true true - true stdcpp17 MultiThreaded ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) @@ -152,7 +150,6 @@ true true true - true stdcpplatest MultiThreaded ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -169,7 +166,7 @@ - + @@ -178,9 +175,10 @@ - + + @@ -196,5 +194,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj.filters b/src/modules/powerrename/dll/PowerRenameExt.vcxproj.filters index d4744b4b1a..a8b06ef642 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj.filters +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj.filters @@ -15,9 +15,6 @@ - - Header Files - Header Files @@ -30,6 +27,9 @@ Header Files + + Header Files + @@ -43,7 +43,7 @@ Source Files - + Source Files @@ -51,5 +51,6 @@ Source Files + \ No newline at end of file diff --git a/src/modules/powerrename/dll/dllmain.cpp b/src/modules/powerrename/dll/dllmain.cpp index 2629137635..da684cc0a4 100644 --- a/src/modules/powerrename/dll/dllmain.cpp +++ b/src/modules/powerrename/dll/dllmain.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "PowerRenameExt.h" #include #include diff --git a/src/modules/powerrename/dll/packages.config b/src/modules/powerrename/dll/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/dll/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/dll/stdafx.cpp b/src/modules/powerrename/dll/pch.cpp similarity index 63% rename from src/modules/powerrename/dll/stdafx.cpp rename to src/modules/powerrename/dll/pch.cpp index 76d63011b5..58894606d4 100644 --- a/src/modules/powerrename/dll/stdafx.cpp +++ b/src/modules/powerrename/dll/pch.cpp @@ -1,2 +1,2 @@ -#include "stdafx.h" +#include "pch.h" #pragma comment(lib, "windowsapp") diff --git a/src/modules/powerrename/dll/stdafx.h b/src/modules/powerrename/dll/pch.h similarity index 78% rename from src/modules/powerrename/dll/stdafx.h rename to src/modules/powerrename/dll/pch.h index 11511d3aa0..f3036a15a2 100644 --- a/src/modules/powerrename/dll/stdafx.h +++ b/src/modules/powerrename/dll/pch.h @@ -4,7 +4,8 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: -#include +#include +#include #include #include #include diff --git a/src/modules/powerrename/lib/Helpers.cpp b/src/modules/powerrename/lib/Helpers.cpp index 0fc92577a5..def7bdd97c 100644 --- a/src/modules/powerrename/lib/Helpers.cpp +++ b/src/modules/powerrename/lib/Helpers.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "Helpers.h" #include diff --git a/src/modules/powerrename/lib/PowerRenameInterfaces.h b/src/modules/powerrename/lib/PowerRenameInterfaces.h index dad2919dc6..b87201cc71 100644 --- a/src/modules/powerrename/lib/PowerRenameInterfaces.h +++ b/src/modules/powerrename/lib/PowerRenameInterfaces.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" enum PowerRenameFlags { diff --git a/src/modules/powerrename/lib/PowerRenameItem.cpp b/src/modules/powerrename/lib/PowerRenameItem.cpp index 83aded4c2b..642baab256 100644 --- a/src/modules/powerrename/lib/PowerRenameItem.cpp +++ b/src/modules/powerrename/lib/PowerRenameItem.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "PowerRenameItem.h" #include "icon_helpers.h" diff --git a/src/modules/powerrename/lib/PowerRenameItem.h b/src/modules/powerrename/lib/PowerRenameItem.h index 27be6a55f3..9fb1874ccb 100644 --- a/src/modules/powerrename/lib/PowerRenameItem.h +++ b/src/modules/powerrename/lib/PowerRenameItem.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" #include "PowerRenameInterfaces.h" #include "srwlock.h" diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index 6bc9faabbd..14415515b9 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -22,7 +23,7 @@ {51920F1F-C28C-4ADF-8660-4238766796C2} Win32Proj PowerRenameLib - 10.0 + 10.0.17134.0 @@ -92,7 +93,7 @@ true stdcpp17 MultiThreadedDebug - stdafx.h + pch.h Windows @@ -107,8 +108,8 @@ true stdcpp17 MultiThreadedDebug - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ - stdafx.h + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + pch.h Windows @@ -126,7 +127,7 @@ true stdcpp17 MultiThreaded - stdafx.h + pch.h Windows @@ -145,8 +146,8 @@ true stdcpp17 MultiThreaded - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ - stdafx.h + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + pch.h Windows @@ -163,7 +164,7 @@ - + @@ -173,7 +174,7 @@ - + Create Create Create @@ -181,7 +182,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/lib/PowerRenameManager.cpp b/src/modules/powerrename/lib/PowerRenameManager.cpp index 046ff3e18a..17b2b186ce 100644 --- a/src/modules/powerrename/lib/PowerRenameManager.cpp +++ b/src/modules/powerrename/lib/PowerRenameManager.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "PowerRenameManager.h" #include "PowerRenameRegEx.h" // Default RegEx handler #include diff --git a/src/modules/powerrename/lib/PowerRenameRegEx.cpp b/src/modules/powerrename/lib/PowerRenameRegEx.cpp index 9da77601e1..3b7b3dee15 100644 --- a/src/modules/powerrename/lib/PowerRenameRegEx.cpp +++ b/src/modules/powerrename/lib/PowerRenameRegEx.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "PowerRenameRegEx.h" #include #include diff --git a/src/modules/powerrename/lib/PowerRenameRegEx.h b/src/modules/powerrename/lib/PowerRenameRegEx.h index a1480bce13..d7a254b246 100644 --- a/src/modules/powerrename/lib/PowerRenameRegEx.h +++ b/src/modules/powerrename/lib/PowerRenameRegEx.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" #include #include #include "srwlock.h" diff --git a/src/modules/powerrename/lib/Settings.cpp b/src/modules/powerrename/lib/Settings.cpp index a7f20dde0c..c2b57187d9 100644 --- a/src/modules/powerrename/lib/Settings.cpp +++ b/src/modules/powerrename/lib/Settings.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "Settings.h" #include "PowerRenameInterfaces.h" #include "settings_helpers.h" diff --git a/src/modules/powerrename/lib/packages.config b/src/modules/powerrename/lib/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/lib/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/lib/pch.cpp b/src/modules/powerrename/lib/pch.cpp new file mode 100644 index 0000000000..ce9b73991b --- /dev/null +++ b/src/modules/powerrename/lib/pch.cpp @@ -0,0 +1,2 @@ +#include "pch.h" + diff --git a/src/modules/powerrename/lib/stdafx.h b/src/modules/powerrename/lib/pch.h similarity index 100% rename from src/modules/powerrename/lib/stdafx.h rename to src/modules/powerrename/lib/pch.h diff --git a/src/modules/powerrename/lib/srwlock.h b/src/modules/powerrename/lib/srwlock.h index 72f2372e30..d0cd8a5f36 100644 --- a/src/modules/powerrename/lib/srwlock.h +++ b/src/modules/powerrename/lib/srwlock.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" // Wrapper around SRWLOCK class CSRWLock diff --git a/src/modules/powerrename/lib/stdafx.cpp b/src/modules/powerrename/lib/stdafx.cpp deleted file mode 100644 index 804d0881d3..0000000000 --- a/src/modules/powerrename/lib/stdafx.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "stdafx.h" - diff --git a/src/modules/powerrename/lib/trace.cpp b/src/modules/powerrename/lib/trace.cpp index da2ad630f4..ff539984f0 100644 --- a/src/modules/powerrename/lib/trace.cpp +++ b/src/modules/powerrename/lib/trace.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "trace.h" #include "Settings.h" diff --git a/src/modules/powerrename/testapp/PowerRenameTest.cpp b/src/modules/powerrename/testapp/PowerRenameTest.cpp index 529eb0c2f4..f635ec47b2 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.cpp +++ b/src/modules/powerrename/testapp/PowerRenameTest.cpp @@ -1,7 +1,7 @@ // PowerRenameTest.cpp : Defines the entry point for the application. // -#include "stdafx.h" +#include "pch.h" #include "PowerRenameTest.h" #include #include diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index 7e9252444c..0554cf971f 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -23,7 +24,7 @@ {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} Win32Proj PowerRenameTest - 10.0 + 10.0.17134.0 @@ -99,7 +100,6 @@ Disabled true WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true stdcpp17 MultiThreadedDebug @@ -116,10 +116,9 @@ Disabled true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true stdcpp17 MultiThreadedDebug - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) Windows @@ -136,7 +135,6 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true stdcpp17 MultiThreaded @@ -157,10 +155,9 @@ true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true stdcpp17 MultiThreaded - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) Windows @@ -174,12 +171,12 @@ - + - + Create Create Create @@ -194,7 +191,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters index c3b11225d1..ef08cb86a3 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj.filters @@ -15,9 +15,6 @@ - - Header Files - Header Files @@ -27,12 +24,15 @@ Header Files + + Header Files + - + Source Files - + Source Files @@ -41,4 +41,7 @@ Resource Files + + + \ No newline at end of file diff --git a/src/modules/powerrename/testapp/packages.config b/src/modules/powerrename/testapp/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/testapp/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/testapp/pch.cpp b/src/modules/powerrename/testapp/pch.cpp new file mode 100644 index 0000000000..1d9f38c57d --- /dev/null +++ b/src/modules/powerrename/testapp/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/src/modules/powerrename/testapp/stdafx.h b/src/modules/powerrename/testapp/pch.h similarity index 100% rename from src/modules/powerrename/testapp/stdafx.h rename to src/modules/powerrename/testapp/pch.h diff --git a/src/modules/powerrename/testapp/stdafx.cpp b/src/modules/powerrename/testapp/stdafx.cpp deleted file mode 100644 index fd4f341c7b..0000000000 --- a/src/modules/powerrename/testapp/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/src/modules/powerrename/ui/PowerRenameUI.cpp b/src/modules/powerrename/ui/PowerRenameUI.cpp index c4bd0b5eaa..6aa9ab3e15 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.cpp +++ b/src/modules/powerrename/ui/PowerRenameUI.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "resource.h" #include "PowerRenameUI.h" #include "dpi_aware.h" diff --git a/src/modules/powerrename/ui/PowerRenameUI.vcxproj b/src/modules/powerrename/ui/PowerRenameUI.vcxproj index 66a20b1312..683d6e499a 100644 --- a/src/modules/powerrename/ui/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/ui/PowerRenameUI.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -14,7 +15,7 @@ {0E072714-D127-460B-AFAD-B4C40B412798} Win32Proj PowerRename - 10.0 + 10.0.17134.0 PowerRenameUI @@ -98,7 +99,7 @@ true stdcpp17 MultiThreadedDebug - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) Windows @@ -136,7 +137,7 @@ true stdcpp17 MultiThreaded - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\ + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\common;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) Windows @@ -154,12 +155,12 @@ - + - + Create Create Create @@ -172,7 +173,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/ui/packages.config b/src/modules/powerrename/ui/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/ui/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/ui/pch.cpp b/src/modules/powerrename/ui/pch.cpp new file mode 100644 index 0000000000..17305716aa --- /dev/null +++ b/src/modules/powerrename/ui/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" \ No newline at end of file diff --git a/src/modules/powerrename/ui/stdafx.h b/src/modules/powerrename/ui/pch.h similarity index 100% rename from src/modules/powerrename/ui/stdafx.h rename to src/modules/powerrename/ui/pch.h diff --git a/src/modules/powerrename/ui/stdafx.cpp b/src/modules/powerrename/ui/stdafx.cpp deleted file mode 100644 index 1577c4e3bc..0000000000 --- a/src/modules/powerrename/ui/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" \ No newline at end of file diff --git a/src/modules/powerrename/unittests/MockPowerRenameItem.cpp b/src/modules/powerrename/unittests/MockPowerRenameItem.cpp index d666e5fcc7..9a338d8fca 100644 --- a/src/modules/powerrename/unittests/MockPowerRenameItem.cpp +++ b/src/modules/powerrename/unittests/MockPowerRenameItem.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "MockPowerRenameItem.h" HRESULT CMockPowerRenameItem::CreateInstance(_In_opt_ PCWSTR path, _In_opt_ PCWSTR originalName, _In_ UINT depth, _In_ bool isFolder, _Outptr_ IPowerRenameItem** ppItem) diff --git a/src/modules/powerrename/unittests/MockPowerRenameItem.h b/src/modules/powerrename/unittests/MockPowerRenameItem.h index 2b41e4321d..9525a4db7d 100644 --- a/src/modules/powerrename/unittests/MockPowerRenameItem.h +++ b/src/modules/powerrename/unittests/MockPowerRenameItem.h @@ -1,5 +1,5 @@ #pragma once -#include "stdafx.h" +#include "pch.h" #include #include "srwlock.h" diff --git a/src/modules/powerrename/unittests/MockPowerRenameManagerEvents.cpp b/src/modules/powerrename/unittests/MockPowerRenameManagerEvents.cpp index d44dff4e6c..db09e2727d 100644 --- a/src/modules/powerrename/unittests/MockPowerRenameManagerEvents.cpp +++ b/src/modules/powerrename/unittests/MockPowerRenameManagerEvents.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "MockPowerRenameManagerEvents.h" // IUnknown diff --git a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp index 273f0a1a27..f76bb4e30b 100644 --- a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp +++ b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "MockPowerRenameRegExEvents.h" IFACEMETHODIMP_(ULONG) diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 795d47a53f..6bb06152dc 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -22,7 +23,7 @@ {2151F984-E006-4A9F-92EF-C6DDE3DC8413} Win32Proj PowerRenameLibUnitTests - 10.0 + 10.0.17134.0 PowerRenameUnitTests @@ -178,7 +179,7 @@ - + @@ -187,7 +188,7 @@ - + Create Create Create @@ -201,7 +202,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/powerrename/unittests/PowerRenameManagerTests.cpp b/src/modules/powerrename/unittests/PowerRenameManagerTests.cpp index d096665382..b981e59865 100644 --- a/src/modules/powerrename/unittests/PowerRenameManagerTests.cpp +++ b/src/modules/powerrename/unittests/PowerRenameManagerTests.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "CppUnitTest.h" #include #include diff --git a/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp b/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp index c1cf77ccb0..32668c9d5e 100644 --- a/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp +++ b/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "CppUnitTest.h" #include #include diff --git a/src/modules/powerrename/unittests/TestFileHelper.cpp b/src/modules/powerrename/unittests/TestFileHelper.cpp index 5d4d9b0e48..6d55ae0659 100644 --- a/src/modules/powerrename/unittests/TestFileHelper.cpp +++ b/src/modules/powerrename/unittests/TestFileHelper.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "pch.h" #include "TestFileHelper.h" #include #include diff --git a/src/modules/powerrename/unittests/packages.config b/src/modules/powerrename/unittests/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/powerrename/unittests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/powerrename/unittests/pch.cpp b/src/modules/powerrename/unittests/pch.cpp new file mode 100644 index 0000000000..1d9f38c57d --- /dev/null +++ b/src/modules/powerrename/unittests/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/src/modules/powerrename/unittests/stdafx.h b/src/modules/powerrename/unittests/pch.h similarity index 100% rename from src/modules/powerrename/unittests/stdafx.h rename to src/modules/powerrename/unittests/pch.h diff --git a/src/modules/powerrename/unittests/stdafx.cpp b/src/modules/powerrename/unittests/stdafx.cpp deleted file mode 100644 index fd4f341c7b..0000000000 --- a/src/modules/powerrename/unittests/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" diff --git a/src/modules/previewpane/powerpreview/packages.config b/src/modules/previewpane/powerpreview/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/previewpane/powerpreview/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/pch.h b/src/modules/previewpane/powerpreview/pch.h index f7efdb5cfe..b3224ba1ab 100644 --- a/src/modules/previewpane/powerpreview/pch.h +++ b/src/modules/previewpane/powerpreview/pch.h @@ -1,5 +1,7 @@ #pragma once #define WIN32_LEAN_AND_MEAN #include +#include +#include #include #include \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index 0a1ba42472..8c41f188b9 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {217DF501-135C-4E38-BFC8-99D4821032EA} Win32Proj examplepowertoy - 10.0 + 10.0.17134.0 powerpreview @@ -61,7 +62,6 @@ Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;..\..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -83,7 +83,6 @@ true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h ..\..\..\common\Telemetry;..\..\..\common;..\..\common\inc;..\common\Telemetry;..\;..\..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -130,9 +129,18 @@ + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters index eff3d1d039..737fddd268 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj.filters @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreviewTest/packages.config b/src/modules/previewpane/powerpreviewTest/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/previewpane/powerpreviewTest/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreviewTest/pch.h b/src/modules/previewpane/powerpreviewTest/pch.h index 85bdb7bd5c..7454b1ec11 100644 --- a/src/modules/previewpane/powerpreviewTest/pch.h +++ b/src/modules/previewpane/powerpreviewTest/pch.h @@ -10,6 +10,8 @@ // add headers that you want to pre-compile here #include #include +#include +#include #include "CppUnitTest.h" #endif //PCH_H diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj index b95e2fe4bc..a573c279c2 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -23,7 +24,7 @@ {47310AB4-9034-4BD1-8D8B-E88AD21A171B} Win32Proj powerpreviewTest - 10.0 + 10.0.17134.0 NativeUnitTestProject @@ -179,7 +180,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters index 4fc696fd53..0ab423a082 100644 --- a/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters +++ b/src/modules/previewpane/powerpreviewTest/powerpreviewTest.vcxproj.filters @@ -27,4 +27,7 @@ Header Files + + + \ No newline at end of file diff --git a/src/modules/shortcut_guide/packages.config b/src/modules/shortcut_guide/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/shortcut_guide/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/shortcut_guide/pch.h b/src/modules/shortcut_guide/pch.h index 5b021e5eb3..63a1318c02 100644 --- a/src/modules/shortcut_guide/pch.h +++ b/src/modules/shortcut_guide/pch.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include #include #include diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj b/src/modules/shortcut_guide/shortcut_guide.vcxproj index 76ce5825e5..8d2be26238 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA} Win32Proj overlaywindow - 10.0 + 10.0.17134.0 @@ -62,7 +63,6 @@ true true NDEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreaded ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -83,7 +83,6 @@ Disabled true _DEBUG;OVERLAYWINDOW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreadedDebug ..\..\common\inc;..\..\common\Telemetry;..\..\;..\;..\..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories) @@ -124,7 +123,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters index 9d9a7c5088..9222c2fe27 100644 --- a/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters +++ b/src/modules/shortcut_guide/shortcut_guide.vcxproj.filters @@ -49,4 +49,7 @@ + + + \ No newline at end of file diff --git a/src/modules/windowwalker/dll/WindowWalker.vcxproj b/src/modules/windowwalker/dll/WindowWalker.vcxproj index 14b4c24ffb..ae3496fa61 100644 --- a/src/modules/windowwalker/dll/WindowWalker.vcxproj +++ b/src/modules/windowwalker/dll/WindowWalker.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {51d3bd1f-07a8-48eb-b2a0-0a249cd4e1a6} Win32Proj WindowWalker - 10.0 + 10.0.17134.0 WindowWalker @@ -61,7 +62,6 @@ Disabled true _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreadedDebug stdcpplatest @@ -81,7 +81,6 @@ true true NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreaded stdcpplatest @@ -122,7 +121,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/modules/windowwalker/dll/packages.config b/src/modules/windowwalker/dll/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/modules/windowwalker/dll/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/modules/windowwalker/dll/pch.h b/src/modules/windowwalker/dll/pch.h index 8ef8e5eed6..32e0a68d31 100644 --- a/src/modules/windowwalker/dll/pch.h +++ b/src/modules/windowwalker/dll/pch.h @@ -1,6 +1,8 @@ #pragma once #define WIN32_LEAN_AND_MEAN #include +#include +#include #include #include #include \ No newline at end of file diff --git a/src/runner/packages.config b/src/runner/packages.config index 09cb116327..ce06e0cff6 100644 --- a/src/runner/packages.config +++ b/src/runner/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/runner/pch.h b/src/runner/pch.h index 07842b0166..98c9c46884 100644 --- a/src/runner/pch.h +++ b/src/runner/pch.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include #include #include diff --git a/src/runner/powertoys_events.h b/src/runner/powertoys_events.h index 4135bfd477..2d5342fa62 100644 --- a/src/runner/powertoys_events.h +++ b/src/runner/powertoys_events.h @@ -3,6 +3,7 @@ #include #include #include +#include class PowertoysEvents { diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj index 264a6f5bd4..f1e2ec82c0 100644 --- a/src/runner/runner.vcxproj +++ b/src/runner/runner.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -14,8 +15,8 @@ 15.0 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27} powertoys - 10.0 runner + 10.0.17134.0 @@ -59,7 +60,6 @@ Level3 Disabled true - true stdcpplatest MultiThreadedDebug Use @@ -84,7 +84,6 @@ true true true - true stdcpplatest MultiThreaded Use @@ -247,11 +246,14 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + \ No newline at end of file diff --git a/src/settings/StreamUriResolverFromFile.h b/src/settings/StreamUriResolverFromFile.h index 03c7ff728e..43426c68bb 100644 --- a/src/settings/StreamUriResolverFromFile.h +++ b/src/settings/StreamUriResolverFromFile.h @@ -4,5 +4,6 @@ struct StreamUriResolverFromFile : winrt::implements { WCHAR base_path[MAX_PATH]; + winrt::Windows::Foundation::IAsyncOperation UriToStreamAsync(const winrt::Windows::Foundation::Uri& uri) const; }; diff --git a/src/settings/main.cpp b/src/settings/main.cpp index 7f24e26b1f..42ddeee52f 100644 --- a/src/settings/main.cpp +++ b/src/settings/main.cpp @@ -39,8 +39,6 @@ HWND g_main_wnd = nullptr; WebViewControl g_webview = nullptr; WebViewControlProcess g_webview_process = nullptr; -StreamUriResolverFromFile local_uri_resolver; - // Windows message for receiving copied data to send to the webview. UINT wm_data_for_webview = 0; @@ -70,12 +68,13 @@ void NavigateToLocalhostReactServer() void NavigateToUri(_In_ LPCWSTR uri_as_string) { + auto uri_resolver = winrt::make_self(); // initialize the base_path for the html content relative to the executable. - WINRT_VERIFY(GetModuleFileName(nullptr, local_uri_resolver.base_path, MAX_PATH)); - WINRT_VERIFY(PathRemoveFileSpec(local_uri_resolver.base_path)); - wcscat_s(local_uri_resolver.base_path, URI_CONTENT_ID); + WINRT_VERIFY(GetModuleFileName(nullptr, uri_resolver->base_path, MAX_PATH)); + WINRT_VERIFY(PathRemoveFileSpec(uri_resolver->base_path)); + wcscat_s(uri_resolver->base_path, URI_CONTENT_ID); Uri url = g_webview.BuildLocalStreamUri(hstring(URI_CONTENT_ID), hstring(uri_as_string)); - g_webview.NavigateToLocalStreamUri(url, local_uri_resolver); + g_webview.NavigateToLocalStreamUri(url, *uri_resolver); } Rect client_rect_to_bounds_rect(_In_ HWND hwnd) diff --git a/src/settings/packages.config b/src/settings/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/src/settings/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/settings/pch.h b/src/settings/pch.h index 735fe1c956..8fbd24f9db 100644 --- a/src/settings/pch.h +++ b/src/settings/pch.h @@ -4,15 +4,18 @@ #pragma push_macro("GetCurrentTime") #undef GetCurrentTime // include winrt headers with fix for "warning C4002: Too many arguments for function-like macro invocation GetCurrentTime" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #pragma pop_macro("GetCurrentTime") #include #include diff --git a/src/settings/settings.vcxproj b/src/settings/settings.vcxproj index b9c55a4d94..f654c9b6c6 100644 --- a/src/settings/settings.vcxproj +++ b/src/settings/settings.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -14,7 +15,7 @@ 15.0 {07C389E3-6BC8-41CF-923E-307B1265FA2D} PowerToysSettingsEditor - 10.0 + 10.0.17134.0 settings @@ -56,7 +57,6 @@ Level3 Disabled true - true stdcpplatest Use pch.h @@ -85,7 +85,6 @@ true true true - true stdcpplatest Use pch.h @@ -137,7 +136,18 @@ {74485049-c722-400f-abe5-86ac52d929b3} + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/settings/settings.vcxproj.filters b/src/settings/settings.vcxproj.filters index 40f02e0184..ef76513ecd 100644 --- a/src/settings/settings.vcxproj.filters +++ b/src/settings/settings.vcxproj.filters @@ -52,4 +52,7 @@ Resource Files + + + \ No newline at end of file diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj index cdb6f2b7fe..9fde29ba69 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj @@ -1,5 +1,6 @@ + Debug @@ -15,7 +16,7 @@ {64A80062-4D8B-4229-8A38-DFA1D7497749} Win32Proj templatenamespace - 10.0 + 10.0.17134.0 ModuleTemplateCompileTest @@ -61,7 +62,6 @@ Disabled true _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreadedDebug stdcpplatest @@ -81,7 +81,6 @@ true true NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true pch.h MultiThreaded stdcpplatest @@ -122,7 +121,18 @@ + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj.filters b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj.filters index 4b1a91f13c..d06043800f 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj.filters +++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj.filters @@ -13,4 +13,7 @@ + + + \ No newline at end of file diff --git a/tools/project_template/ModuleTemplate/packages.config b/tools/project_template/ModuleTemplate/packages.config new file mode 100644 index 0000000000..1447e714af --- /dev/null +++ b/tools/project_template/ModuleTemplate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/tools/project_template/ModuleTemplate/pch.h b/tools/project_template/ModuleTemplate/pch.h index 769a37b377..c981591a05 100644 --- a/tools/project_template/ModuleTemplate/pch.h +++ b/tools/project_template/ModuleTemplate/pch.h @@ -1,5 +1,7 @@ #pragma once #define WIN32_LEAN_AND_MEAN #include +#include +#include #include #include \ No newline at end of file