Exclude files when previously excluded and no wildcards are in play #191
Conversation
hvanbakel
changed the title
|
I actually thought we were logging this but we must've removed that when wildcards were added. |
|
No, it was I who removed that in my IncludeItems refactoring PR, since:
upd: will do review in ~8 hours. |
|
That's fine, I don't think we need to get that back, it's just that I hadn't noticed it being gone. |
| @@ -88,6 +107,11 @@ public void Transform(Project definition) | |||
| logger.LogInformation($"Removed {count} include items thanks to Microsoft.NET.Sdk defaults"); | |||
| } | |||
|
|
|||
| private static IEnumerable<string> PreviouslyExcludedFiles(Project definition, string[] removedIncludes) | |||
| { | |||
| return definition.ProjectFolder.GetFiles("*." + definition.CodeFileExtension, SearchOption.AllDirectories).Select(x => x.FullName.Substring(definition.ProjectFolder.FullName.Length + 1)).Except(removedIncludes); | |||
There was a problem hiding this comment.
That's a long line.
| .Where(x => x.EndsWith("." + definition.CodeFileExtension, StringComparison.OrdinalIgnoreCase)) | ||
| .ToArray(); | ||
|
|
||
| var wildcardIncludes = keepItems.Where(x => x.Name.LocalName == "Compile").Select(x => x.Attribute("Include")?.Value).Where(x => x != null && x.Contains("*")).ToArray(); |
There was a problem hiding this comment.
That's a long line.
| .Where(x => !string.IsNullOrEmpty(x)) | ||
| .ToArray(); | ||
|
|
||
| otherIncludeFilesMatchingWildcard = otherIncludeFilesMatchingWildcard.Union(PreviouslyExcludedFiles(definition, removedIncludes)).ToArray(); |
There was a problem hiding this comment.
That's a long line.
| { | ||
| var removedIncludes = removeQueue | ||
| .Where(x => x.Name.LocalName == "Compile") | ||
| .Select(x => x.Attribute("Update")?.Value) |
There was a problem hiding this comment.
Uhmm, should this be Remove instead of Update?
There was a problem hiding this comment.
Strike that. Although removedIncludes is not a good name now that I think of it, brings ambiguity to this code block. Is referencedItems better?
There was a problem hiding this comment.
I'll apply the rename in my merge
|
@hvanbakel no, bad stuff happened. You reverted what shouldn't be reverted. I'll fix this now. |
|
@hvanbakel I have rewritten git history and dropped merge of wrong branches and following wrong revert (in fact, you've additionally reverted 2 PRs). History is now linear without that mistake. To fix git repo locally: For posterity (or those willing to find out why 3.0.1 tag is on commit that is not in master branch git history as it was) my force push output: |
|
Awesome @andrew-boyarshin this is all still very new to me (fixing branches/wrong merges) so thanks for being the seasoned git person 👍 So from looking at this again, I don't think I should've done the revert to begin with, it was fine, right? |
|
@hvanbakel it was not fine, but was acceptable. Without revert it would preserve all changes though. |
It's not pretty because of the wildcard support we currently have. But if the user is not using a wildcard include then we can generate the appropriate exclusions. Having a wildcard include is probably an exception anyway as it was never really supported in any UI and the current wildcard include is automatic.