@@ -168,31 +168,33 @@ Assembly[] LoadConfigurationAssemblies()
168
168
169
169
foreach ( var assemblyName in GetSerilogConfigurationAssemblies ( ) )
170
170
{
171
- var assumedName = new AssemblyName ( assemblyName ) ;
172
- var assumed = Assembly . Load ( assumedName ) ;
171
+ var assumed = Assembly . Load ( assemblyName ) ;
173
172
if ( assumed != null && ! assemblies . ContainsKey ( assumed . FullName ) )
174
173
assemblies . Add ( assumed . FullName , assumed ) ;
175
174
}
176
175
177
176
return assemblies . Values . ToArray ( ) ;
178
177
}
179
178
180
- string [ ] GetSerilogConfigurationAssemblies ( )
179
+ AssemblyName [ ] GetSerilogConfigurationAssemblies ( )
181
180
{
182
- var query = Enumerable . Empty < string > ( ) ;
181
+ var query = Enumerable . Empty < AssemblyName > ( ) ;
183
182
var filter = new Func < string , bool > ( name => name != null && name . ToLowerInvariant ( ) . Contains ( "serilog" ) ) ;
184
183
185
184
if ( _dependencyContext != null )
186
185
{
187
- query = from lib in _dependencyContext . RuntimeLibraries where filter ( lib . Name ) select lib . Name ;
186
+ query = from library in _dependencyContext . RuntimeLibraries
187
+ from assemblyName in library . GetDefaultAssemblyNames ( _dependencyContext )
188
+ where filter ( assemblyName . Name )
189
+ select assemblyName ;
188
190
}
189
191
else
190
192
{
191
193
#if APPDOMAIN
192
194
query = from outputAssemblyPath in System . IO . Directory . GetFiles ( AppDomain . CurrentDomain . BaseDirectory , "*.dll" )
193
195
let assemblyFileName = System . IO . Path . GetFileNameWithoutExtension ( outputAssemblyPath )
194
196
where filter ( assemblyFileName )
195
- select AssemblyName . GetAssemblyName ( outputAssemblyPath ) . FullName ;
197
+ select AssemblyName . GetAssemblyName ( outputAssemblyPath ) ;
196
198
#endif
197
199
}
198
200
0 commit comments