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/AB3734-move-io-stuff

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/IO/FileSystems.cs
#	src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
#	src/Umbraco.Abstractions/IO/ShadowWrapper.cs
#	src/Umbraco.Core/Composing/CompositionExtensions/FileSystems.cs
#	src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs
#	src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
#	src/Umbraco.Web/Trees/FilesTreeController.cs
This commit is contained in:
Bjarke Berg
2019-11-20 12:14:42 +01:00
parent 541e7a3cb5 44e2019e72
commit 94791bcd11
157 changed files with 738 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Trees/FilesTreeController.cs
View File

@@ -1,7 +1,6 @@
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Web.Models.Trees;
namespace Umbraco.Web.Trees
{
@@ -11,17 +10,19 @@ namespace Umbraco.Web.Trees
{
private readonly IIOHelper _ioHelper;
private readonly ILogger _logger;
private readonly IFileSystem _fileSystem;
protected override IFileSystem FileSystem => _fileSystem;
private static readonly string[] ExtensionsStatic = { "*" };
public FilesTreeController(IIOHelper ioHelper, ILogger logger)
{
_ioHelper = ioHelper;
_logger = logger;
_fileSystem = new PhysicalFileSystem(_ioHelper, _logger, "~/");
}
protected override IFileSystem FileSystem => new PhysicalFileSystem(_ioHelper, _logger, "~/");
private static readonly string[] ExtensionsStatic = { "*" };
protected override string[] Extensions => ExtensionsStatic;
protected override string FileIcon => Constants.Icons.MediaFile;