Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ public static IEnumerable<object[]> InsertMetadataElementAfterSiblingsTestData
}

[Theory]
[MemberData(nameof(InsertMetadataElementAfterSiblingsTestData))]
[MemberData(nameof(InsertMetadataElementAfterSiblingsTestData), DisableDiscoveryEnumeration = true)]
public void InsertMetadataElementAfterSiblings(AddMetadata addMetadata, int position, string expectedItem)
{
Action<ProjectItemElement, ProjectMetadataElement, ProjectMetadataElement> act = (i, c, r) => { i.InsertAfterChild(c, r); };
Expand Down Expand Up @@ -911,7 +911,7 @@ public static IEnumerable<object[]> InsertMetadataElementBeforeSiblingsTestData
}

[Theory]
[MemberData(nameof(InsertMetadataElementBeforeSiblingsTestData))]
[MemberData(nameof(InsertMetadataElementBeforeSiblingsTestData), DisableDiscoveryEnumeration = true)]
public void InsertMetadataElementBeforeSiblings(AddMetadata addMetadata, int position, string expectedItem)
{
Action<ProjectItemElement, ProjectMetadataElement, ProjectMetadataElement> act = (i, c, r) => { i.InsertBeforeChild(c, r); };
Expand Down
22 changes: 11 additions & 11 deletions src/Build.OM.UnitTests/Definition/DefinitionEditing_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1151,8 +1151,8 @@ public void RenameItem_StillMatchesWildcard()
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void RenameThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { i.Rename("foo"); });
Expand Down Expand Up @@ -1284,8 +1284,8 @@ public void ChangeItemTypeOnItemNeedingSplitting()
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void ChangeItemTypeThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { i.ItemType = "foo"; });
Expand Down Expand Up @@ -1446,16 +1446,16 @@ public void RemoveItem_IncludingFromIgnoringConditionList()
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void RemoveItemThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { p.RemoveItem(i); });
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void RemoveItemsThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { p.RemoveItems(new[] { i }); });
Expand Down Expand Up @@ -1654,7 +1654,7 @@ public void RemoveMetadataAfterItemRemoved()
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void RemoveMetadataThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { i.RemoveMetadata("bar"); }, "bar");
Expand Down Expand Up @@ -1743,8 +1743,8 @@ public void SetMetadatumAfterRemoved3()
}

