Imported Upstream version 5.20.1.22

Former-commit-id: 36cfe74fb4a92849aef0326046186dffbc1d4d0e
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 08:23:39 +00:00
parent 85eedc5197
commit 8016999e4d
49 changed files with 118 additions and 47 deletions

View File

@@ -78,7 +78,7 @@ namespace Mono.XBuild.CommandLine
if (HasAssemblyInfo (assemblyName))
loggerAssembly = Assembly.Load (assemblyName);
else if (File.Exists (assemblyName))
loggerAssembly = Assembly.LoadFile (assemblyName);
loggerAssembly = Assembly.LoadFrom (assemblyName);
if (loggerAssembly == null)
return null;