diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs index 05a1fab6f..7ec14993a 100644 --- a/src/Jackett.Common/Indexers/BaseIndexer.cs +++ b/src/Jackett.Common/Indexers/BaseIndexer.cs @@ -177,13 +177,6 @@ namespace Jackett.Common.Indexers //TODO: Remove this section once users have moved off DPAPI private bool MigratedFromDPAPI(JToken jsonConfig) { - if (EnvironmentUtil.IsRunningLegacyOwin) - { - //Still running legacy Owin and using the DPAPI, we don't want to migrate - logger.Debug(ID + " - Running Owin, no need to migrate from DPAPI"); - return false; - } - bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("core", StringComparison.OrdinalIgnoreCase) >= 0; bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT; diff --git a/src/Jackett.Common/Models/Config/ConsoleOptions.cs b/src/Jackett.Common/Models/Config/ConsoleOptions.cs index 9415b4997..def0fc8c7 100644 --- a/src/Jackett.Common/Models/Config/ConsoleOptions.cs +++ b/src/Jackett.Common/Models/Config/ConsoleOptions.cs @@ -84,16 +84,7 @@ namespace Jackett.Common.Models.Config if (options.ListenPublic && options.ListenPrivate) { Console.WriteLine("You can only use listen private OR listen publicly."); - - //TODO: Remove once off Owin - if (EnvironmentUtil.IsRunningLegacyOwin) - { - Engine.Exit(1); - } - else - { - Environment.Exit(1); - } + Environment.Exit(1); } // SSL Fix diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs index bbf6883d3..f1f2a2854 100644 --- a/src/Jackett.Common/Plumbing/JackettModule.cs +++ b/src/Jackett.Common/Plumbing/JackettModule.cs @@ -71,11 +71,6 @@ namespace Jackett.Common.Plumbing private void RegisterWebClient(ContainerBuilder builder) { - //TODO: Remove once off Owin - if (EnvironmentUtil.IsRunningLegacyOwin) - { - Engine.WebClientType = typeof(WebClientType); - } builder.RegisterType().As(); } diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index 065ff2a24..a61b04090 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -338,16 +338,7 @@ namespace Jackett.Common.Services } logger.Info("Exiting Jackett.."); - - //TODO: Remove once off Owin - if (EnvironmentUtil.IsRunningLegacyOwin) - { - Engine.Exit(0); - } - else - { - Environment.Exit(0); - } + Environment.Exit(0); } } } diff --git a/src/Jackett.Common/Utils/EnvironmentUtil.cs b/src/Jackett.Common/Utils/EnvironmentUtil.cs index 385d5bbdd..487a324dd 100644 --- a/src/Jackett.Common/Utils/EnvironmentUtil.cs +++ b/src/Jackett.Common/Utils/EnvironmentUtil.cs @@ -24,23 +24,5 @@ namespace Jackett.Common.Utils } } - public static bool IsRunningLegacyOwin - { - get - { - bool runningOwin; - - try - { - runningOwin = AppDomain.CurrentDomain.GetAssemblies().Where(x => x.FullName.StartsWith("Jackett, ")).Any(); - } - catch - { - runningOwin = true; - } - - return runningOwin; - } - } } }