Merge branch 'netcore/netcore' into feature/8651-config-options-patten

# Conflicts: # src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs # src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf # src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
2020-08-27 09:03:01 +02:00
parent 4e222f103e 361125e84b
commit 2a59a8385c
979 changed files with 9486 additions and 4278 deletions
--- a/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
@@ -199,5 +199,9 @@ namespace Umbraco.Tests.Common.Builders
                NoNodesViewPath = noNodesViewPath,
            };
        }
+            private string _iconsPath;
+
+            public string IconsPath{ get; set; }
+
    }
 }