diff --git a/src/ActionRunner/actionRunner.vcxproj b/src/ActionRunner/actionRunner.vcxproj index 5d252ba64b6b..e7adf680e309 100644 --- a/src/ActionRunner/actionRunner.vcxproj +++ b/src/ActionRunner/actionRunner.vcxproj @@ -11,10 +11,7 @@ PowerToys.ActionRunner - - v143 - - + v143 diff --git a/src/Update/PowerToys.Update.vcxproj b/src/Update/PowerToys.Update.vcxproj index d94596054207..3fa6ffac6064 100644 --- a/src/Update/PowerToys.Update.vcxproj +++ b/src/Update/PowerToys.Update.vcxproj @@ -11,10 +11,7 @@ PowerToys.Update - - v143 - - + v143 diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj index 159341698518..668c4ca224f8 100644 --- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj +++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {e94fd11c-0591-456f-899f-efc0ca548336} @@ -21,13 +11,13 @@ FindMyMouse - + DynamicLibrary true v143 Unicode - + DynamicLibrary false v143 @@ -39,24 +29,21 @@ - - - - + - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ PowerToys.FindMyMouse - + + true + + false - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ - PowerToys.FindMyMouse - + Level3 Disabled @@ -72,7 +59,7 @@ $(OutDir)$(TargetName)$(TargetExt) - + Level3 MaxSpeed diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj index ea3b45a3a04d..a21ab1b41ccf 100644 --- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj +++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {782a61be-9d85-4081-b35c-1ccc9dcc1e88} @@ -20,13 +10,13 @@ MouseHighlighter - + DynamicLibrary true v143 Unicode - + DynamicLibrary false v143 @@ -38,24 +28,21 @@ - - - - + - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ PowerToys.MouseHighlighter - + + true + + false - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ - PowerToys.MouseHighlighter - + Level3 Disabled @@ -71,7 +58,7 @@ $(OutDir)$(TargetName)$(TargetExt) - + Level3 MaxSpeed diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj index 6e372e73d3b8..2181503e3d71 100644 --- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj +++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {eae14c0e-7a6b-45da-9080-a7d8c077ba6e} @@ -21,13 +11,13 @@ - + DynamicLibrary true v143 Unicode - + DynamicLibrary false v143 @@ -39,24 +29,21 @@ - - - - + - - true + $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ PowerToys.MousePointerCrosshairs - + + true + + false - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ - PowerToys.MousePointerCrosshairs - + Level3 Disabled @@ -72,7 +59,7 @@ $(OutDir)$(TargetName)$(TargetExt) - + Level3 MaxSpeed diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj index 7eba9b0717a0..d66cff9d93a3 100644 --- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - @@ -23,14 +13,14 @@ ShortcutGuideModuleInterface - + DynamicLibrary true v143 Unicode Spectre - + DynamicLibrary false v143 @@ -43,21 +33,13 @@ - - - - + $(SolutionDir)$(Platform)\$(Configuration)\modules\ShortcutGuide\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\obj\ShortcutGuide\$(ProjectName)\ - - - PowerToys.ShortcutGuideModuleInterface - - PowerToys.ShortcutGuideModuleInterface diff --git a/src/modules/awake/Awake/Awake.csproj b/src/modules/awake/Awake/Awake.csproj index f30f3cd188f1..61f67b43d3b4 100644 --- a/src/modules/awake/Awake/Awake.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -3,9 +3,10 @@ WinExe net6.0-windows10.0.18362.0 + win-x64;win-arm64 $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake enable - x64 + x64;ARM64 false false true @@ -23,20 +24,18 @@ $(Platform) - + DEBUG;TRACE full - x64 prompt 4 false - + TRACE;RELEASE true pdbonly - x64 prompt 4 diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj index 97a4b459e9b3..54457d46aa3e 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj @@ -2,16 +2,7 @@ - - - Debug - x64 - - - Release - x64 - - + @@ -38,7 +29,7 @@ - + _DEBUG;%(PreprocessorDefinitions) Disabled @@ -49,7 +40,7 @@ true - + NDEBUG;%(PreprocessorDefinitions) MaxSpeed @@ -81,11 +72,11 @@ Spectre - + true true - + false true false @@ -95,24 +86,21 @@ - - - - + - - true + PowerToys.$(MSBuildProjectName) $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - + + true + + false - PowerToys.$(MSBuildProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - + Level3 true @@ -126,7 +114,7 @@ shcore.lib;shlwapi.lib;DbgHelp.lib;uxtheme.lib;dwmapi.lib;%(AdditionalDependencies) - + Level3 true @@ -148,8 +136,7 @@ - Create - Create + Create diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj index 903bd5538fbb..5161817d7272 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj @@ -14,11 +14,6 @@ StaticLibrary - - - v143 - - v143 @@ -26,10 +21,7 @@ - - - - + @@ -85,30 +77,25 @@ - ../pch.h - ../pch.h + ../pch.h - ../pch.h - ../pch.h + ../pch.h - ../pch.h - ../pch.h + ../pch.h - ../pch.h - ../pch.h + ../pch.h - ../pch.h - ../pch.h + ../pch.h diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj index 65ed40ab0a73..07a1c9878b17 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj +++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj @@ -12,10 +12,7 @@ DynamicLibrary - - v143 - - + v143 @@ -25,20 +22,12 @@ - - - - + $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ - - - PowerToys.FancyZonesModuleInterface - - PowerToys.FancyZonesModuleInterface diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj index 49d3cbbd0100..15b99f179337 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj @@ -15,10 +15,7 @@ DynamicLibrary false - - v143 - - + v143 @@ -26,10 +23,7 @@ - - - - + diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index 3ce7f877b8e0..59c151054140 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -14,10 +14,7 @@ DynamicLibrary Static - - v143 - - + v143 @@ -25,7 +22,8 @@ - + + true $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj index 53d1533392a9..c90a7a08942f 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj @@ -2,16 +2,6 @@ - - - Debug - x64 - - - Release - x64 - - 81010002 @@ -41,7 +31,7 @@ - + _DEBUG;%(PreprocessorDefinitions) Disabled @@ -52,7 +42,7 @@ true - + NDEBUG;%(PreprocessorDefinitions) MaxSpeed @@ -88,11 +78,11 @@ PowerToys.$(MSBuildProjectName) - + true true - + false true false @@ -103,14 +93,11 @@ - - - - + - + ./;$(SolutionDir)src\modules\;$(SolutionDir)src\modules\KeyboardManager\KeyboardManagerEditorLibrary\;$(SolutionDir)src\common\Display;$(SolutionDir)src\common\inc;$(SolutionDir)src\common\Telemetry;$(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -119,7 +106,7 @@ $(SolutionDir)$(Platform)\$(ConfigurationName);%(AdditionalLibraryDirectories) - + ./;$(SolutionDir)src\modules\;$(SolutionDir)src\modules\KeyboardManager\KeyboardManagerEditorLibrary\;$(SolutionDir)src\common\Display;$(SolutionDir)src\common\inc;$(SolutionDir)src\common\Telemetry;$(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -140,8 +127,7 @@ - Create - Create + Create diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj index 1a98d0340edb..28b973f8a834 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj @@ -15,10 +15,7 @@ StaticLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - - v143 - - + v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj index 2af4604c296c..c45325605485 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj @@ -14,10 +14,7 @@ DynamicLibrary - - v143 - - + v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj index 17ca6b98e569..a74346987149 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj @@ -18,10 +18,7 @@ Application - - v143 - - + v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj index 5b2d5382ab24..082d6ee718ef 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj @@ -15,10 +15,7 @@ StaticLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - - v143 - - + v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj index b1826200b9d5..494fb8ececf9 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj @@ -15,10 +15,7 @@ DynamicLibrary - - v143 - - + v143 diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj index 10b8209b585a..43e3d16338c4 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj +++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj @@ -1,99 +1,91 @@ - - - - - 16.0 - {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} - KeyboardManagerCommon - true - 10.0.18362.0 - - - - StaticLibrary - - - v143 - - - v143 - - - - - - - - - - - - - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ - true - - - - _CONSOLE;%(PreprocessorDefinitions) - ..\;..\..\..\;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) - 4002 - %(AdditionalOptions) /Zm200 - - - shlwapi.lib;%(AdditionalDependencies) - - - Console - - - - - - - - - Create - - - - - - - - - - - - - - - - - - {7319089e-46d6-4400-bc65-e39bdf1416ee} - - - {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} - - - {6955446d-23f7-4023-9bb3-8657f904af99} - - - - - - - - - - - - - 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}. - - - - + + + + + 16.0 + {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} + KeyboardManagerCommon + true + 10.0.18362.0 + + + + StaticLibrary + v143 + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + true + + + + _CONSOLE;%(PreprocessorDefinitions) + ..\;..\..\..\;..\..\..\common\telemetry;..\..\;%(AdditionalIncludeDirectories) + 4002 + %(AdditionalOptions) /Zm200 + + + shlwapi.lib;%(AdditionalDependencies) + + + Console + + + + + + + + + Create + + + + + + + + + + + + + + + + + + {7319089e-46d6-4400-bc65-e39bdf1416ee} + + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + {6955446d-23f7-4023-9bb3-8657f904af99} + + + + + + + + + + + + + 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/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index df150e491498..fb59fb85a95c 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -1,102 +1,91 @@ - - - - - 15.0 - {89f34af7-1c34-4a72-aa6e-534bcf972bd9} - Win32Proj - KeyboardManager - true - 10.0.18362.0 - KeyboardManager - - - - DynamicLibrary - - - v143 - - - v143 - - - - - - - - - - - - - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - true - - - PowerToys.KeyboardManager - - - PowerToys.KeyboardManager - - - - $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) - EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - 4002 - - - $(OutDir)$(TargetName)$(TargetExt) - Shcore.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - Create - - - - - {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} - - - {6955446d-23f7-4023-9bb3-8657f904af99} - - - {8affa899-0b73-49ec-8c50-0fadda57b2fc} - - - - - - - - - - - - - - - - - - - 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}. - - - - + + + + + 15.0 + {89f34af7-1c34-4a72-aa6e-534bcf972bd9} + Win32Proj + KeyboardManager + true + 10.0.18362.0 + KeyboardManager + + + + DynamicLibrary + + + v143 + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ + true + PowerToys.KeyboardManager + + + + $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories) + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + 4002 + + + $(OutDir)$(TargetName)$(TargetExt) + Shcore.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + Create + + + + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + {6955446d-23f7-4023-9bb3-8657f904af99} + + + {8affa899-0b73-49ec-8c50-0fadda57b2fc} + + + + + + + + + + + + + + + + + + + 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/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 2a3a3f8e66c9..2e215c3f0909 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -17,10 +17,7 @@ DynamicLibrary $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ - - v143 - - + v143 diff --git a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj index 38ce4413b707..0fb341f0776d 100644 --- a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj +++ b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.vcxproj @@ -3,16 +3,6 @@ - - - Debug - x64 - - - Release - x64 - - 81010002 @@ -25,14 +15,14 @@ $(WindowsTargetPlatformVersion) - + Application true v143 Unicode false - + Application false v143 @@ -45,26 +35,26 @@ - + - + - + true $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ PowerToys.PowerRename - + false $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ PowerToys.PowerRename - + Level3 true @@ -80,7 +70,7 @@ PerMonitorHighDPIAware - + Level3 true @@ -111,8 +101,7 @@ - Create - Create + Create @@ -138,8 +127,8 @@ - - + + @@ -153,8 +142,8 @@ - - + + PowerRenameUILib diff --git a/src/modules/powerrename/PowerRenameUIHost/packages.config b/src/modules/powerrename/PowerRenameUIHost/packages.config index cb4fc6898e71..9f777c0e9d6d 100644 --- a/src/modules/powerrename/PowerRenameUIHost/packages.config +++ b/src/modules/powerrename/PowerRenameUIHost/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj index 7374ad57afbf..beb0867e295e 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj @@ -26,16 +26,7 @@ true - - - Debug - x64 - - - Release - x64 - - + DynamicLibrary v143 @@ -62,18 +53,11 @@ - - - - + - - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ - PowerToys.PowerRenameUILib - - + $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ PowerToys.PowerRenameUILib @@ -95,13 +79,13 @@ _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + MultiThreadedDebugDLL NDEBUG;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreadedDLL true diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index f75888727640..395bdba0a711 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -1,93 +1,90 @@ - - - - - - - - 15.0 - {B25AC7A5-FB9F-4789-B392-D5C85E948670} - PowerRenameExt - 10.0.18362.0 - - - - DynamicLibrary - PowerToys.PowerRenameExt - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - - - v143 - - - v143 - - - - - ..\lib\;..\ui\;..\;..\..\..\;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - - - Pathcch.lib;comctl32.lib;shcore.lib;%(AdditionalDependencies) - PowerRenameExt.def - gdi32.dll;shell32.dll;ole32.dll;shlwapi.dll;oleaut32.dll;%(DelayLoadDLLs) - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - {caba8dfb-823b-4bf2-93ac-3f31984150d9} - - - {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} - - - {98537082-0fdb-40de-abd8-0dc5a4269bab} - - - {51920f1f-c28c-4adf-8660-4238766796c2} - - - - - - - - - - - - - - - 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}. - - - - - - + + + + + + + + 15.0 + {B25AC7A5-FB9F-4789-B392-D5C85E948670} + PowerRenameExt + 10.0.18362.0 + + + + DynamicLibrary + PowerToys.PowerRenameExt + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + + + v143 + + + + + ..\lib\;..\ui\;..\;..\..\..\;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + + + Pathcch.lib;comctl32.lib;shcore.lib;%(AdditionalDependencies) + PowerRenameExt.def + gdi32.dll;shell32.dll;ole32.dll;shlwapi.dll;oleaut32.dll;%(DelayLoadDLLs) + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + {caba8dfb-823b-4bf2-93ac-3f31984150d9} + + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + {98537082-0fdb-40de-abd8-0dc5a4269bab} + + + {51920f1f-c28c-4adf-8660-4238766796c2} + + + + + + + + + + + + + + + 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/packages.config b/src/modules/powerrename/dll/packages.config index f93921797a45..f9c3d5cfbb36 100644 --- a/src/modules/powerrename/dll/packages.config +++ b/src/modules/powerrename/dll/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index 519c368c07e3..dbcaeac2f8d9 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -1,102 +1,88 @@ - - - - - {51920F1F-C28C-4ADF-8660-4238766796C2} - Win32Proj - PowerRenameLib - - - - StaticLibrary - - - v143 - - - v143 - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - - - - Level4 - WIN32;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - {6955446d-23f7-4023-9bb3-8657f904af99} - - - {98537082-0fdb-40de-abd8-0dc5a4269bab} - - - - - - - - - - - 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}. - - - - - - + + + + + {51920F1F-C28C-4ADF-8660-4238766796C2} + Win32Proj + PowerRenameLib + + + + StaticLibrary + v143 + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + + + + Level4 + WIN32;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + {6955446d-23f7-4023-9bb3-8657f904af99} + + + {98537082-0fdb-40de-abd8-0dc5a4269bab} + + + + + + + + + + + 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/packages.config b/src/modules/powerrename/lib/packages.config index f93921797a45..f9c3d5cfbb36 100644 --- a/src/modules/powerrename/lib/packages.config +++ b/src/modules/powerrename/lib/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index e488429d7e2e..9f95f9dd3bfa 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -1,94 +1,82 @@ - - - - - 15.0 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} - Win32Proj - PowerRenameTest - - - - Application - - - v143 - - - v143 - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ - - - - $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) - WIN32;_WINDOWS;%(PreprocessorDefinitions) - - - $(OutDir)PowerRenameLib.lib;Pathcch.lib;comctl32.lib;shlwapi.lib;shcore.lib;%(AdditionalDependencies) - - - - - - - - - - - - Create - - - - - - - - {caba8dfb-823b-4bf2-93ac-3f31984150d9} - - - {6955446d-23f7-4023-9bb3-8657f904af99} - - - {98537082-0fdb-40de-abd8-0dc5a4269bab} - - - - - - - - - - - - - - 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}. - - - - - - + + + + + 15.0 + {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} + Win32Proj + PowerRenameTest + + + + Application + + + v143 + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + + + + $(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir) + WIN32;_WINDOWS;%(PreprocessorDefinitions) + + + $(OutDir)PowerRenameLib.lib;Pathcch.lib;comctl32.lib;shlwapi.lib;shcore.lib;%(AdditionalDependencies) + + + + + + + + + + + + Create + + + + + + + + {caba8dfb-823b-4bf2-93ac-3f31984150d9} + + + {6955446d-23f7-4023-9bb3-8657f904af99} + + + {98537082-0fdb-40de-abd8-0dc5a4269bab} + + + + + + + + + + + + + + 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/packages.config b/src/modules/powerrename/testapp/packages.config index f93921797a45..f9c3d5cfbb36 100644 --- a/src/modules/powerrename/testapp/packages.config +++ b/src/modules/powerrename/testapp/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 8a8395c051ca..854e3574ecab 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -8,10 +8,7 @@ PowerRenameUnitTests - - v143 - - + v143 @@ -22,16 +19,7 @@ - - - - - - - - - - + @@ -87,8 +75,8 @@ - - + + @@ -96,7 +84,7 @@ - - + + \ No newline at end of file diff --git a/src/modules/powerrename/unittests/packages.config b/src/modules/powerrename/unittests/packages.config index f93921797a45..f9c3d5cfbb36 100644 --- a/src/modules/powerrename/unittests/packages.config +++ b/src/modules/powerrename/unittests/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index b3701a0dbd9b..6b48da4e16e3 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -1,6 +1,5 @@  - x64 true PowerToys.GcodePreviewHandler PowerToys GcodePreviewHandler diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 2b96bf483f5d..837a884a8a2a 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 true {809AA252-E17A-4FA2-B0A1-0450976B763F} Microsoft.PowerToys.ThumbnailHandler.Gcode diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index 752e1ccb7d09..6b767dd9cff8 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -1,6 +1,5 @@  - x64 true PowerToys.MarkdownPreviewHandler PowerToys MarkdownPreviewHandler diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index 9c4261c9e7c0..ac64e42b0199 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -1,6 +1,5 @@ - x64 PowerToys.MonacoPreviewHandler PowerToys MonacoPreviewHandler PowerToys MonacoPreviewHandler @@ -20,7 +19,7 @@ PowerToys.MonacoPreviewHandler - + ;NU1605 4 1701;1702 diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 7911c9abd78d..caf4310210ff 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -1,6 +1,5 @@  - x64 true PowerToys.PdfPreviewHandler PowerToys PdfPreviewHandler diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index 8f508691c1b6..16717a7f1c90 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -1,6 +1,5 @@ - x64 true {11491FD8-F921-48BF-880C-7FEA185B80A1} Microsoft.PowerToys.ThumbnailHandler.Pdf diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index 8c0d4c9a3c1d..6e3dfcd90d22 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 true {F7C8C0F1-5431-4347-89D0-8E5354F93CF2} Microsoft.PowerToys.ThumbnailHandler.Stl diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index 31d6b64d4c09..b0dd95a260aa 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -1,64 +1,63 @@ - - - x64 - true - PowerToys.SvgPreviewHandler - PowerToys SvgPreviewHandler - PowerToys SvgPreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml - false - false - true - - - - {DA425894-6E13-404F-8DCB-78584EC0557A} - Microsoft.PowerToys.PreviewHandler.Svg - net6.0-windows - true - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - PowerToys.SvgPreviewHandler - - - - - - - - True - True - Resource.resx - - - - - - - - - - - - StyleCop.json - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - - - - - - ResXFileCodeGenerator - Resource.Designer.cs - - - + + + true + PowerToys.SvgPreviewHandler + PowerToys SvgPreviewHandler + PowerToys SvgPreviewHandler + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml + false + false + true + + + + {DA425894-6E13-404F-8DCB-78584EC0557A} + Microsoft.PowerToys.PreviewHandler.Svg + net6.0-windows + true + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ + PowerToys.SvgPreviewHandler + + + + + + + + True + True + Resource.resx + + + + + + + + + + + + StyleCop.json + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + + + + + + ResXFileCodeGenerator + Resource.Designer.cs + + + diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index dc483ac47fc3..64978d94a409 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -1,6 +1,5 @@ - x64 true {8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD} Microsoft.PowerToys.ThumbnailHandler.Svg diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index 5651fe1cb25c..8db07fcffae0 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-GcodePreviewHandler PowerToys UnitTests-GcodePreviewHandler UnitTests-GcodePreviewHandler diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index f20ef0dca9f1..8b34308ac50c 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-GcodeThumbnailProvider PowerToys UnitTests-GcodeThumbnailProvider UnitTests-GcodeThumbnailProvider diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index 6f6e40a49217..eaf482ebd417 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -1,63 +1,62 @@ - - - x64 - UnitTests-MarkdownPreviewHandler - PowerToys UnitTests-MarkdownPreviewHandler - UnitTests-MarkdownPreviewHandler - PowerToys UnitTests-MarkdownPreviewHandler - - - - {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} - PreviewPaneUnitTests - PreviewPaneUnitTests - net6.0-windows10.0.18362.0 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - StyleCop.json - - - - - all - - + + + UnitTests-MarkdownPreviewHandler + PowerToys UnitTests-MarkdownPreviewHandler + UnitTests-MarkdownPreviewHandler + PowerToys UnitTests-MarkdownPreviewHandler + + + + {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} + PreviewPaneUnitTests + PreviewPaneUnitTests + net6.0-windows10.0.18362.0 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + StyleCop.json + + + + + all + + \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index 8415c6238a84..5945ada57366 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-PdfPreviewHandler PowerToys UnitTests-PdfPreviewHandler UnitTests-PdfPreviewHandler diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index 6d0ace5beea8..5f137f839899 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-PdfThumbnailProvider PowerToys UnitTests-PdfThumbnailProvider UnitTests-PdfThumbnailProvider diff --git a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj index 1dc20c8ed967..abf426e93ce0 100644 --- a/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/UnitTests-PreviewHandlerCommon/UnitTests-PreviewHandlerCommon.csproj @@ -1,52 +1,51 @@ - - - x64 - UnitTests-PreviewHandlerCommon - PowerToys UnitTests-PreviewHandlerCommon - UnitTests-PreviewHandlerCommon - PowerToys UnitTests-PreviewHandlerCommon - - - - {748417CA-F17E-487F-9411-CAFB6D3F4877} - PreviewHandlerCommonUnitTests - net6.0-windows - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - - - - - - - - - - StyleCop.json - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - - - - - - - - - + + + UnitTests-PreviewHandlerCommon + PowerToys UnitTests-PreviewHandlerCommon + UnitTests-PreviewHandlerCommon + PowerToys UnitTests-PreviewHandlerCommon + + + + {748417CA-F17E-487F-9411-CAFB6D3F4877} + PreviewHandlerCommonUnitTests + net6.0-windows + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + + + + + + + + + + + StyleCop.json + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + + + + + + + + + \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index 75eea354ffcc..ea004397a703 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-StlThumbnailProvider PowerToys UnitTests-StlThumbnailProvider UnitTests-StlThumbnailProvider diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index bc30debd2b97..ce3294ba8848 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -1,51 +1,50 @@ - - - x64 - UnitTests-SvgPreviewHandler - PowerToys UnitTests-SvgPreviewHandler - UnitTests-SvgPreviewHandler - PowerToys UnitTests-SvgPreviewHandler - - - - {060D75DA-2D1C-48E6-A4A1-6F0718B64661} - SvgPreviewHandlerUnitTests - net6.0-windows - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - StyleCop.json - - - - - all - - + + + UnitTests-SvgPreviewHandler + PowerToys UnitTests-SvgPreviewHandler + UnitTests-SvgPreviewHandler + PowerToys UnitTests-SvgPreviewHandler + + + + {060D75DA-2D1C-48E6-A4A1-6F0718B64661} + SvgPreviewHandlerUnitTests + net6.0-windows + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + StyleCop.json + + + + + all + + \ No newline at end of file diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 1e7199015de4..f8de561e5988 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -1,6 +1,5 @@  - x64 UnitTests-SvgThumbnailProvider PowerToys UnitTests-SvgThumbnailProvider UnitTests-SvgThumbnailProvider diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index e6966dccf02c..2aba0a84a710 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -1,47 +1,46 @@ - - - x64 - true - PowerToys.PreviewHandlerCommon - PowerToys PreviewHandlerCommon - PowerToys PreviewHandlerCommon - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - false - false - true - - - - {AF2349B8-E5B6-4004-9502-687C1C7730B1} - net6.0-windows - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ - PowerToys.PreviewHandlerCommon - - - - - - - - - - - - - StyleCop.json - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - - - + + + true + PowerToys.PreviewHandlerCommon + PowerToys PreviewHandlerCommon + PowerToys PreviewHandlerCommon + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + false + false + true + + + + {AF2349B8-E5B6-4004-9502-687C1C7730B1} + net6.0-windows + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ + PowerToys.PreviewHandlerCommon + + + + + + + + + + + + + StyleCop.json + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + + + \ No newline at end of file diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index c43c21f646ca..6f8eb53aa2b7 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -1,114 +1,108 @@ - - - - - - - - - 15.0 - {217DF501-135C-4E38-BFC8-99D4821032EA} - Win32Proj - examplepowertoy - powerpreview - - - - DynamicLibrary - - - v143 - - - v143 - - - - - - - - - - - - - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - - - PowerToys.powerpreview - - - PowerToys.powerpreview - - - - _WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - powerpreview.def - - - - - - - - - - - - - - Create - - - - - - - - - - - - {7319089e-46d6-4400-bc65-e39bdf1416ee} - - - {caba8dfb-823b-4bf2-93ac-3f31984150d9} - - - {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} - - - {1d5be09d-78c0-4fd7-af00-ae7c1af7c525} - - - {6955446d-23f7-4023-9bb3-8657f904af99} - - - - - - - - - - - - - - - - - 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}. - - - - - + + + + + + + + + 15.0 + {217DF501-135C-4E38-BFC8-99D4821032EA} + Win32Proj + examplepowertoy + powerpreview + + + + DynamicLibrary + + + v143 + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + + + PowerToys.powerpreview + + + PowerToys.powerpreview + + + + _WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\;..\..\..\common;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + + + $(OutDir)$(TargetName)$(TargetExt) + powerpreview.def + + + + + + + + + + + + + + Create + + + + + + + + + + + + {7319089e-46d6-4400-bc65-e39bdf1416ee} + + + {caba8dfb-823b-4bf2-93ac-3f31984150d9} + + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + {1d5be09d-78c0-4fd7-af00-ae7c1af7c525} + + + {6955446d-23f7-4023-9bb3-8657f904af99} + + + + + + + + + + + + + + + + + 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/videoconference/VideoConferenceModule/Video Conference.vcxproj b/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj index ab9562f8c641..98159a30e42a 100644 --- a/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj +++ b/src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj @@ -1,16 +1,7 @@ - - - Debug - x64 - - - Release - x64 - - + 15.0 {5ABA70DE-3A3F-41F6-A1F5-D1F74F54F9BB} @@ -20,14 +11,14 @@ VideoConferenceModule - + DynamicLibrary true v143 Unicode Spectre - + DynamicLibrary false v143 @@ -41,26 +32,23 @@ - - - - + - + false $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ PowerToys.VideoConferenceModule - + true $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ PowerToys.VideoConferenceModule - + Use Level3 @@ -87,7 +75,7 @@ xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" - + Use Level3 @@ -124,8 +112,8 @@ xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" - Create - Create + Create + Create diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj index 3a6178ea33d1..6c8fdc3c20a1 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj +++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Debug + ARM64 + Release Win32 @@ -17,6 +21,10 @@ Release x64 + + Release + ARM64 + 16.0 @@ -34,13 +42,13 @@ v143 - + v143 v143 - + v143 @@ -72,13 +80,13 @@ true - + call "$(ProjectDir)build_vcm_x86.cmd" $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ - PowerToys.VideoConferenceProxyFilter_x64 + PowerToys.VideoConferenceProxyFilter_$(Platform) ..\..\..\..\x86\$(Configuration)\modules\VideoConference\ @@ -103,7 +111,7 @@ module.def - _WIN64;_UNICODE;UNICODE;%(PreprocessorDefinitions) + _WIN64;_UNICODE;UNICODE;%(PreprocessorDefinitions) diff --git a/src/modules/videoconference/VideoConferenceShared/SerializedSharedMemory.cpp b/src/modules/videoconference/VideoConferenceShared/SerializedSharedMemory.cpp index 541db26057a6..1a95310e8075 100644 --- a/src/modules/videoconference/VideoConferenceShared/SerializedSharedMemory.cpp +++ b/src/modules/videoconference/VideoConferenceShared/SerializedSharedMemory.cpp @@ -1,5 +1,7 @@ #include "SerializedSharedMemory.h" - +#ifdef _M_ARM64 +#define _mm_pause() __yield(); +#endif inline char* SerializedSharedMemory::lock_flag_addr() noexcept { return reinterpret_cast(_memory._data + _memory._size); diff --git a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj index 461d6996197c..3ac4a63d6b56 100644 --- a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj +++ b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj @@ -10,6 +10,10 @@ Debug x64 + + Debug + ARM64 + Release Win32 @@ -18,6 +22,10 @@ Release x64 + + Release + ARM64 + diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj index db8e01a96fa0..952413636136 100644 --- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj +++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj @@ -9,10 +9,7 @@ BugReportTool - - v143 - - + v143 @@ -20,10 +17,10 @@ $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ $(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\ - + PowerToys.$(ProjectName) - + PowerToys.$(ProjectName) diff --git a/tools/CleanUp_tool/CleanUp_tool.vcxproj b/tools/CleanUp_tool/CleanUp_tool.vcxproj index f155e44c43c9..5166ffcb9379 100644 --- a/tools/CleanUp_tool/CleanUp_tool.vcxproj +++ b/tools/CleanUp_tool/CleanUp_tool.vcxproj @@ -1,15 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - + 16.0 Win32Proj @@ -18,13 +9,13 @@ 10.0 - + Application true v143 Unicode - + Application false v143 @@ -36,20 +27,17 @@ - - - - + - + true - + false - + Level3 true @@ -62,7 +50,7 @@ shlwapi.lib;%(AdditionalDependencies) - + Level3 true diff --git a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj index 117445298a38..5fd9dd3166db 100644 --- a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj +++ b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj @@ -39,13 +39,13 @@ true Unicode - + Application true v143 Unicode - + Application false v143 @@ -57,16 +57,7 @@ - - - - - - - - - - + @@ -76,10 +67,10 @@ false - + true - + false @@ -110,7 +101,7 @@ true - + Level3 true @@ -122,7 +113,7 @@ true - + Level3 true diff --git a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj index bb7fd40526d3..737c70d64f7f 100644 --- a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj +++ b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj @@ -38,13 +38,13 @@ true MultiByte - + Application true v143 MultiByte - + Application false v143 @@ -56,16 +56,7 @@ - - - - - - - - - - + @@ -82,7 +73,7 @@ Console - + Level3 Disabled @@ -110,7 +101,7 @@ true - + Level3 MaxSpeed diff --git a/tools/WebcamReportTool/WebcamReportTool.vcxproj b/tools/WebcamReportTool/WebcamReportTool.vcxproj index 1b5354d9dfba..bbb3dfdb6645 100644 --- a/tools/WebcamReportTool/WebcamReportTool.vcxproj +++ b/tools/WebcamReportTool/WebcamReportTool.vcxproj @@ -2,10 +2,7 @@ - - v143 - - + v143 @@ -21,21 +18,18 @@ - - - - + - + true PowerToys.WebcamReportTool .exe include;$(IncludePath) lib;$(LibraryPath) - + false PowerToys.WebcamReportTool .exe diff --git a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj index c1e9451c828b..ad65447efc2c 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj @@ -1,15 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - + 15.0 {64A80062-4D8B-4229-8A38-DFA1D7497749} @@ -19,13 +10,13 @@ ModuleTemplate - + DynamicLibrary true v143 Unicode - + DynamicLibrary false v143 @@ -37,22 +28,19 @@ - - - - + - + true $(SolutionDir)$(Platform)\$(Configuration)\modules\ - + false $(SolutionDir)$(Platform)\$(Configuration)\modules\ - + Level3 Disabled @@ -68,7 +56,7 @@ $(OutDir)$(TargetName)$(TargetExt) - + Level3 MaxSpeed diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj index 20e52475e804..4c88fae9c1c2 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj @@ -1,16 +1,7 @@ - - - Debug - x64 - - - Release - x64 - - + 15.0 {64A80062-4D8B-4229-8A38-DFA1D7497749} @@ -20,14 +11,14 @@ ModuleTemplateCompileTest - + DynamicLibrary true v143 Unicode Spectre - + DynamicLibrary false v143 @@ -40,24 +31,21 @@ - - - - + - + true $(SolutionDir)$(Platform)\$(Configuration)\modules\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - + false $(SolutionDir)$(Platform)\$(Configuration)\modules\ $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - + Use Level3 @@ -74,7 +62,7 @@ $(OutDir)$(TargetName)$(TargetExt) - + Use Level3 @@ -108,10 +96,8 @@ - Create - Create - pch.h - pch.h + Create + pch.h