-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow Custom CopyToOutputDirectory Location With TargetPath #6237
Changes from 1 commit
aea6d38
1373432
328f029
4b3f3eb
d795b4e
a6c3245
8bc9c3b
266ca4d
4941a4c
12abb96
c874990
663295d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,13 +71,20 @@ public override bool Execute() | |
|
||
for (int i = 0; i < Files.Length; ++i) | ||
{ | ||
string link = Files[i].GetMetadata(ItemMetadataNames.link); | ||
AssignedFiles[i] = new TaskItem(Files[i]); | ||
string targetPath = Files[i].GetMetadata(ItemMetadataNames.targetPath); | ||
|
||
// If file has a link, use that. | ||
string targetPath = link; | ||
// If TargetPath is already set, copy it over. | ||
// https://github.com/dotnet/msbuild/issues/2795 | ||
if (!string.IsNullOrEmpty(targetPath)) | ||
{ | ||
AssignedFiles[i].SetMetadata(ItemMetadataNames.targetPath, EscapingUtilities.Escape(targetPath)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider using some new variable ("targetPathOverride"? "targetPath2"? Choose a good name) to allow users to provide a custom targetPath while maintaining that this task can be called twice without adverse consequences. (Escaping seems necessary as part of what TaskItem requires for all its metadata.) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Going with |
||
continue; | ||
} | ||
|
||
targetPath = Files[i].GetMetadata(ItemMetadataNames.link); | ||
|
||
if (string.IsNullOrEmpty(link)) | ||
if (string.IsNullOrEmpty(targetPath)) | ||
{ | ||
if (// if the file path is relative | ||
!Path.IsPathRooted(Files[i].ItemSpec) && | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Instead of the continue and duplication you could let it fall through. First try TargetPath. If null or empty try Link. If null or empty run that if block. Then set the escaped value and return.