Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Windows Installer hanging on removing previous service

This commit is contained in:
Mark McDowall 2023-09-07 21:57:23 -07:00
parent 060be6177a
commit 76f5b26322
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/NzbDrone.Host/Bootstrap.cs
View File

@ -54,6 +54,7 @@ namespace NzbDrone.Host
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
var appMode = GetApplicationMode(startupContext); var appMode = GetApplicationMode(startupContext);
var config = GetConfiguration(startupContext);
switch (appMode) switch (appMode)
{ {
@ -82,12 +83,22 @@ namespace NzbDrone.Host
// Utility mode // Utility mode
default: default:
{ {
new Container(rules => rules.WithNzbDroneRules()) new HostBuilder()
.AutoAddServices(ASSEMBLIES) .UseServiceProviderFactory(new DryIocServiceProviderFactory(new Container(rules => rules.WithNzbDroneRules())))
.ConfigureContainer<IContainer>(c =>
{
c.AutoAddServices(Bootstrap.ASSEMBLIES)
.AddNzbDroneLogger() .AddNzbDroneLogger()
.AddDatabase()
.AddStartupContext(startupContext) .AddStartupContext(startupContext)
.Resolve<UtilityModeRouter>() .Resolve<UtilityModeRouter>()
.Route(appMode); .Route(appMode);
})
.ConfigureServices(services =>
{
services.Configure<PostgresOptions>(config.GetSection("Radarr:Postgres"));
}).Build();
break; break;
} }
} }