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

2
src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.SetUp();
_fileSystems = Mock.Of<IFileSystems>();
_fileSystem = new PhysicalFileSystem(Current.IOHelper, Current.Logger, SettingsForTests.GenerateMockGlobalSettings().UmbracoScriptsPath);
_fileSystem = new PhysicalFileSystem(IOHelper, Logger, SettingsForTests.GenerateMockGlobalSettings().UmbracoScriptsPath);
Mock.Get(_fileSystems).Setup(x => x.ScriptsFileSystem).Returns(_fileSystem);
using (var stream = CreateStream("Umbraco.Sys.registerNamespace(\"Umbraco.Utils\");"))
{