@@ -94,11 +94,11 @@ public Package(string packagePath,
94
94
_contentItemCollection = new ContentItemCollection ( ) ;
95
95
_contentItemCollection . Load ( packageAssets ) ;
96
96
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 ) ;
100
100
CompileAssets = RefAssets . Any ( ) ? RefAssets : LibAssets ;
101
- RuntimeAssets = _contentItemCollection . FindItems ( _conventions . Patterns . RuntimeAssemblies ) ;
101
+ RuntimeAssets = GetContentItemsFromPattern ( _conventions . Patterns . RuntimeAssemblies ) ;
102
102
RuntimeSpecificAssets = RuntimeAssets . Where ( t => t . Path . StartsWith ( "runtimes" ) ) . ToArray ( ) ;
103
103
Rids = RuntimeSpecificAssets . Select ( t => ( string ) t . Properties [ "rid" ] )
104
104
. Distinct ( )
@@ -108,6 +108,13 @@ public Package(string packagePath,
108
108
. Distinct ( )
109
109
. ToArray ( ) ;
110
110
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
+ }
111
118
}
112
119
113
120
public static void InitializeRuntimeGraph ( string runtimeGraph )
0 commit comments