Skip to content

Commit 2907e6d

Browse files
committed
Fix wildcard handling in NCode.ProjectSettings.Scaffold.targets
1 parent c8db8c4 commit 2907e6d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

NCode.ProjectSettings.Scaffold/build/NCode.ProjectSettings.Scaffold.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
is special gets copied using the destination's solution file name
1111
-->
1212

13-
<_NCodeFiles Include="$(_NCodeSolutionFilesDir)\*" Condition="'$(NCodeSolutionDir)'!=''">
14-
<TargetPath>$([System.IO.Path]::Combine($(NCodeSolutionDir), $([System.IO.Path]::GetFileName(%(_NCodeFiles.FullPath)))))</TargetPath>
13+
<_NCodeFiles Include="$(_NCodeSolutionFilesDir)\**\*" Condition="'$(NCodeSolutionDir)'!=''">
14+
<TargetPath>$([System.IO.Path]::Combine($(NCodeSolutionDir), %(RecursiveDir), %(Filename)%(Extension)))</TargetPath>
1515
</_NCodeFiles>
1616

1717
<_NCodeFiles Include="$([MSBuild]::GetPathOfFileAbove('NCode.ProjectSettings.Scaffold.sln.DotSettings'))" Condition="'$(NCodeSolutionPath)'!=''">
1818
<TargetPath>$(NCodeSolutionPath).DotSettings</TargetPath>
1919
</_NCodeFiles>
2020

21-
<_NCodeFiles Include="$(_NCodeProjectFilesDir)\*" Condition="'$(MSBuildProjectDirectory)'!=''">
22-
<TargetPath>$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $([System.IO.Path]::GetFileName(%(_NCodeFiles.FullPath)))))</TargetPath>
21+
<_NCodeFiles Include="$(_NCodeProjectFilesDir)\**\*" Condition="'$(MSBuildProjectDirectory)'!=''">
22+
<TargetPath>$([System.IO.Path]::Combine($(MSBuildProjectDirectory), %(RecursiveDir), %(Filename)%(Extension)))</TargetPath>
2323
</_NCodeFiles>
2424
</ItemGroup>
2525

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ Contains common settings, scripts, and files to scaffold C# projects for NCodeGr
2626
* v1.0.13 - Moving CI build from appveyor to github actions
2727
* v1.0.14 - LF line endings and copilot settings
2828
* v1.0.15 - Fix nuspec wildcard handling
29+
* v1.0.16 - Fix targets wildcard handling

0 commit comments

Comments
 (0)