Skip to content

Fix item update evaluation when path contains parenthesis and add test coverage #11293

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
YuliiaKovalova merged 3 commits into from
Jan 31, 2025
+36 −1
Merged

Fix item update evaluation when path contains parenthesis and add test coverage #11293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3db4fb1
fix item evaluation and add test coverage
YuliiaKovalova Jan 16, 2025
3ca3940
remove extra try/catch
YuliiaKovalova Jan 17, 2025
6317da8
remove interpolation in the test
YuliiaKovalova Jan 26, 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
35 changes: 35 additions & 0 deletions src/Build.UnitTests/Evaluation/Evaluator_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,41 @@ public void VerifyLoadingImportScenarios(string importParameter, bool shouldSucc
}
}

[Theory]
[InlineData("(test")]
[InlineData("@@@test")]
[InlineData(@")(!!test")]
public void VerifyItemsUpdateIsHandledForAnyProjectPath(string projectPathCandidate)
{
using (TestEnvironment env = TestEnvironment.Create())
{
TransientTestFolder projDirectory = env.CreateFolder(Path.Combine(env.CreateNewTempPath().TempPath, projectPathCandidate), createFolder: true);
TransientTestFile projectFile = env.CreateFile(projDirectory, "project.proj", @"
<Project>
Comment thread
YuliiaKovalova marked this conversation as resolved.

<ItemGroup>
<ItemCheck Include=""Test"" />
</ItemGroup>

<ItemGroup>
<ItemCheck Update=""Test""
NewTestLabels=""Dummy"" />
</ItemGroup>

<Target Name=""MyTarget"">
<Message Text=""ItemCheck updated metadata value: @(ItemCheck->Metadata('NewTestLabels'))"" />
</Target>
</Project>
");
Project project = new(projectFile.Path);
MockLogger logger = new();
var result = project.Build(logger);

result.ShouldBeTrue();
project.AllEvaluatedItems.Where(ei => ei.ItemType == "ItemCheck" && ei.Metadata.Any(m => m.EvaluatedValue == "Dummy")).ShouldNotBeEmpty();
}
}

// Some of these are also tested elsewhere, but this consolidates related tests in one spot.
public static IEnumerable<object[]> ImportLoadingScenarioTestData
{
Expand Down
2 changes: 1 addition & 1 deletion src/Build/Evaluation/LazyItemEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private static OrderedItemDataCollection.Builder ComputeItems(LazyItemList lazyI
break;
}

string fullPath = FileUtilities.GetFullPath(frag.TextFragment, frag.ProjectDirectory);
string fullPath = FileUtilities.NormalizePathForComparisonNoThrow(frag.TextFragment, frag.ProjectDirectory);
Comment thread
YuliiaKovalova marked this conversation as resolved.
if (itemsWithNoWildcards.ContainsKey(fullPath))
{
// Another update will already happen on this path. Make that happen before evaluating this one.
Expand Down