Merge branch 'temp8' into temp8-contexts

2019-02-15 12:55:17 +11:00
parent afbfc0034d 997b96e9d4
commit 6f7e1cac3e
314 changed files with 2474 additions and 6078 deletions
--- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Components;
+using Umbraco.Core.Composing;

 namespace Umbraco.Web.PublishedCache.NuCache
 {
--- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Components;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;