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/align-infrastructure-namespaces

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
This commit is contained in:
Mole
2021-02-22 15:18:04 +01:00
parent 815d4fd226 9123c06aec
commit 405d0e704d
69 changed files with 312 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs
View File

@@ -7,12 +7,12 @@ using System.IO;
using System.Linq;
using System.Security.AccessControl;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Install;
using Umbraco.Cms.Core.IO;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Infrastructure.Install
{
@@ -27,6 +27,7 @@ namespace Umbraco.Cms.Infrastructure.Install
private readonly string[] _permissionFiles = Array.Empty<string>();
private readonly GlobalSettings _globalSettings;
private readonly IIOHelper _ioHelper;
private readonly IHostingEnvironment _hostingEnvironment;
private string _basePath;
/// <summary>
@@ -36,6 +37,7 @@ namespace Umbraco.Cms.Infrastructure.Install
{
_globalSettings = globalSettings.Value;
_ioHelper = ioHelper;
_hostingEnvironment = hostingEnvironment;
_basePath = hostingEnvironment.MapPathContentRoot("/");
_permissionDirs = new[]
{
@@ -68,7 +70,7 @@ namespace Umbraco.Cms.Infrastructure.Install
EnsureFiles(_permissionFiles, out errors);
report[FilePermissionTest.FileWriting] = errors.ToList();
EnsureCanCreateSubDirectory(_globalSettings.UmbracoMediaPath, out errors);
EnsureCanCreateSubDirectory(_hostingEnvironment.MapPathWebRoot(_globalSettings.UmbracoMediaPath), out errors);
report[FilePermissionTest.MediaFolderCreation] = errors.ToList();
return report.Sum(x => x.Value.Count()) == 0;