From 7d8af7bbbb65cf76a693b6d8c2eeee6aa838e454 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Thu, 18 Jul 2024 15:48:46 +0200 Subject: [PATCH] [Build]Remove wildcards items in vcxproj (#33862) ## Summary of the Pull Request Fix the solution warnings related to wildcards items in vcxproj. ## Detailed Description of the Pull Request / Additional comments https://learn.microsoft.com/cpp/build/reference/vcxproj-files-and-wildcards#list-all-items-explicitly Since wildcards where used for assets that doesn't change frequently I have added `ReplaceWildcardsInProjectItems` for CPP projects. This will make VS automatically expand wildcards. --- Cpp.Build.props | 1 + PowerToys.sln | 1 + .../FileLocksmithContextMenu.vcxproj | 25 +++++++++- .../FileLocksmithContextMenu.vcxproj.filters | 24 +++++++++ .../ShortcutGuide/ShortcutGuide.vcxproj | 50 ++++++++++++++++++- .../ImageResizerContextMenu.vcxproj | 25 +++++++++- .../PowerRenameContextMenu.vcxproj | 25 +++++++++- 7 files changed, 147 insertions(+), 4 deletions(-) diff --git a/Cpp.Build.props b/Cpp.Build.props index bd5f42910b..4f920f036f 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -33,6 +33,7 @@ x64 arm64 false + true $(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath) diff --git a/PowerToys.sln b/PowerToys.sln index 6446f5c14d..7da94ee5eb 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -171,6 +171,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject src\.editorconfig = src\.editorconfig .vsconfig = .vsconfig + Cpp.Build.props = Cpp.Build.props Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props diff --git a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj index 46af84bd14..e7a97bde41 100644 --- a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj +++ b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj @@ -98,7 +98,30 @@ MakeAppx.exe pack /d . /p $(OutDir)FileLocksmithContextMenuPackage.msix /nv - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj.filters b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj.filters index 4e95cc85ee..3c0d4c87d8 100644 --- a/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj.filters +++ b/src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj.filters @@ -37,6 +37,30 @@ Resource Files + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + diff --git a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj index 508620c3f0..68ef97516d 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj @@ -95,7 +95,55 @@ - + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + + Document + $(OutDir)\Assets\ShortcutGuide + + Document $(OutDir)\Assets\ShortcutGuide diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj index 4631dadaf9..913e885fa5 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj +++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj @@ -99,7 +99,30 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj index dc55cbab6f..fb10229279 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj +++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj @@ -103,7 +103,30 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest +