Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ public static CultureInfo GetCultureForLang(string lang)

const string ConfigurationManagerBak = "System.Configuration.ConfigurationManager, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51";
const string ConfigurationManagerFileName = "System.Configuration.ConfigurationManager.dll";

const string ITextSharpFileName = "iTextSharp.dll";
const string ITextSharpAssemblyName = "itextsharp";
private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
{
var requestedAssembly = new AssemblyName(args.Name);
Expand All @@ -434,7 +437,16 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
return Assembly.LoadFrom(fileName);
}
}
else {
else if (args.Name.StartsWith(ITextSharpAssemblyName))
{
string fileName = Path.Combine(FileUtil.GetStartupDirectory(), ITextSharpFileName);
if (File.Exists(fileName))
{
return Assembly.LoadFrom(fileName);
}
}
else
{
AssemblyName assName = new AssemblyName(args.Name);
bool strongNamedAssembly = assName.GetPublicKeyToken().Length > 0;
string fileName = Path.Combine(FileUtil.GetStartupDirectory(), $"{assName.Name}.dll");
Expand Down