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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation

Browse Source 
# Conflicts:
#	.gitignore
#	src/Umbraco.Core/IO/IIOHelper.cs
This commit is contained in:
Shannon
2020-04-02 22:32:02 +11:00
parent 4fddb94462 f9ce924e85
commit f0579714e9
29 changed files with 187 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ namespace Umbraco.Web.Common.AspNetCore
public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
{
_hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
_webHostEnvironment = webHostEnvironment;
_httpContextAccessor = httpContextAccessor;
_webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
_httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
SiteName = webHostEnvironment.ApplicationName;
ApplicationId = AppDomain.CurrentDomain.Id.ToString();