Skip to content

Optimization neglected to include condition #5927

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
Forgind merged 2 commits into from
Dec 3, 2020
Merged

Optimization neglected to include condition #5927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ebab07
Optimization neglected to include condition
Forgind Dec 2, 2020
247318e
Test Remove optimization still respects condition
Forgind Dec 2, 2020
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
11 changes: 11 additions & 0 deletions src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2774,6 +2774,17 @@ public void UpdateShouldImportMetadataFromReferencedItem()
ObjectModelHelpers.AssertItemHasMetadata(expectedMetadataC, items[4]);
}

[Fact]
public void OptimizedRemoveOperationRespectsCondition()
{
string content = @"<TheItem Include=""InitialValue"" />
<TheItem Remove=""@(TheItem)"" Condition=""false"" />
<TheItem Include=""ReplacedValue"" Condition=""false"" /> ";
IList<ProjectItem> items = ObjectModelHelpers.GetItemsFromFragment(content, true);

items[0].EvaluatedInclude.ShouldBe("InitialValue");
}

[Theory]
[InlineData(true)]
[InlineData(false)]
Expand Down
2 changes: 1 addition & 1 deletion src/Build/Evaluation/LazyItemEvaluator.RemoveOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected override void ApplyImpl(ImmutableList<ItemData>.Builder listBuilder, I
new BuildEventFileInfo(string.Empty),
"OM_MatchOnMetadataIsRestrictedToOnlyOneReferencedItem");

if (_matchOnMetadata.IsEmpty && ItemspecContainsASingleBareItemReference(_itemSpec, _itemElement.ItemType))
if (_matchOnMetadata.IsEmpty && ItemspecContainsASingleBareItemReference(_itemSpec, _itemElement.ItemType) && _conditionResult)
{
// Perf optimization: If the Remove operation references itself (e.g. <I Remove="@(I)"/>)
// then all items are removed and matching is not necessary
Expand Down