yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services.

Browse Source 
Further amends to return to booting application.
This commit is contained in:
Andy Butland
2020-08-23 23:36:48 +02:00
parent 2f22313ceb
commit 2cd91a5a54
108 changed files with 230 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/IO/FileSystems.cs
View File

@@ -6,6 +6,8 @@ using Umbraco.Core.Logging;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration;
using Umbraco.Core.Hosting;
using Umbraco.Core.Configuration.Models;
using Microsoft.Extensions.Options;
namespace Umbraco.Core.IO
{
@@ -36,12 +38,12 @@ namespace Umbraco.Core.IO
#region Constructor
// DI wants a public ctor
public FileSystems(IFactory container, ILogger logger, IIOHelper ioHelper, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
public FileSystems(IFactory container, ILogger logger, IIOHelper ioHelper, IOptions<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment)
{
_container = container;
_logger = logger;
_ioHelper = ioHelper;
_globalSettings = globalSettings;
_globalSettings = globalSettings.Value;
_hostingEnvironment = hostingEnvironment;
}
@@ -156,7 +158,7 @@ namespace Umbraco.Core.IO
// internal for tests
internal IReadOnlyDictionary<Type, string> Paths => _paths;
private IGlobalSettings _globalSettings;
private GlobalSettings _globalSettings;
private readonly IHostingEnvironment _hostingEnvironment;
/// <summary>