Adjust namespaces in the Cache folder

I made these Umbraco.Cms.Core even though they have to reside in infrastructure.

src/Umbraco.Infrastructure/Cache/DatabaseServerMessengerNotificationHandler.cs

@@ -1,15 +1,12 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
 using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Sync;
-using Umbraco.Core.Events;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Sync;
-using Umbraco.Web;
-using Umbraco.Web.Cache;
-using Umbraco.Web.Routing;
 
-namespace Umbraco.Infrastructure.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Ensures that distributed cache events are setup and the <see cref="IServerMessenger"/> is initialized

src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs

@@ -1,12 +1,14 @@
-using System;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Represents the default cache policy.

src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs

@@ -1,15 +1,17 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Extensions;
 
-namespace Umbraco.Web.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Default <see cref="IDistributedCacheBinder"/> implementation.

src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs

@@ -1,19 +1,19 @@
-using System;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Changes;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Default <see cref="IDistributedCacheBinder"/> implementation.

src/Umbraco.Infrastructure/Cache/DistributedCacheExtensions.cs

@@ -1,10 +1,12 @@
-using System.Linq;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System.Linq;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services.Changes;
-using Umbraco.Core.Models;
 
-namespace Umbraco.Web.Cache
+namespace Umbraco.Extensions
 {
     /// <summary>
     /// Extension methods for <see cref="DistributedCache"/>.

src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs

@@ -1,13 +1,15 @@
-using System;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Collections;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 using Umbraco.Extensions;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Represents a caching policy that caches the entire entities set as a single collection.

src/Umbraco.Infrastructure/Cache/RepositoryCachePolicyBase.cs

@@ -1,11 +1,13 @@
-using System;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System;
 using System.Collections.Generic;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Core.Scoping;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// A base class for repository cache policies.

src/Umbraco.Infrastructure/Cache/SingleItemsOnlyRepositoryCachePolicy.cs

@@ -1,8 +1,10 @@
-using Umbraco.Cms.Core.Cache;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Represents a special policy that does not cache the result of GetAll.

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs

@@ -1,8 +1,5 @@
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Manifest;
 using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Infrastructure.DependencyInjection
 {

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs

@@ -8,8 +8,6 @@ using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Core.Sync;
 using Umbraco.Extensions;
-using Umbraco.Infrastructure.Cache;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Search;
 
 namespace Umbraco.Infrastructure.DependencyInjection

src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs

@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Logging
 {

src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs

@@ -2,7 +2,6 @@
 using Serilog.Core;
 using Serilog.Events;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Logging.Serilog.Enrichers
 {

src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs

@@ -3,7 +3,6 @@ using System.Threading;
 using Serilog.Core;
 using Serilog.Events;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Logging.Serilog.Enrichers
 {

src/Umbraco.Infrastructure/Migrations/PostMigrations/PublishedSnapshotRebuilder.cs

@@ -1,8 +1,7 @@
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Core.Migrations.PostMigrations;
-using Umbraco.Web.Cache;
-using Umbraco.Web.PublishedCache;
+using Umbraco.Extensions;
 
 namespace Umbraco.Web.Migrations.PostMigrations
 {

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditRepository.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using NPoco;
 using Microsoft.Extensions.Logging;
+using NPoco;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs

@@ -5,11 +5,9 @@ using Microsoft.Extensions.Logging;
 using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeContainerRepository.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DictionaryRepository.cs

@@ -3,13 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NPoco;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs

@@ -5,11 +5,7 @@ using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Cache;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Serialization;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DomainRepository.cs

@@ -6,10 +6,8 @@ using Microsoft.Extensions.Logging;
 using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
 using Umbraco.Extensions;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs

@@ -7,10 +7,7 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepositoryBase.cs

@@ -8,7 +8,6 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 using Umbraco.Extensions;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepository.cs

@@ -7,10 +7,8 @@ using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeContainerRepository.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeRepository.cs

@@ -5,11 +5,9 @@ using Microsoft.Extensions.Logging;
 using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs

@@ -3,17 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NPoco;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberTypeRepository.cs

@@ -6,11 +6,9 @@ using NPoco;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PublicAccessRepository.cs

@@ -6,7 +6,6 @@ using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RelationTypeRepository.cs

@@ -8,7 +8,6 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBase.cs

@@ -3,8 +3,6 @@ using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
 

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ServerRegistrationRepository.cs

@@ -7,7 +7,6 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Scoping;

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimpleGetRepository.cs

@@ -6,7 +6,6 @@ using NPoco;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs

@@ -12,7 +12,6 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;

src/Umbraco.Infrastructure/Scoping/IScope.cs

@@ -2,8 +2,6 @@
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Events;
 using Umbraco.Core.Persistence;
 
 namespace Umbraco.Core.Scoping

src/Umbraco.Infrastructure/Scoping/Scope.cs

@@ -6,7 +6,6 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Events;
 using Umbraco.Core.Persistence;
 using CoreDebugSettings = Umbraco.Cms.Core.Configuration.Models.CoreDebugSettings;

src/Umbraco.Infrastructure/Suspendable.cs

@@ -1,10 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
 using Umbraco.Examine;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Search;
 
 namespace Umbraco.Web

src/Umbraco.Infrastructure/Sync/RefreshInstruction.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Sync;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Sync
 {

src/Umbraco.Infrastructure/Sync/RefreshInstructionEnvelope.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Sync;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Sync
 {

src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core.Cache;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Sync;

src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>8</LangVersion>
+        <RootNamespace>Umbraco.Cms.Infrastructure</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/Umbraco.Tests.Integration/Cache/DistributedCacheBinderTests.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using NUnit.Framework;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
@@ -10,7 +11,6 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Umbraco.Web.Cache;
 
 namespace Umbraco.Cms.Tests.Integration.Cache
 {

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs

@@ -18,7 +18,6 @@ using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Sync;
-using Umbraco.Web.Cache;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
 {

src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs

@@ -18,7 +18,6 @@ using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Sync;
 using Umbraco.Extensions;
-using Umbraco.Web.Cache;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services

src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs

@@ -8,7 +8,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache

src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs

@@ -11,7 +11,6 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Collections;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache

src/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs

@@ -8,7 +8,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache

src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedSnapshot.cs

@@ -2,9 +2,6 @@
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Tests.LegacyXmlPublishedCache
 {

src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs

@@ -13,16 +13,9 @@ using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Services;
-using Umbraco.Web;
-using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.LegacyXmlPublishedCache
 {

src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs

@@ -8,7 +8,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models;
@@ -27,9 +26,7 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing;
 using Umbraco.Web;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Tests.Scoping

src/Umbraco.Tests/Scoping/ScopedXmlTests.cs

@@ -7,7 +7,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PublishedCache;
@@ -20,8 +19,6 @@ using Umbraco.Core.Sync;
 using Umbraco.Extensions;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Tests.Scoping

src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Web.Common.Attributes;
-using Umbraco.Web.Cache;
+using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers

src/Umbraco.Web/HttpContextUmbracoContextAccessor.cs

@@ -1,7 +1,6 @@
 using System;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core.Cache;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/UmbracoApplication.cs

@@ -2,7 +2,6 @@
 using System.Web;
 using Microsoft.Extensions.Logging;
 using Umbraco.Core;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Runtime;

src/Umbraco.Web/WebApi/UmbracoApiController.cs

@@ -1,5 +1,4 @@
-using System;
-using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Logging;
@@ -8,14 +7,7 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Security;
-using Umbraco.Core.Services;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.WebApi
 {

src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Web;
 using System.Web.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Owin;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Features;
@@ -12,15 +10,9 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Web.Composing;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Services;
-using Umbraco.Web.Routing;
+using Umbraco.Web.Composing;
 using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Security;
 
 namespace Umbraco.Web.WebApi
 {

src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs

@@ -6,16 +6,7 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Services;
-using Umbraco.Web.Security;
-using Umbraco.Core.Security;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.WebApi
 {