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

2
src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
View File

@@ -6,7 +6,7 @@ namespace Umbraco.Web.Common.AspNetCore
{
public class AspNetCoreBackOfficeInfo : IBackOfficeInfo
{
public AspNetCoreBackOfficeInfo(IOptionsSnapshot<GlobalSettings> globalSettings)
public AspNetCoreBackOfficeInfo(IOptions<GlobalSettings> globalSettings)
: this(globalSettings.Value)
{
}

2
src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Web.Common.AspNetCore
private string _localTempPath;
public AspNetCoreHostingEnvironment(IOptionsSnapshot<HostingSettings> hostingSettings, IWebHostEnvironment webHostEnvironment)
public AspNetCoreHostingEnvironment(IOptions<HostingSettings> hostingSettings, IWebHostEnvironment webHostEnvironment)
: this(hostingSettings.Value, webHostEnvironment)
{
}

2
src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Web.Common.AspNetCore
public AspNetCoreRequestAccessor(IHttpContextAccessor httpContextAccessor,
IUmbracoRequestLifetime umbracoRequestLifetime,
IUmbracoContextAccessor umbracoContextAccessor,
IOptionsSnapshot<WebRoutingSettings> webRoutingSettings)
IOptions<WebRoutingSettings> webRoutingSettings)
{
_httpContextAccessor = httpContextAccessor;
_umbracoContextAccessor = umbracoContextAccessor;

4
src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs
View File

@@ -25,8 +25,8 @@ namespace Umbraco.Web.Common.AspNetCore
private IUmbracoContext _umbracoContext;
private IUmbracoContextAccessor UmbracoContextAccessor => Context.RequestServices.GetRequiredService<IUmbracoContextAccessor>();
private GlobalSettings GlobalSettings => Context.RequestServices.GetRequiredService<IOptionsSnapshot<GlobalSettings>>().Value;
private ContentSettings ContentSettings => Context.RequestServices.GetRequiredService<IOptionsSnapshot<ContentSettings>>().Value;
private GlobalSettings GlobalSettings => Context.RequestServices.GetRequiredService<IOptions<GlobalSettings>>().Value;
private ContentSettings ContentSettings => Context.RequestServices.GetRequiredService<IOptions<ContentSettings>>().Value;
private IProfilerHtml ProfilerHtml => Context.RequestServices.GetRequiredService<IProfilerHtml>();
private IIOHelper IOHelper => Context.RequestServices.GetRequiredService<IIOHelper>();