mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:12:32 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[Build]Remove wildcards items in vcxproj (#33862)

Browse Source 
## 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.
This commit is contained in:
Davide Giacometti 2024-07-18 15:48:46 +02:00 committed by GitHub
parent 7808033436
commit 7d8af7bbbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 147 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cpp.Build.props
View File

@ -33,6 +33,7 @@
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
<PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture> <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
<VcpkgEnabled>false</VcpkgEnabled> <VcpkgEnabled>false</VcpkgEnabled>
<ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
<ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath> <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
<!-- Enable control flow guard for C++ projects that don't consume any C++ files --> <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
<!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. --> <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->

1
PowerToys.sln
View File

@ -171,6 +171,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
src\.editorconfig = src\.editorconfig src\.editorconfig = src\.editorconfig
.vsconfig = .vsconfig .vsconfig = .vsconfig
Cpp.Build.props = Cpp.Build.props
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props Directory.Packages.props = Directory.Packages.props

25
src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj
View File

@ -98,7 +98,30 @@ MakeAppx.exe pack /d . /p $(OutDir)FileLocksmithContextMenuPackage.msix /nv</Com
<None Include="Resources.resx" /> <None Include="Resources.resx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Assets\FileLocksmith\**" CopyToOutputDirectory="PreserveNewest" /> <None Include="Assets\FileLocksmith\FileLocksmith.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\LargeTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\SmallTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\SplashScreen.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\Square150x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\Square44x44Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\storelogo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\FileLocksmith\Wide310x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj"> <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">

24
src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj.filters
View File

@ -37,6 +37,30 @@
<None Include="Resources.resx"> <None Include="Resources.resx">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="Assets\FileLocksmith\FileLocksmith.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\LargeTile.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\SmallTile.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\SplashScreen.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\Square44x44Logo.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\Square150x150Logo.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\storelogo.png">
<Filter>Resource Files</Filter>
</None>
<None Include="Assets\FileLocksmith\Wide310x150Logo.png">
<Filter>Resource Files</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="FileLocksmithContextMenu.base.rc"> <ResourceCompile Include="FileLocksmithContextMenu.base.rc">

50
src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
View File

@ -95,7 +95,55 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="PropertySheet.props" /> <None Include="PropertySheet.props" />
<CopyFileToFolders Include="Assets\ShortcutGuide\**"> <CopyFileToFolders Include="Assets\ShortcutGuide\0.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\1.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\2.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\3.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\4.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\5.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\6.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\7.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\8.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\9.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\no_active_window.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay.svg">
<FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay_portrait.svg">
<FileType>Document</FileType> <FileType>Document</FileType>
<DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders> <DestinationFolders>$(OutDir)\Assets\ShortcutGuide</DestinationFolders>
</CopyFileToFolders> </CopyFileToFolders>

25
src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
View File

@ -99,7 +99,30 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv</Comm
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Assets\ImageResizer\**" CopyToOutputDirectory="PreserveNewest" /> <None Include="Assets\ImageResizer\ImageResizer.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\LargeTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\SmallTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\SplashScreen.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\Square150x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\Square44x44Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\storelogo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\ImageResizer\Wide310x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\common\logger\logger.vcxproj"> <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">

25
src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
View File

@ -103,7 +103,30 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv</Comma
<None Include="PowerRenameContextMenu.base.rc" /> <None Include="PowerRenameContextMenu.base.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Assets\PowerRename\**" CopyToOutputDirectory="PreserveNewest" /> <None Include="Assets\PowerRename\LargeTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\PowerRenameUI.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\SmallTile.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\SplashScreen.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\Square150x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\Square44x44Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\storelogo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Assets\PowerRename\Wide310x150Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\common\logger\logger.vcxproj"> <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">