[Theory]
[MemberData(nameof(ItemElementsThatRequireSplitting))]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting))]
[MemberData(nameof(ItemElementsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
[MemberData(nameof(ItemElementsWithGlobsThatRequireSplitting), DisableDiscoveryEnumeration = true)]
public void SetMetadataThrowsWhenItemElementSplittingIsDisabled(string projectContents, int itemIndex, SetupProject setupProject)
{
AssertDisabledItemSplitting(projectContents, itemIndex, setupProject, (p, i) => { i.SetMetadataValue("foo", "bar"); });
Expand Down
2 changes: 1 addition & 1 deletion src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3625,7 +3625,7 @@ public static IEnumerable<Object[]> UpdateAndRemoveShouldWorkWithEscapedCharacte
}

[Theory]
[MemberData(nameof(UpdateAndRemoveShouldWorkWithEscapedCharactersTestData))]
[MemberData(nameof(UpdateAndRemoveShouldWorkWithEscapedCharactersTestData), DisableDiscoveryEnumeration = true)]
public void UpdateAndRemoveShouldWorkWithEscapedCharacters(string projectContents, string include, string update, string remove, string[] expectedInclude, Dictionary<string, string>[] expectedMetadata)
{
var formattedProjectContents = string.Format(projectContents, include, update, remove);
Expand Down
4 changes: 2 additions & 2 deletions src/Build.OM.UnitTests/Definition/Project_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@ public static IEnumerable<Object[]> GetItemProvenanceByProjectItemTestData
}

[Theory]
[MemberData(nameof(GetItemProvenanceByProjectItemTestData))]
[MemberData(nameof(GetItemProvenanceByProjectItemTestData), DisableDiscoveryEnumeration = true)]
public void GetItemProvenanceByProjectItem(string items, string itemValue, int itemPosition, ProvenanceResultTupleList expected)
{
var formattedProject = string.Format(ProjectWithItemGroup, items);
Expand Down Expand Up @@ -3486,7 +3486,7 @@ public static IEnumerable<object[]> GetItemProvenanceShouldWorkWithEscapedCharac
}
}
[Theory]
[MemberData(nameof(GetItemProvenanceShouldWorkWithEscapedCharactersTestData))]
[MemberData(nameof(GetItemProvenanceShouldWorkWithEscapedCharactersTestData), DisableDiscoveryEnumeration = true)]
public void GetItemProvenanceShouldWorkWithEscapedCharacters(string project, string provenanceArgument, ProvenanceResultTupleList expectedProvenance)
{
AssertProvenanceResult(expectedProvenance, project, provenanceArgument);
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/Graph/GraphLoadedFromSolution_tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ public static IEnumerable<object[]> SolutionOnlyDependenciesData
}

[Theory]
[MemberData(nameof(SolutionOnlyDependenciesData))]
[MemberData(nameof(SolutionOnlyDependenciesData), DisableDiscoveryEnumeration = true)]
public void SolutionsCanInjectEdgesIntoTheProjectGraph(Dictionary<int, int[]> edges, (int, int)[] solutionDependencies, bool hasCycle, bool solutionEdgesOverlapGraphEdges)
{
// Use the same global properties as the solution would use so all ConfigurationMetadata objects would match on global properties.
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/Graph/IsolateProjects_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ public static IEnumerable<object[]> UndeclaredReferenceEnforcementShouldNormaliz
}

[Theory]
[MemberData(nameof(UndeclaredReferenceEnforcementShouldNormalizeFilePathsTestData))]
[MemberData(nameof(UndeclaredReferenceEnforcementShouldNormalizeFilePathsTestData), DisableDiscoveryEnumeration = true)]
public void UndeclaredReferenceEnforcementShouldNormalizeFilePaths(Func<string, string> projectReferenceModifier, Func<string, string> msbuildProjectModifier, string targetName)
{
AssertBuild(new[] { targetName },
Expand Down
10 changes: 5 additions & 5 deletions src/Build.UnitTests/Graph/ProjectGraph_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1804,7 +1804,7 @@ public static IEnumerable<object[]> Graphs
}

[Theory]
[MemberData(nameof(Graphs))]
[MemberData(nameof(Graphs), DisableDiscoveryEnumeration = true)]
public void TopologicalSortShouldTopologicallySort(Dictionary<int, int[]> edges)
{
using (var env = TestEnvironment.Create())
Expand All @@ -1827,7 +1827,7 @@ public void TopologicalSortShouldTopologicallySort(Dictionary<int, int[]> edges)
}

[Theory]
[MemberData(nameof(Graphs))]
[MemberData(nameof(Graphs), DisableDiscoveryEnumeration = true)]
public void DotNotationShouldRepresentGraph(Dictionary<int, int[]> edges)
{
var graph = Helpers.CreateProjectGraph(
Expand Down Expand Up @@ -2320,7 +2320,7 @@ public static IEnumerable<object[]> AllNodesShouldHaveGraphBuildGlobalPropertyDa
}

[Theory]
[MemberData(nameof(AllNodesShouldHaveGraphBuildGlobalPropertyData))]
[MemberData(nameof(AllNodesShouldHaveGraphBuildGlobalPropertyData), DisableDiscoveryEnumeration = true)]
public void AllNodesShouldHaveGraphBuildGlobalProperty(Dictionary<int, int[]> edges, int[] entryPoints, Dictionary<string, string> globalProperties)
{
using (var env = TestEnvironment.Create())
Expand Down Expand Up @@ -2354,7 +2354,7 @@ public void UserValuesForIsGraphBuildGlobalPropertyShouldBePreserved()
}

[Theory]
[MemberData(nameof(Graphs))]
[MemberData(nameof(Graphs), DisableDiscoveryEnumeration = true)]
public void GraphShouldSupportTransitiveReferences(Dictionary<int, int[]> edges)
{
var graph = Helpers.CreateProjectGraph(
Expand Down Expand Up @@ -2479,7 +2479,7 @@ public static IEnumerable<object[]> TransitiveReferencesAreDefinedPerProjectTest
}

[Theory]
[MemberData(nameof(TransitiveReferencesAreDefinedPerProjectTestData))]
[MemberData(nameof(TransitiveReferencesAreDefinedPerProjectTestData), DisableDiscoveryEnumeration = true)]
public void TransitiveReferencesAreDefinedPerProject(
Dictionary<int, int[]> edges,
Dictionary<int, string> extraContentPerProjectNumber,
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/Graph/ResultCacheBasedBuilds_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public static IEnumerable<object[]> BuildGraphData
}

[Theory]
[MemberData(nameof(BuildGraphData))]
[MemberData(nameof(BuildGraphData), DisableDiscoveryEnumeration = true)]
public void BuildProjectGraphUsingCaches(Dictionary<int, int[]> edges)
{
var topoSortedNodes =
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/UnitTests/FileMatcher_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void DoNotFollowRecursiveSymlinks()
#endif

[Theory]
[MemberData(nameof(GetFilesComplexGlobbingMatchingInfo.GetTestData), MemberType = typeof(GetFilesComplexGlobbingMatchingInfo))]
[MemberData(nameof(GetFilesComplexGlobbingMatchingInfo.GetTestData), MemberType = typeof(GetFilesComplexGlobbingMatchingInfo), DisableDiscoveryEnumeration = true)]
public void GetFilesComplexGlobbingMatching(GetFilesComplexGlobbingMatchingInfo info)
{
TransientTestFolder testFolder = _env.CreateFolder();
Expand Down