Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web

2019-12-02 14:13:33 +01:00
parent b997b40f1d 1da4429177
commit f39324b732
168 changed files with 7442 additions and 6114 deletions
--- a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
@@ -254,7 +254,7 @@ namespace Umbraco.Tests.IO
            var sfs = new PhysicalFileSystem(ioHelper, logger, path + "/ShadowSystem/", "ignore");
            var ss = new ShadowFileSystem(fs, sfs);

-            Assert.Throws<FileSecurityException>(() =>
+            Assert.Throws<UnauthorizedAccessException>(() =>
            {
                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
                    ss.AddFile("../../f1.txt", ms);