Skip to content

Streamline BuildGlobResultFromIncludeItem #12178

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.

Sign up for GitHub

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

Merged
SimaTian merged 4 commits into from
Sep 26, 2025
Merged

Streamline BuildGlobResultFromIncludeItem #12178

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9a57fc
Streamline BuildGlobResultFromIncludeItem
Erarndt Jul 15, 2025
2680204
Merge branch 'main' of https://github.com/dotnet/msbuild into dev/era…
Erarndt Aug 18, 2025
c2efa94
Fix typo
Erarndt Aug 18, 2025
704980b
Make immutable again
Erarndt Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/Build/Definition/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2624,14 +2624,28 @@ private GlobResult BuildGlobResultFromIncludeItem(ProjectItemElement itemElement
{
var includeItemspec = new EvaluationItemSpec(itemElement.Include, _data.Expander, itemElement.IncludeLocation, itemElement.ContainingProject.DirectoryPath);

ItemSpecFragment[] includeGlobFragments = includeItemspec.Fragments.Where(f => f is GlobFragment && f.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0).ToArray();
if (includeGlobFragments.Length == 0)
List<ItemSpecFragment> includeGlobFragmentsList = null;
foreach (ItemSpecFragment fragment in includeItemspec.Fragments)
{
if (fragment is GlobFragment && fragment.TextFragment.AsSpan().IndexOfAny(s_invalidGlobChars) < 0)
{
includeGlobFragmentsList ??= new List<ItemSpecFragment>(includeItemspec.Fragments.Count);
includeGlobFragmentsList.Add(fragment);
}
}

if (includeGlobFragmentsList == null || includeGlobFragmentsList.Count == 0)
{
return null;
}

ImmutableArray<string> includeGlobStrings = includeGlobFragments.Select(f => f.TextFragment).ToImmutableArray();
var includeGlob = CompositeGlob.Create(includeGlobFragments.Select(f => f.ToMSBuildGlob()));
string[] includeGlobStrings = new string[includeGlobFragmentsList.Count];
for (int i = 0; i < includeGlobStrings.Length; ++i)
{
includeGlobStrings[i] = includeGlobFragmentsList[i].TextFragment;
}

var includeGlob = CompositeGlob.Create(includeGlobFragmentsList.Select(f => f.ToMSBuildGlob()));

IEnumerable<string> excludeFragmentStrings = [];
IMSBuildGlob excludeGlob = null;
Expand All @@ -2655,7 +2669,7 @@ private GlobResult BuildGlobResultFromIncludeItem(ProjectItemElement itemElement

var includeGlobWithGaps = CreateIncludeGlobWithGaps(includeGlob, excludeGlob, removeGlob);

return new GlobResult(itemElement, includeGlobStrings, includeGlobWithGaps, excludeFragmentStrings, removeFragmentStrings);
return new GlobResult(itemElement, includeGlobStrings.ToImmutableArray(), includeGlobWithGaps, excludeFragmentStrings, removeFragmentStrings);
}

private static IMSBuildGlob CreateIncludeGlobWithGaps(IMSBuildGlob includeGlob, IMSBuildGlob excludeGlob, IMSBuildGlob removeGlob)
Expand Down