Support $(ProjectName).NativeMethods.txt pattern for single-file-app projects #1550
Conversation
| <ItemGroup> | ||
| <CsWin32NativeMethodsTxt Include="%(AdditionalFiles.FullPath)" Condition="'%(FileName)%(Extension)'=='NativeMethods.txt'" /> | ||
| <CsWin32NativeMethodsJson Include="%(AdditionalFiles.FullPath)" Condition="'%(FileName)%(Extension)'=='NativeMethods.json'" /> | ||
| <CsWin32NativeMethodsTxt Include="%(AdditionalFiles.FullPath)" Condition="$([System.String]::new('%(FileName)%(Extension)').EndsWith('NativeMethods.txt'))" /> |
There was a problem hiding this comment.
Are you sure you need this string::new syntax? Doesn't this work? It's much simpler.
| <CsWin32NativeMethodsTxt Include="%(AdditionalFiles.FullPath)" Condition="$([System.String]::new('%(FileName)%(Extension)').EndsWith('NativeMethods.txt'))" /> | |
| <CsWin32NativeMethodsTxt Include="%(AdditionalFiles.FullPath)" Condition="'%(FileName)%(Extension)'.EndsWith('NativeMethods.txt')" /> |
There was a problem hiding this comment.
I could swear this didn't work in MSBuild in certain situations. It does work here so I am able to simplify but are you sure there aren't versions of MSBuild we need to support where this is broken?
There was a problem hiding this comment.
Docs seem to indicate calling string instance methods on property values is fine?
https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=vs-2022#string-property-functions
There was a problem hiding this comment.
Yeah ok, like I thought, the pipeline failed with:
D:\a\1\s\src\Microsoft.Windows.CsWin32\build\Microsoft.Windows.CsWin32.targets(48,70): error MSB4092: An unexpected token "." was found at character position 26 in condition "'%(FileName)%(Extension)'.EndsWith('NativeMethods.txt')". [D:\a\1\s\test\GenerationSandbox.BuildTask.Tests\GenerationSandbox.BuildTask.Tests.csproj::TargetFramework=net9.0-windows10.0.22621.0]
It's weird because it worked locally. I'll go back to the previous version. We've had to do this on item metadata conditions as long as I can remember in MSBuild.
There was a problem hiding this comment.
Rules must be different for item metadata references vs. property functions.
Per suggestion in #1546 , added additional items to pick up $(ProjectName).NativeMethods.txt and .json.
Also updated the SourceGenerator to look for AdditionalFile items that end with NativeMethods.txt and .json, and did the same for the equivalent build task logic to pick up those items.
Added tests in the integration-tests to cover this logic.