diff --git a/dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs b/dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs index 47a21df2c..622b742d0 100644 --- a/dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs +++ b/dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs @@ -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); @@ -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");