-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Stop escaped compiler args from being mangled by MSBuild #76888
base: main
Are you sure you want to change the base?
Conversation
The TaskItem implementation from MSBuild treats the ItemSpec as file path and tries to normalize the path separators. When running on non-windows machines this means changing '\' to '/'. However this breaks how double quotes are escaped in the compiler args. By using our own implemetation of TaskItem we can use the compiler args as the ItemSpec without any modification. Resolves #72014
@@ -159,7 +159,7 @@ protected static ITaskItem[] GenerateCommandLineArgsTaskItems(List<string> comma | |||
var items = new ITaskItem[commandLineArgs.Count]; | |||
for (var i = 0; i < commandLineArgs.Count; i++) | |||
{ | |||
items[i] = new TaskItem(commandLineArgs[i]); | |||
items[i] = new ArgsTaskItem(commandLineArgs[i]); |
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.
This will change from us unconditionally escaping to unconditionally not escaping. Won't this regress scenarios where escaping is making builds work today? Consider for example that /keyfile:
is passed via commandLineArgs
. If that was using \
today it would be /
on unix but after this change it woudl still be \
correct?
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.
oof. Luckily many args such as Analyzers, References, Source all come from TaskItems of their own which apply the path correction. So I need to look at args which come from properties and may contain file paths.
{ | ||
get | ||
{ | ||
var clone = new List<string>(_metadata.Keys); |
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.
var clone = new List<string>(_metadata.Keys); | |
var clone = new List<string>(capacity: MetadataCount); | |
clone.AddRange(_metadata.Keys); |
Avoid unnecessary allocations.
} | ||
} | ||
|
||
// Implementation notes that we should include the built-in metadata names as well as our custom ones. |
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.
Which implementation notes this?
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.
Will add links.
|
||
namespace Microsoft.CodeAnalysis.BuildTasks | ||
{ | ||
internal sealed class ArgsTaskItem : ITaskItem |
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.
Can we add a comment summarizing that we're using this to avoid unnecessary path escaping?
destinationMetadataNames.Add((string)name); | ||
} | ||
|
||
foreach (var metadataName in _metadata.Keys) |
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.
Why are we only using _metadata.Keys
here and not MetadataNames
? Seems like it's only copying our custom metadata not the full set.
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.
In my reading of the interface comments. There seems to be a distinction made between "built-in" and "custom" metadata. The "built-in" metadata seems to be related to the ItemSpec which this method is not supposed to update.
} | ||
} | ||
|
||
public string GetMetadata(string metadataName) |
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.
@rainersigwald, @baronfel can you help me understand the contract of ITaskItem
a bit better? One part of this impl, and others I've seen, is that they have this pattern of exporting a set of names via MetadataNames
that will throw when you pass them to GetMetadata
. My mind sees that as a dictionary like type exporting a key but then throwing when you ask for the value. Why does ITaskItem
behave this way?
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.
Do you have a specific instance we could look at? From what we can see TaskItem MetadataNames + GetMetadata should be safe for all of the returned names, which include explicit Item Metadata as well as the historically-significant set of metadata that all Items have (because all items are files, don'tchanknow).
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.
Maybe I misinterpreted the comments on the interface and the implementation here. MetadataNames
includes the "built-in" metadata which I wasn't sure would actually be in my custom metadata dictionary.
The TaskItem implementation from MSBuild treats the ItemSpec as file path and tries to normalize the path separators. When running on non-windows machines this means changing '\' to '/'. However this breaks how double quotes are escaped in the compiler args. By using our own implementation of TaskItem we can use the compiler args as the ItemSpec without any modification.
Resolves #72014