From 27e3b5e630f04b0774bd6693ffb1c79e7cab95d6 Mon Sep 17 00:00:00 2001 From: ta264 Date: Sun, 28 Nov 2021 18:18:03 +0000 Subject: [PATCH] Fixed: Windows installer and adding/removing services Fixes #1361 --- src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs | 2 +- src/NzbDrone.Host/UtilityModeRouter.cs | 3 --- src/Readarr.sln | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index 874bc91ee..b76a792ea 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Common.EnvironmentInfo private readonly Logger _logger; private readonly DateTime _startTime = DateTime.UtcNow; - public RuntimeInfo(IHostLifetime hostLifetime, Logger logger) + public RuntimeInfo(Logger logger, IHostLifetime hostLifetime = null) { _logger = logger; diff --git a/src/NzbDrone.Host/UtilityModeRouter.cs b/src/NzbDrone.Host/UtilityModeRouter.cs index 254474b67..27a64b655 100644 --- a/src/NzbDrone.Host/UtilityModeRouter.cs +++ b/src/NzbDrone.Host/UtilityModeRouter.cs @@ -16,21 +16,18 @@ namespace NzbDrone.Host { private readonly IServiceProvider _serviceProvider; private readonly IConsoleService _consoleService; - private readonly IRuntimeInfo _runtimeInfo; private readonly IProcessProvider _processProvider; private readonly IRemoteAccessAdapter _remoteAccessAdapter; private readonly Logger _logger; public UtilityModeRouter(IServiceProvider serviceProvider, IConsoleService consoleService, - IRuntimeInfo runtimeInfo, IProcessProvider processProvider, IRemoteAccessAdapter remoteAccessAdapter, Logger logger) { _serviceProvider = serviceProvider; _consoleService = consoleService; - _runtimeInfo = runtimeInfo; _processProvider = processProvider; _remoteAccessAdapter = remoteAccessAdapter; _logger = logger; diff --git a/src/Readarr.sln b/src/Readarr.sln index c8311791b..8dd62e63f 100644 --- a/src/Readarr.sln +++ b/src/Readarr.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31912.275 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" EndProject @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test.Common", "Test.Common" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServiceHelpers", "WindowsServiceHelpers", "{F9E67978-5CD6-4A5F-827B-4249711C0B02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceHelpers", "ServiceHelpers", "{CF5BF374-71E4-485E-A74C-39B581323D9A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{486ADF86-DD89-4E19-B805-9D94F19800D9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{0F0D4998-8F5D-4467-A909-BB192C4B3B4B}"