Reverted DinkPdf changes because it doen't work on Linux, mac

Ynsszr · Mar 6, 2019 · 45a84bc · 45a84bc
1 parent 20af421
commit 45a84bc
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 101 deletions.
diff --git a/src/Modules/SimplCommerce.Module.DinkToPdf/CustomAssemblyLoadContext.cs b/src/Modules/SimplCommerce.Module.DinkToPdf/CustomAssemblyLoadContext.cs
diff --git a/src/Modules/SimplCommerce.Module.DinkToPdf/ModuleInitializer.cs b/src/Modules/SimplCommerce.Module.DinkToPdf/ModuleInitializer.cs
@@ -3,20 +3,15 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using SimplCommerce.Infrastructure.Helpers;
 using SimplCommerce.Infrastructure.Modules;
 using SimplCommerce.Module.Core.Services;
-using System.IO;
 
 namespace SimplCommerce.Module.DinkToPdf
 {
     public class ModuleInitializer : IModuleInitializer
     {
         public void ConfigureServices(IServiceCollection serviceCollection)
         {
-            var context = new CustomAssemblyLoadContext();
-            context.LoadUnmanagedLibrary(Path.Combine(Directory.GetCurrentDirectory(), "libwkhtmltox.dll"));
-
             serviceCollection.AddSingleton(typeof(IConverter), new SynchronizedConverter(new PdfTools()));
             serviceCollection.AddTransient<IPdfConverter, DinkToPdfConverter>();
         }

diff --git a/src/SimplCommerce.Infrastructure/Helpers/CurrentDirectoryHelper.cs b/src/SimplCommerce.Infrastructure/Helpers/CurrentDirectoryHelper.cs
diff --git a/src/SimplCommerce.WebHost/Program.cs b/src/SimplCommerce.WebHost/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Serilog;
-using SimplCommerce.Infrastructure.Helpers;
 using SimplCommerce.Module.Core.Extensions;
 
 namespace SimplCommerce.WebHost
@@ -15,9 +14,6 @@ public static void Main(string[] args)
         {
             try
             {
-                //TODO: Remove this fix for 2.2 `SetCurrentDirectory` when/if move to dotnet 3.0
-                CurrentDirectoryHelper.SetCurrentDirectory();
-
                 BuildWebHost2(args).Run();
             }
             catch(Exception ex)