From 9fe978319eac446e5ea843b767e70759f67eba2b Mon Sep 17 00:00:00 2001 From: ta264 Date: Tue, 15 Oct 2019 21:45:41 +0100 Subject: [PATCH] Fixed: Don't load Radarr.Core.dll as part of Radarr.Update --- src/NzbDrone.Common/Composition/ContainerBuilderBase.cs | 6 ++++-- src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs index c31fb9880..40e4cc752 100644 --- a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs +++ b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs @@ -40,8 +40,10 @@ namespace NzbDrone.Common.Composition _loadedTypes.AddRange(AssemblyLoadContext.Default.LoadFromAssemblyPath(Path.Combine(_startupPath, $"{assemblyName}.dll")).GetTypes()); } + var toRegisterResolver = new List { "System.Data.SQLite" }; + toRegisterResolver.AddRange(assemblies.Intersect(new [] { "Radarr.Core" })); + RegisterNativeResolver(toRegisterResolver); AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler); - RegisterNativeResolver(new [] {"System.Data.SQLite.dll", "Radarr.Core.dll"}); #endif Container = new Container(new TinyIoCContainer(), _loadedTypes); @@ -70,7 +72,7 @@ namespace NzbDrone.Common.Composition foreach (var name in assemblyNames) { var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath( - Path.Combine(AppDomain.CurrentDomain.BaseDirectory, name) + Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"{name}.dll") ); try diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs index 73ecb2588..f8e063bb4 100644 --- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs +++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs @@ -143,7 +143,7 @@ namespace NzbDrone.Test.Common.AutoMoq AddTheAutoMockingContainerExtensionToTheContainer(container); #if NETCOREAPP3_0 - ContainerBuilderBase.RegisterNativeResolver(new [] {"System.Data.SQLite.dll", "Radarr.Core.dll"}); + ContainerBuilderBase.RegisterNativeResolver(new [] {"System.Data.SQLite", "Radarr.Core"}); #endif }