Skip to content

Commit 4ff7444

Browse files
authored
Replace obsolete nuget api in Microsoft.DotNet.PackageValidation (#42508)
1 parent 971e7aa commit 4ff7444

File tree

1 file changed

+11
-4
lines changed
  • src/Compatibility/ApiCompat/Microsoft.DotNet.PackageValidation

1 file changed

+11
-4
lines changed

src/Compatibility/ApiCompat/Microsoft.DotNet.PackageValidation/Package.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ public Package(string packagePath,
9494
_contentItemCollection = new ContentItemCollection();
9595
_contentItemCollection.Load(packageAssets);
9696

97-
PackageAssets = _contentItemCollection.FindItems(_conventions.Patterns.AnyTargettedFile);
98-
RefAssets = _contentItemCollection.FindItems(_conventions.Patterns.CompileRefAssemblies);
99-
LibAssets = _contentItemCollection.FindItems(_conventions.Patterns.CompileLibAssemblies);
97+
PackageAssets = GetContentItemsFromPattern(_conventions.Patterns.AnyTargettedFile);
98+
RefAssets = GetContentItemsFromPattern(_conventions.Patterns.CompileRefAssemblies);
99+
LibAssets = GetContentItemsFromPattern(_conventions.Patterns.CompileLibAssemblies);
100100
CompileAssets = RefAssets.Any() ? RefAssets : LibAssets;
101-
RuntimeAssets = _contentItemCollection.FindItems(_conventions.Patterns.RuntimeAssemblies);
101+
RuntimeAssets = GetContentItemsFromPattern(_conventions.Patterns.RuntimeAssemblies);
102102
RuntimeSpecificAssets = RuntimeAssets.Where(t => t.Path.StartsWith("runtimes")).ToArray();
103103
Rids = RuntimeSpecificAssets.Select(t => (string)t.Properties["rid"])
104104
.Distinct()
@@ -108,6 +108,13 @@ public Package(string packagePath,
108108
.Distinct()
109109
.ToArray();
110110
AssemblyReferences = assemblyReferences;
111+
112+
IEnumerable<ContentItem> GetContentItemsFromPattern(PatternSet pattern)
113+
{
114+
List<ContentItemGroup> itemGroups = new();
115+
_contentItemCollection.PopulateItemGroups(pattern, itemGroups);
116+
return itemGroups.SelectMany(i => i.Items).ToArray();
117+
}
111118
}
112119

113120
public static void InitializeRuntimeGraph(string runtimeGraph)

0 commit comments

Comments
 (0)