Skip to content

Commit aee6bb8

Browse files
authored
Merge pull request #40 from skomis-mm/issue39
Fix #39 [Could not load file or assembly serilog.sinks.mssqlservercore]
2 parents 4c540a6 + 172973e commit aee6bb8

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

+8-6
Original file line numberDiff line numberDiff line change
@@ -168,31 +168,33 @@ Assembly[] LoadConfigurationAssemblies()
168168

169169
foreach (var assemblyName in GetSerilogConfigurationAssemblies())
170170
{
171-
var assumedName = new AssemblyName(assemblyName);
172-
var assumed = Assembly.Load(assumedName);
171+
var assumed = Assembly.Load(assemblyName);
173172
if (assumed != null && !assemblies.ContainsKey(assumed.FullName))
174173
assemblies.Add(assumed.FullName, assumed);
175174
}
176175

177176
return assemblies.Values.ToArray();
178177
}
179178

180-
string[] GetSerilogConfigurationAssemblies()
179+
AssemblyName[] GetSerilogConfigurationAssemblies()
181180
{
182-
var query = Enumerable.Empty<string>();
181+
var query = Enumerable.Empty<AssemblyName>();
183182
var filter = new Func<string, bool>(name => name != null && name.ToLowerInvariant().Contains("serilog"));
184183

185184
if (_dependencyContext != null)
186185
{
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;
188190
}
189191
else
190192
{
191193
#if APPDOMAIN
192194
query = from outputAssemblyPath in System.IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.dll")
193195
let assemblyFileName = System.IO.Path.GetFileNameWithoutExtension(outputAssemblyPath)
194196
where filter(assemblyFileName)
195-
select AssemblyName.GetAssemblyName(outputAssemblyPath).FullName;
197+
select AssemblyName.GetAssemblyName(outputAssemblyPath);
196198
#endif
197199
}
198200

0 commit comments

Comments
 (0)