From dd488a15f4219dbe5edc4e94cde7677fd6bac38e Mon Sep 17 00:00:00 2001 From: Mole Date: Tue, 9 Feb 2021 11:26:22 +0100 Subject: [PATCH] Move extension methods in core project to Umbraco.Extensions --- src/Umbraco.Core/Actions/ActionCollection.cs | 1 + src/Umbraco.Core/Cache/AppCacheExtensions.cs | 1 + .../Cache/ContentCacheRefresher.cs | 1 + .../Cache/ContentTypeCacheRefresher.cs | 1 + .../Cache/DataTypeCacheRefresher.cs | 1 + src/Umbraco.Core/Cache/DictionaryAppCache.cs | 1 + .../Cache/FastDictionaryAppCache.cs | 1 + .../Cache/FastDictionaryAppCacheBase.cs | 1 + src/Umbraco.Core/Cache/MediaCacheRefresher.cs | 1 + .../Cache/MemberCacheRefresher.cs | 1 + src/Umbraco.Core/Cache/ObjectCacheAppCache.cs | 1 + .../Composing/ComponentCollection.cs | 1 + src/Umbraco.Core/Composing/TypeFinder.cs | 1 + src/Umbraco.Core/Composing/TypeHelper.cs | 1 + .../ContentSettingsExtensions.cs | 1 + .../Configuration/GlobalSettingsExtensions.cs | 1 + .../Models/RequestHandlerSettings.cs | 1 + .../Validation/ConfigurationValidatorBase.cs | 1 + .../ModelsBuilderConfigExtensions.cs | 1 + .../ContentAppFactoryCollection.cs | 1 + .../ContentApps/ListViewContentAppFactory.cs | 1 + .../Dashboards/DashboardCollectionBuilder.cs | 1 + .../Events/EventDefinitionBase.cs | 1 + .../Events/QueuingEventDispatcherBase.cs | 1 + .../Exceptions/InvalidCompositionException.cs | 1 + .../{ => Extensions}/AssemblyExtensions.cs | 2 +- .../ClaimsIdentityExtensions.cs | 3 ++- .../ConfigConnectionStringExtensions.cs | 3 ++- .../{ => Extensions}/ContentExtensions.cs | 3 ++- .../ContentVariationExtensions.cs | 3 ++- .../CoreCacheHelperExtensions.cs} | 6 ++--- .../{ => Extensions}/DataTableExtensions.cs | 2 +- .../{ => Extensions}/DateTimeExtensions.cs | 3 +-- .../{ => Extensions}/DecimalExtensions.cs | 2 +- .../{ => Extensions}/DelegateExtensions.cs | 3 ++- .../{ => Extensions}/DictionaryExtensions.cs | 3 ++- .../{ => Extensions}/EnumExtensions.cs | 2 +- .../{ => Extensions}/EnumerableExtensions.cs | 7 ++--- .../{ => Extensions}/ExpressionExtensions.cs | 0 .../KeyValuePairExtensions.cs | 2 +- .../{ => Extensions}/MediaTypeExtensions.cs | 5 ++-- .../NameValueCollectionExtensions.cs | 3 ++- .../{ => Extensions}/ObjectExtensions.cs | 4 +-- .../PasswordConfigurationExtensions.cs | 2 +- .../PublishedContentExtensions.cs | 4 +-- .../PublishedElementExtensions.cs | 0 .../PublishedModelFactoryExtensions.cs | 2 +- .../PublishedPropertyExtension.cs | 1 + .../{ => Extensions}/SemVersionExtensions.cs | 2 +- .../{ => Extensions}/StringExtensions.cs | 3 ++- .../{ => Extensions}/ThreadExtensions.cs | 2 +- .../{ => Extensions}/TypeExtensions.cs | 3 ++- .../{ => Extensions}/TypeLoaderExtensions.cs | 0 .../{ => Extensions}/UdiGetterExtensions.cs | 0 .../UmbracoContextAccessorExtensions.cs | 0 .../UmbracoContextExtensions.cs | 0 .../{ => Extensions}/UriExtensions.cs | 0 .../{ => Extensions}/VersionExtensions.cs | 0 .../{ => Extensions}/WaitHandleExtensions.cs | 0 .../{ => Extensions}/XmlExtensions.cs | 1 + .../Checks/AbstractSettingsCheck.cs | 1 + .../HealthChecks/Checks/Services/SmtpCheck.cs | 1 + src/Umbraco.Core/HealthChecks/HealthCheck.cs | 1 + .../HealthChecks/HealthCheckResults.cs | 1 + .../EmailNotificationMethod.cs | 1 + src/Umbraco.Core/IO/IOHelper.cs | 1 + src/Umbraco.Core/IO/MediaFileSystem.cs | 1 + src/Umbraco.Core/IO/PhysicalFileSystem.cs | 1 + src/Umbraco.Core/IO/ShadowWrapper.cs | 1 + src/Umbraco.Core/IO/ViewHelper.cs | 1 + .../Install/InstallStatusTracker.cs | 1 + .../Install/Models/InstallSetupStep.cs | 1 + .../Manifest/ManifestContentAppFactory.cs | 1 + src/Umbraco.Core/Manifest/ManifestWatcher.cs | 1 + src/Umbraco.Core/Mapping/UmbracoMapper.cs | 1 + .../Media/ImageUrlGeneratorExtensions.cs | 1 + .../Media/UploadAutoFillProperties.cs | 1 + src/Umbraco.Core/Models/Content.cs | 1 + src/Umbraco.Core/Models/ContentBase.cs | 1 + .../Models/ContentEditing/CodeFileDisplay.cs | 1 + .../Models/ContentEditing/ContentTypeBasic.cs | 1 + .../Models/ContentEditing/ContentTypeSave.cs | 1 + .../Models/ContentEditing/DocumentTypeSave.cs | 1 + .../Models/ContentEditing/MemberSave.cs | 1 + .../ContentEditing/MessagesExtensions.cs | 1 + .../UserGroupPermissionsSave.cs | 1 + .../Models/ContentEditing/UserGroupSave.cs | 1 + .../Models/ContentEditing/UserInvite.cs | 1 + .../Models/ContentRepositoryExtensions.cs | 1 + src/Umbraco.Core/Models/ContentSchedule.cs | 1 + .../Models/ContentScheduleCollection.cs | 1 + src/Umbraco.Core/Models/ContentType.cs | 1 + src/Umbraco.Core/Models/ContentTypeBase.cs | 1 + src/Umbraco.Core/Models/CultureImpact.cs | 1 + src/Umbraco.Core/Models/DictionaryItem.cs | 1 + src/Umbraco.Core/Models/EntityExtensions.cs | 1 + src/Umbraco.Core/Models/Macro.cs | 1 + .../Models/MacroPropertyCollection.cs | 1 + .../Models/Mapping/CommonMapper.cs | 1 + .../Mapping/ContentPropertyBasicMapper.cs | 1 + .../Models/Mapping/ContentSavedStateMapper.cs | 1 + .../Mapping/ContentTypeMapDefinition.cs | 1 + .../Models/Mapping/ContentVariantMapper.cs | 1 + .../Models/Mapping/DataTypeMapDefinition.cs | 1 + .../Mapping/MemberTabsAndPropertiesMapper.cs | 1 + .../Models/Mapping/PropertyTypeGroupMapper.cs | 1 + .../Models/Mapping/RelationMapDefinition.cs | 1 + .../Models/Mapping/TabsAndPropertiesMapper.cs | 1 + .../Models/Mapping/UserMapDefinition.cs | 1 + src/Umbraco.Core/Models/Member.cs | 1 + src/Umbraco.Core/Models/MemberType.cs | 1 + src/Umbraco.Core/Models/Membership/User.cs | 1 + .../Models/Membership/UserGroup.cs | 1 + .../Models/PartialViewMacroModelExtensions.cs | 4 ++- src/Umbraco.Core/Models/Property.cs | 1 + src/Umbraco.Core/Models/PropertyCollection.cs | 1 + src/Umbraco.Core/Models/PropertyGroup.cs | 1 + src/Umbraco.Core/Models/PropertyType.cs | 1 + .../PublishedContent/PublishedContentBase.cs | 1 + .../PublishedContent/PublishedContentType.cs | 1 + .../VariationContextAccessorExtensions.cs | 9 +++++-- src/Umbraco.Core/Models/ServerRegistration.cs | 1 + src/Umbraco.Core/Models/SimpleContentType.cs | 1 + src/Umbraco.Core/Models/Stylesheet.cs | 1 + src/Umbraco.Core/Models/Template.cs | 1 + .../Models/Trees/ActionMenuItem.cs | 1 + src/Umbraco.Core/Models/Trees/MenuItem.cs | 1 + .../Models/UmbracoUserExtensions.cs | 1 + src/Umbraco.Core/Models/UserExtensions.cs | 1 + src/Umbraco.Core/NetworkHelper.cs | 1 + .../Packaging/CompiledPackageXmlParser.cs | 1 + .../Packaging/PackageDefinitionXmlParser.cs | 1 + .../Packaging/PackageExtraction.cs | 1 + .../Packaging/PackageFileInstallation.cs | 1 + .../Packaging/PackagesRepository.cs | 1 + .../PropertyEditors/ConfigurationEditor.cs | 1 + .../PropertyEditors/ConfigurationField.cs | 1 + .../PropertyEditors/DataEditor.cs | 1 + .../PropertyEditors/DataValueEditor.cs | 1 + .../PropertyEditors/DateValueEditor.cs | 1 + .../DefaultPropertyIndexValueFactory.cs | 1 + .../ManifestValueValidatorCollection.cs | 1 + .../PropertyEditorTagsExtensions.cs | 4 ++- .../PropertyValueConverterCollection.cs | 1 + .../Validators/DateTimeValidator.cs | 1 + .../Validators/DecimalValidator.cs | 1 + .../Validators/IntegerValidator.cs | 1 + .../Validators/RequiredValidator.cs | 1 + .../CheckboxListValueConverter.cs | 1 + .../ContentPickerValueConverter.cs | 1 + .../DatePickerValueConverter.cs | 1 + .../EmailAddressValueConverter.cs | 1 + .../ValueConverters/IntegerValueConverter.cs | 1 + .../MemberGroupPickerValueConverter.cs | 1 + .../MemberPickerValueConverter.cs | 1 + .../MultiNodeTreePickerValueConverter.cs | 1 + .../RadioButtonListValueConverter.cs | 1 + .../ValueConverters/SliderValueConverter.cs | 1 + .../ValueConverters/TagsValueConverter.cs | 1 + .../PublishedCache/PublishedCacheBase.cs | 1 + .../PublishedCache/PublishedMember.cs | 1 + .../Routing/ContentFinderByRedirectUrl.cs | 1 + .../Routing/ContentFinderByUrlAndTemplate.cs | 1 + src/Umbraco.Core/Routing/DomainAndUri.cs | 1 + src/Umbraco.Core/Routing/DomainUtilities.cs | 1 + src/Umbraco.Core/Routing/SiteDomainHelper.cs | 1 + .../Routing/UmbracoRequestPaths.cs | 1 + src/Umbraco.Core/Routing/UriUtility.cs | 1 + src/Umbraco.Core/Routing/UrlProvider.cs | 2 +- .../Routing/UrlProviderExtensions.cs | 4 ++- src/Umbraco.Core/Routing/WebPath.cs | 1 + src/Umbraco.Core/Runtime/MainDom.cs | 1 + .../Security/ClaimsPrincipalExtensions.cs | 1 + .../Security/LegacyPasswordSecurity.cs | 1 + .../Security/PasswordGenerator.cs | 1 + .../Security/UmbracoBackOfficeIdentity.cs | 1 + .../Services/ContentServiceExtensions.cs | 1 + .../Services/ContentTypeServiceExtensions.cs | 1 + src/Umbraco.Core/Services/DashboardService.cs | 1 + .../LocalizedTextServiceExtensions.cs | 1 + src/Umbraco.Core/Services/Ordering.cs | 4 ++- .../Services/PublicAccessServiceExtensions.cs | 1 + src/Umbraco.Core/Services/TreeService.cs | 1 + .../Services/UserServiceExtensions.cs | 1 + .../Strings/Css/StylesheetHelper.cs | 1 + .../Strings/Css/StylesheetRule.cs | 1 + .../Strings/DefaultShortStringHelper.cs | 1 + .../Strings/DefaultShortStringHelperConfig.cs | 1 + .../Strings/DefaultUrlSegmentProvider.cs | 1 + .../Templates/HtmlImageSourceParser.cs | 1 + .../Templates/UmbracoComponentRenderer.cs | 1 + .../Tour/TourFilterCollectionBuilder.cs | 1 + .../Trees/SearchableTreeCollection.cs | 1 + src/Umbraco.Core/Trees/TreeNode.cs | 1 + .../UdiParserServiceConnectors.cs | 1 + src/Umbraco.Core/UriUtilityCore.cs | 1 + .../BackOfficeExamineSearcher.cs | 6 +---- .../LuceneFileSystemDirectoryFactory.cs | 9 +++---- .../LuceneIndexDiagnostics.cs | 5 ++-- .../Cache/DefaultRepositoryCachePolicy.cs | 2 +- .../Cache/DistributedCacheBinder.cs | 4 +-- .../Cache/FullDataSetRepositoryCachePolicy.cs | 2 +- .../Compose/BlockEditorComponent.cs | 2 +- .../Compose/NestedContentPropertyComponent.cs | 3 +-- .../Compose/PublicAccessComponent.cs | 4 +-- .../Compose/RelateOnTrashComponent.cs | 5 +--- .../Examine/BaseValueSetBuilder.cs | 5 +--- .../Examine/ContentValueSetBuilder.cs | 9 +++---- .../Examine/ContentValueSetValidator.cs | 4 +-- .../Examine/GenericIndexDiagnostics.cs | 2 +- .../Examine/MediaValueSetBuilder.cs | 8 ++---- .../Examine/MemberValueSetBuilder.cs | 8 +++--- .../Examine/UmbracoExamineExtensions.cs | 9 +++---- .../Examine/ValueSetValidator.cs | 3 +-- .../HostedServices/KeepAlive.cs | 5 +--- .../HostedServices/ReportSiteTask.cs | 8 +++--- .../ServerRegistration/TouchServerTask.cs | 3 +-- .../Install/FilePermissionHelper.cs | 3 +-- .../Install/InstallHelper.cs | 10 +++---- .../InstallSteps/DatabaseConfigureStep.cs | 1 + .../InstallSteps/DatabaseUpgradeStep.cs | 1 + .../Logging/Serilog/LoggerConfigExtensions.cs | 2 +- .../Logging/Serilog/SerilogLogger.cs | 2 +- .../Logging/Viewer/ExpressionFilter.cs | 2 +- .../Viewer/SerilogLogViewerSourceBase.cs | 4 +-- .../Manifest/ManifestParser.cs | 6 +---- .../Media/ImageSharpImageUrlGenerator.cs | 5 +--- .../DeleteKeysAndIndexesBuilder.cs | 5 ++-- .../Migrations/Install/DatabaseBuilder.cs | 6 +---- .../Migrations/Install/DatabaseDataCreator.cs | 3 +-- .../Install/DatabaseSchemaCreator.cs | 3 +-- .../Migrations/MigrationBase_Extra.cs | 2 +- .../Migrations/MigrationPlan.cs | 1 + .../Migrations/Upgrade/UmbracoPlan.cs | 3 +-- .../Upgrade/V_8_0_0/AddContentNuTable.cs | 7 ++--- .../DataTypes/DecimalPreValueMigrator.cs | 2 +- .../DataTypes/DefaultPreValueMigrator.cs | 2 +- .../DataTypes/ListViewPreValueMigrator.cs | 2 +- .../NestedContentPreValueMigrator.cs | 5 ++-- .../DataTypes/RichTextPreValueMigrator.cs | 2 +- .../DropDownPropertyEditorsMigration.cs | 7 ++--- .../Upgrade/V_8_0_0/FallbackLanguage.cs | 2 +- .../V_8_0_0/Models/PropertyDataDto80.cs | 6 ++--- .../V_8_0_0/PropertyEditorsMigrationBase.cs | 2 +- ...adioAndCheckboxPropertyEditorsMigration.cs | 5 +--- .../V_8_0_0/UpdatePickerIntegerValuesToUdi.cs | 1 + .../Models/Mapping/EntityMapDefinition.cs | 3 +-- .../Models/PathValidationExtensions.cs | 1 + .../Packaging/PackageDataInstallation.cs | 5 +--- .../Packaging/PackageInstallation.cs | 2 +- .../DefinitionFactory.cs | 2 +- .../Persistence/DbConnectionExtensions.cs | 1 + .../Persistence/Dtos/PropertyDataDto.cs | 2 +- .../Persistence/Factories/DataTypeFactory.cs | 5 +--- .../Persistence/Factories/MacroFactory.cs | 3 +-- .../Persistence/Factories/PropertyFactory.cs | 4 +-- .../Factories/PropertyGroupFactory.cs | 3 +-- .../Persistence/Factories/UserFactory.cs | 2 +- .../Persistence/Factories/UserGroupFactory.cs | 2 +- .../Persistence/Mappers/BaseMapper.cs | 2 +- .../Persistence/Mappers/MapperCollection.cs | 3 +-- .../Persistence/NPocoDatabaseExtensions.cs | 1 + .../Persistence/NPocoSqlExtensions.cs | 1 + .../Querying/ExpressionVisitorBase.cs | 2 +- .../Querying/ModelToSqlExpressionVisitor.cs | 2 +- .../Querying/SqlExpressionExtensions.cs | 2 +- .../Implement/AuditEntryRepository.cs | 3 +-- .../Implement/ContentRepositoryBase.cs | 8 +----- .../Implement/ContentTypeCommonRepository.cs | 3 +-- .../Implement/ContentTypeRepository.cs | 3 +-- .../Implement/ContentTypeRepositoryBase.cs | 1 + .../Implement/DataTypeRepository.cs | 7 +---- .../Implement/DictionaryRepository.cs | 2 +- .../Implement/DocumentRepository.cs | 5 +--- .../Implement/DomainRepository.cs | 4 +-- .../Implement/EntityRepository.cs | 4 +-- .../Implement/EntityRepositoryBase.cs | 3 +-- .../Implement/ExternalLoginRepository.cs | 4 +-- .../Repositories/Implement/FileRepository.cs | 4 +-- .../Implement/KeyValueRepository.cs | 6 +---- .../Implement/LanguageRepository.cs | 4 +-- .../Implement/LanguageRepositoryExtensions.cs | 4 +-- .../Repositories/Implement/MacroRepository.cs | 4 +-- .../Repositories/Implement/MediaRepository.cs | 6 +---- .../Implement/MediaTypeRepository.cs | 3 +-- .../Implement/MemberGroupRepository.cs | 4 +-- .../Implement/MemberRepository.cs | 5 +--- .../Implement/MemberTypeRepository.cs | 2 +- .../Implement/PartialViewRepository.cs | 3 +-- .../Implement/PermissionRepository.cs | 4 +-- .../Implement/RedirectUrlRepository.cs | 4 +-- .../Implement/ScriptRepository.cs | 4 +-- .../Repositories/Implement/SimilarNodeName.cs | 2 +- .../Implement/StylesheetRepository.cs | 4 +-- .../Repositories/Implement/TagRepository.cs | 4 +-- .../Implement/TemplateRepository.cs | 3 +-- .../Repositories/Implement/UserRepository.cs | 4 +-- .../SqlSyntax/SqlServerSyntaxProvider.cs | 2 +- .../SqlSyntax/SqlSyntaxProviderBase.cs | 2 +- .../Persistence/SqlSyntaxExtensions.cs | 1 + .../Persistence/UmbracoDatabaseExtensions.cs | 2 +- .../Persistence/UmbracoDatabaseFactory.cs | 1 + .../BlockEditorPropertyEditor.cs | 7 +---- .../ColorPickerConfigurationEditor.cs | 4 +-- .../PropertyEditors/ComplexEditorValidator.cs | 5 +--- ...omplexPropertyEditorContentEventHandler.cs | 5 +--- .../ConfigurationEditorOfTConfiguration.cs | 3 +-- .../DateTimeConfigurationEditor.cs | 3 +-- .../DropDownFlexibleConfigurationEditor.cs | 4 +-- .../FileUploadPropertyEditor.cs | 9 +------ .../FileUploadPropertyValueEditor.cs | 6 +---- .../PropertyEditors/GridPropertyEditor.cs | 7 +---- .../GridPropertyIndexValueFactory.cs | 4 +-- .../ImageCropperPropertyEditor.cs | 8 +----- .../ImageCropperPropertyValueEditor.cs | 6 +---- .../MultiUrlPickerValueEditor.cs | 8 +----- .../MultipleTextStringConfigurationEditor.cs | 3 +-- .../NestedContentPropertyEditor.cs | 7 +---- .../RichTextEditorPastedImages.cs | 9 ++----- .../PropertyEditors/RichTextPropertyEditor.cs | 8 +----- .../PropertyEditors/TagsPropertyEditor.cs | 6 +---- .../UploadFileTypeValidator.cs | 6 +---- .../BlockListPropertyValueConverter.cs | 6 +---- .../ColorPickerValueConverter.cs | 2 +- .../ValueConverters/GridValueConverter.cs | 1 + .../ValueConverters/ImageCropperValue.cs | 3 +-- .../ImageCropperValueConverter.cs | 2 +- .../ValueConverters/JsonValueConverter.cs | 2 +- .../MultiUrlPickerValueConverter.cs | 9 +------ .../NestedContentValueConverterBase.cs | 5 +--- .../RteMacroRenderingValueConverter.cs | 5 +--- .../ValueListUniqueValueValidator.cs | 4 +-- .../PublishedContentQuery.cs | 3 +-- .../Routing/NotFoundHandlerHelper.cs | 5 +--- .../Routing/RedirectTrackingComponent.cs | 7 +---- .../Runtime/SqlMainDomLock.cs | 1 + .../Search/ExamineComponent.cs | 8 +----- .../Search/UmbracoTreeSearcher.cs | 7 +---- .../Security/BackOfficeIdentityUser.cs | 1 + .../Security/BackOfficeUserStore.cs | 4 +-- .../Services/Implement/ContentService.cs | 3 +-- ...peServiceBaseOfTRepositoryTItemTService.cs | 3 +-- .../Services/Implement/DataTypeService.cs | 4 +-- .../Services/Implement/EntityXmlSerializer.cs | 4 +-- .../Services/Implement/FileService.cs | 8 ++---- .../Services/Implement/LocalizationService.cs | 5 +--- .../Implement/LocalizedTextService.cs | 2 +- .../LocalizedTextServiceFileSources.cs | 2 +- .../Services/Implement/MediaService.cs | 3 +-- .../Services/Implement/MemberService.cs | 3 +-- .../Services/Implement/MemberTypeService.cs | 4 +-- .../Services/Implement/NotificationService.cs | 5 ++-- .../Services/Implement/PackagingService.cs | 5 +--- .../Implement/PropertyValidationService.cs | 7 +++-- .../Services/Implement/PublicAccessService.cs | 3 +-- .../Services/Implement/RelationService.cs | 5 +--- .../Implement/ServerRegistrationService.cs | 5 +--- .../Services/Implement/UserService.cs | 4 +-- .../Sync/BatchedDatabaseServerMessenger.cs | 5 +--- .../Sync/DatabaseServerMessenger.cs | 3 +-- .../WebAssets/BackOfficeWebAssets.cs | 5 +--- .../ContentTypeModelValidatorBase.cs | 3 +-- .../Building/TypeModelHasher.cs | 7 ++--- .../PureLiveModelFactory.cs | 5 +--- .../UmbracoServices.cs | 5 +--- .../ContentCache.cs | 4 +-- ....DictionaryOfCultureVariationSerializer.cs | 3 +-- ...Tree.DictionaryOfPropertyDataSerializer.cs | 3 +-- .../MediaCache.cs | 3 +-- .../Persistence/NuCacheContentRepository.cs | 7 +---- .../PublishedContent.cs | 6 +---- .../PublishedSnapshotService.cs | 10 +------ src/Umbraco.TestData/SegmentTestController.cs | 9 ++----- .../TryConvertToBenchmarks.cs | 4 +-- src/Umbraco.Tests.Common/TestHelperBase.cs | 7 +---- .../TestHelpers/SolidPublishedSnapshot.cs | 7 +---- .../UmbracoBuilderExtensions.cs | 8 +----- .../Implementations/TestHelper.cs | 7 +---- .../Umbraco.Core/IO/ShadowFileSystemTests.cs | 2 +- .../Mapping/ContentTypeModelMappingTests.cs | 3 +-- .../CreatedPackagesRepositoryTests.cs | 2 +- .../Packaging/PackageDataInstallationTests.cs | 6 +---- .../Repositories/DocumentRepositoryTest.cs | 1 + .../Repositories/TemplateRepositoryTest.cs | 7 +---- .../Repositories/UserRepositoryTest.cs | 5 +--- .../Scoping/ScopeFileSystemsTests.cs | 2 +- .../Services/ContentEventsTests.cs | 2 +- .../Services/ContentServiceEventTests.cs | 2 +- .../Services/ContentServiceTagsTests.cs | 2 +- .../Services/ContentTypeServiceTests.cs | 2 +- .../Services/EntityServiceTests.cs | 6 +---- .../Services/MemberServiceTests.cs | 6 +---- .../Services/RelationServiceTests.cs | 5 +--- .../Services/UserServiceTests.cs | 5 +--- .../Controllers/ContentControllerTests.cs | 5 +--- .../TemplateQueryControllerTests.cs | 6 +---- .../Controllers/UsersControllerTests.cs | 6 +---- .../Filters/ContentModelValidatorTests.cs | 6 +---- .../UmbracoBackOfficeIdentityTests.cs | 4 +-- .../ClaimsIdentityExtensionsTests.cs | 3 +-- .../Composing/LazyCollectionBuilderTests.cs | 3 +-- .../Umbraco.Core/Composing/TypeLoaderTests.cs | 4 +-- .../CoreThings/ObjectExtensionsTests.cs | 3 +-- .../CoreThings/TryConvertToTests.cs | 3 +-- .../Umbraco.Core/DelegateExtensionsTests.cs | 2 +- .../Umbraco.Core/EnumExtensionsTests.cs | 3 +-- .../Umbraco.Core/EnumerableExtensionsTests.cs | 3 +-- .../Collections/PropertyCollectionTests.cs | 4 +-- .../Models/ContentExtensionsTests.cs | 5 +--- .../Umbraco.Core/Models/ContentTests.cs | 7 +---- .../Umbraco.Core/Models/VariationTests.cs | 4 +-- .../BlockEditorComponentTests.cs | 2 +- ...ataValueReferenceFactoryCollectionTests.cs | 4 +-- .../PropertyEditorValueEditorTests.cs | 4 +-- .../Umbraco.Core/ReflectionTests.cs | 3 +-- .../ShortStringHelper/CmsHelperCasingTests.cs | 3 +-- .../DefaultShortStringHelperTests.cs | 3 +-- .../StringExtensionsTests.cs | 2 +- .../StylesheetHelperTests.cs | 3 +-- .../Migrations/MigrationPlanTests.cs | 4 +-- .../NPocoTests/NPocoSqlTemplateTests.cs | 3 +-- ...terAllowedOutgoingContentAttributeTests.cs | 6 +---- .../Security/BackOfficeAntiforgeryTests.cs | 3 +-- .../ContentModelSerializationTests.cs | 3 +-- .../JsInitializationTests.cs | 3 +-- .../ServerVariablesParserTests.cs | 4 +-- .../EndpointRouteBuilderExtensionsTests.cs | 5 +--- .../PublishedMediaCacheTests.cs | 12 +++------ .../DictionaryPublishedContent.cs | 9 +++---- .../LegacyXmlPublishedCache/DomainCache.cs | 7 +---- .../LegacyXmlPublishedCache/PreviewContent.cs | 3 +-- .../PublishedContentCache.cs | 5 +--- .../PublishedMediaCache.cs | 6 +---- .../XmlPublishedContent.cs | 6 +---- .../LegacyXmlPublishedCache/XmlStore.cs | 6 +---- src/Umbraco.Tests/Models/ContentXmlTest.cs | 3 +-- src/Umbraco.Tests/Models/MediaXmlTest.cs | 3 +-- .../PublishedContent/NuCacheChildrenTests.cs | 9 +------ .../PublishedContent/NuCacheTests.cs | 11 +------- .../PublishedContentDataTableTests.cs | 7 +---- .../PublishedContentExtensionTests.cs | 6 +---- .../PublishedContentLanguageVariantTests.cs | 7 +---- .../PublishedContent/PublishedMediaTests.cs | 25 ++++++----------- .../SolidPublishedSnapshot.cs | 7 +---- .../Routing/GetContentUrlsTests.cs | 11 +++----- .../Scoping/ScopedNuCacheTests.cs | 9 +------ .../Stubs/TestControllerFactory.cs | 5 +--- .../TestHelpers/TestObjects-Mocks.cs | 5 +--- .../Authorization/AdminUsersHandler.cs | 5 +--- .../Authorization/TreeHandler.cs | 4 +-- .../Authorization/UserGroupHandler.cs | 4 +-- .../Controllers/ContentControllerBase.cs | 7 +---- .../Controllers/ContentTypeController.cs | 7 +---- .../Controllers/DashboardController.cs | 27 ++++++++----------- .../Controllers/MacroRenderingController.cs | 6 +---- .../Controllers/MacrosController.cs | 6 +---- .../Controllers/MediaTypeController.cs | 5 +--- .../Controllers/PackageInstallController.cs | 14 +++------- .../Controllers/RelationController.cs | 10 +------ .../Controllers/RelationTypeController.cs | 4 +-- .../Controllers/StylesheetController.cs | 4 +-- .../Controllers/TinyMceController.cs | 5 +--- .../AppendUserModifiedHeaderAttribute.cs | 4 +-- .../FileUploadCleanupFilterAttribute.cs | 3 +-- .../FilterAllowedOutgoingMediaAttribute.cs | 6 +---- .../Filters/UserGroupValidateAttribute.cs | 4 +-- .../Mapping/ContentMapDefinition.cs | 7 +---- .../Mapping/MediaMapDefinition.cs | 6 +---- .../ModelBinders/ContentItemBinder.cs | 7 +---- .../PropertyEditors/TagsDataController.cs | 4 +-- .../Routing/BackOfficeAreaRoutes.cs | 4 +-- .../Routing/PreviewRoutes.cs | 4 +-- .../Security/BackOfficeCookieManager.cs | 2 +- .../Security/BackOfficePasswordHasher.cs | 6 ++--- .../Security/BackOfficeUserManagerAuditer.cs | 4 +-- .../Services/IconService.cs | 5 +--- .../Trees/ContentBlueprintTreeController.cs | 5 +--- .../Trees/ContentTreeController.cs | 5 +--- .../Trees/ContentTypeTreeController.cs | 5 +--- .../Trees/DataTypeTreeController.cs | 5 +--- .../Trees/DictionaryTreeController.cs | 5 +--- .../Trees/FileSystemTreeController.cs | 4 +-- .../Trees/MediaTreeController.cs | 19 +++++-------- .../Trees/MediaTypeTreeController.cs | 5 +--- .../Trees/TreeCollectionBuilder.cs | 3 +-- .../Trees/TreeController.cs | 3 +-- .../AspNetCoreHostingEnvironment.cs | 4 +-- .../Extensions/CacheHelperExtensions.cs | 3 +-- .../EndpointRouteBuilderExtensions.cs | 4 +-- .../Filters/ModelBindingExceptionAttribute.cs | 3 +-- .../OutgoingNoHyphenGuidFormatAttribute.cs | 6 +---- ...ValidateUmbracoFormRouteStringAttribute.cs | 3 +-- .../Install/InstallApiController.cs | 4 +-- .../Install/InstallAreaRoutes.cs | 9 ++----- .../ModelBinders/ContentModelBinder.cs | 4 +-- .../Routing/RoutableDocumentFilter.cs | 4 +-- .../Security/EncryptionHelper.cs | 2 +- .../UmbracoContext/UmbracoContext.cs | 5 +--- src/Umbraco.Web.Common/UmbracoHelper.cs | 2 +- .../Templates/Breadcrumb.cshtml | 6 ++--- .../ListAncestorsFromCurrentPage.cshtml | 4 +-- .../ListImagesFromMediaFolder.cshtml | 4 +-- .../Templates/MultinodeTree-picker.cshtml | 4 +-- .../Controllers/UmbLoginController.cs | 7 +---- .../Controllers/UmbLoginStatusController.cs | 8 +----- .../Controllers/UmbProfileController.cs | 8 +----- .../Controllers/UmbRegisterController.cs | 8 +----- .../Extensions/PublishedContentExtensions.cs | 5 +--- .../Routing/FrontEndRoutes.cs | 8 +----- .../AspNet/AspNetBackOfficeInfo.cs | 5 ++-- .../AspNet/AspNetHostingEnvironment.cs | 3 +-- src/Umbraco.Web/HttpCookieExtensions.cs | 6 +---- src/Umbraco.Web/HttpRequestExtensions.cs | 7 ++--- src/Umbraco.Web/ModelStateExtensions.cs | 3 +-- .../Mvc/MemberAuthorizeAttribute.cs | 4 +-- src/Umbraco.Web/Mvc/PluginController.cs | 7 +---- .../Mvc/ViewDataDictionaryExtensions.cs | 3 +-- src/Umbraco.Web/Security/MembershipHelper.cs | 7 +---- .../Security/MembershipProviderBase.cs | 6 +---- .../Security/MembershipProviderExtensions.cs | 3 +-- .../Providers/MembersMembershipProvider.cs | 12 +++------ .../Providers/UmbracoMembershipProvider.cs | 8 +----- src/Umbraco.Web/UmbracoApplicationBase.cs | 6 +---- src/Umbraco.Web/UmbracoHelper.cs | 8 +++--- src/Umbraco.Web/UrlHelperExtensions.cs | 3 +-- src/Umbraco.Web/UrlHelperRenderExtensions.cs | 6 +---- .../WebApi/MemberAuthorizeAttribute.cs | 4 +-- .../ParameterSwapControllerActionSelector.cs | 2 +- 528 files changed, 623 insertions(+), 1196 deletions(-) rename src/Umbraco.Core/{ => Extensions}/AssemblyExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/ClaimsIdentityExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/ConfigConnectionStringExtensions.cs (96%) rename src/Umbraco.Core/{ => Extensions}/ContentExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/ContentVariationExtensions.cs (99%) rename src/Umbraco.Core/{CacheHelperExtensions.cs => Extensions/CoreCacheHelperExtensions.cs} (86%) rename src/Umbraco.Core/{ => Extensions}/DataTableExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/DateTimeExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/DecimalExtensions.cs (96%) rename src/Umbraco.Core/{ => Extensions}/DelegateExtensions.cs (96%) rename src/Umbraco.Core/{ => Extensions}/DictionaryExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/EnumExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/EnumerableExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/ExpressionExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/KeyValuePairExtensions.cs (95%) rename src/Umbraco.Core/{ => Extensions}/MediaTypeExtensions.cs (80%) rename src/Umbraco.Core/{ => Extensions}/NameValueCollectionExtensions.cs (95%) rename src/Umbraco.Core/{ => Extensions}/ObjectExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/PasswordConfigurationExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/PublishedContentExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/PublishedElementExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/PublishedModelFactoryExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/PublishedPropertyExtension.cs (98%) rename src/Umbraco.Core/{ => Extensions}/SemVersionExtensions.cs (90%) rename src/Umbraco.Core/{ => Extensions}/StringExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/ThreadExtensions.cs (98%) rename src/Umbraco.Core/{ => Extensions}/TypeExtensions.cs (99%) rename src/Umbraco.Core/{ => Extensions}/TypeLoaderExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/UdiGetterExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/UmbracoContextAccessorExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/UmbracoContextExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/UriExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/VersionExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/WaitHandleExtensions.cs (100%) rename src/Umbraco.Core/{ => Extensions}/XmlExtensions.cs (99%) diff --git a/src/Umbraco.Core/Actions/ActionCollection.cs b/src/Umbraco.Core/Actions/ActionCollection.cs index b6fb884b30..3987e89305 100644 --- a/src/Umbraco.Core/Actions/ActionCollection.cs +++ b/src/Umbraco.Core/Actions/ActionCollection.cs @@ -2,6 +2,7 @@ using System.Linq; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Actions { diff --git a/src/Umbraco.Core/Cache/AppCacheExtensions.cs b/src/Umbraco.Core/Cache/AppCacheExtensions.cs index 5873341fdc..03e4625f73 100644 --- a/src/Umbraco.Core/Cache/AppCacheExtensions.cs +++ b/src/Umbraco.Core/Cache/AppCacheExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/ContentCacheRefresher.cs b/src/Umbraco.Core/Cache/ContentCacheRefresher.cs index 20bd969562..e77fa7abef 100644 --- a/src/Umbraco.Core/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/ContentCacheRefresher.cs @@ -7,6 +7,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs b/src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs index 5ea3cb8ca4..8a1ba1234e 100644 --- a/src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/ContentTypeCacheRefresher.cs @@ -7,6 +7,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs b/src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs index ebc97d8f0b..d5e11e17d3 100644 --- a/src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/DictionaryAppCache.cs b/src/Umbraco.Core/Cache/DictionaryAppCache.cs index 9e8609ac2e..8857da0187 100644 --- a/src/Umbraco.Core/Cache/DictionaryAppCache.cs +++ b/src/Umbraco.Core/Cache/DictionaryAppCache.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; using System.Text.RegularExpressions; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs index fdadb6acd2..ddd9f96c73 100644 --- a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs +++ b/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs @@ -3,6 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs index 747aca91f5..7ebbcc8b63 100644 --- a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs +++ b/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/MediaCacheRefresher.cs b/src/Umbraco.Core/Cache/MediaCacheRefresher.cs index e401d0a1bf..997083b0a7 100644 --- a/src/Umbraco.Core/Cache/MediaCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/MediaCacheRefresher.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/MemberCacheRefresher.cs b/src/Umbraco.Core/Cache/MemberCacheRefresher.cs index 7223e4642e..2d0ce7da16 100644 --- a/src/Umbraco.Core/Cache/MemberCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/MemberCacheRefresher.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs index 91de9de93e..7096d077a2 100644 --- a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs +++ b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Runtime.Caching; using System.Text.RegularExpressions; using System.Threading; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Cache { diff --git a/src/Umbraco.Core/Composing/ComponentCollection.cs b/src/Umbraco.Core/Composing/ComponentCollection.cs index cf8937ec79..1cd505027b 100644 --- a/src/Umbraco.Core/Composing/ComponentCollection.cs +++ b/src/Umbraco.Core/Composing/ComponentCollection.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Logging; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Composing { diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs index 7245c8d332..4ec46bbda0 100644 --- a/src/Umbraco.Core/Composing/TypeFinder.cs +++ b/src/Umbraco.Core/Composing/TypeFinder.cs @@ -7,6 +7,7 @@ using System.Security; using System.Text; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Configuration.UmbracoSettings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Composing { diff --git a/src/Umbraco.Core/Composing/TypeHelper.cs b/src/Umbraco.Core/Composing/TypeHelper.cs index 7f6fdd3755..d683e313be 100644 --- a/src/Umbraco.Core/Composing/TypeHelper.cs +++ b/src/Umbraco.Core/Composing/TypeHelper.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reflection; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Composing { diff --git a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs index 340284033f..093eed1ece 100644 --- a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs +++ b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs @@ -1,5 +1,6 @@ using System.Linq; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Configuration { diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs index 72acb046cb..4765dff6c5 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Configuration { diff --git a/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs index b834322684..5f5032f7c3 100644 --- a/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Configuration.UmbracoSettings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Configuration.Models { diff --git a/src/Umbraco.Core/Configuration/Models/Validation/ConfigurationValidatorBase.cs b/src/Umbraco.Core/Configuration/Models/Validation/ConfigurationValidatorBase.cs index bfb4cd9522..9f0a23467d 100644 --- a/src/Umbraco.Core/Configuration/Models/Validation/ConfigurationValidatorBase.cs +++ b/src/Umbraco.Core/Configuration/Models/Validation/ConfigurationValidatorBase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Configuration.Models.Validation { diff --git a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs index 751d81bad5..87fa9dc7e2 100644 --- a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs +++ b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs @@ -2,6 +2,7 @@ using System.IO; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Configuration { diff --git a/src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs b/src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs index 2d4a9a2326..d8b3e04772 100644 --- a/src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs +++ b/src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.ContentApps { diff --git a/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs index 6a18adafa7..e945f7ffd4 100644 --- a/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs +++ b/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.ContentApps { diff --git a/src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs index afa83220fc..9fc60ce111 100644 --- a/src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs +++ b/src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs @@ -4,6 +4,7 @@ using System.Linq; using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Manifest; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Dashboards { diff --git a/src/Umbraco.Core/Events/EventDefinitionBase.cs b/src/Umbraco.Core/Events/EventDefinitionBase.cs index 2ea390a455..3fc6040c71 100644 --- a/src/Umbraco.Core/Events/EventDefinitionBase.cs +++ b/src/Umbraco.Core/Events/EventDefinitionBase.cs @@ -1,5 +1,6 @@ using System; using System.Reflection; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Events { diff --git a/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs b/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs index 0534f683fb..784390ebe7 100644 --- a/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs +++ b/src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs @@ -4,6 +4,7 @@ using System.Linq; using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Events { diff --git a/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs b/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs index bf47b66f0a..90e1d03490 100644 --- a/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs +++ b/src/Umbraco.Core/Exceptions/InvalidCompositionException.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Exceptions { diff --git a/src/Umbraco.Core/AssemblyExtensions.cs b/src/Umbraco.Core/Extensions/AssemblyExtensions.cs similarity index 99% rename from src/Umbraco.Core/AssemblyExtensions.cs rename to src/Umbraco.Core/Extensions/AssemblyExtensions.cs index 037b8d6383..ab7792f319 100644 --- a/src/Umbraco.Core/AssemblyExtensions.cs +++ b/src/Umbraco.Core/Extensions/AssemblyExtensions.cs @@ -2,7 +2,7 @@ using System.IO; using System.Reflection; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class AssemblyExtensions { diff --git a/src/Umbraco.Core/ClaimsIdentityExtensions.cs b/src/Umbraco.Core/Extensions/ClaimsIdentityExtensions.cs similarity index 98% rename from src/Umbraco.Core/ClaimsIdentityExtensions.cs rename to src/Umbraco.Core/Extensions/ClaimsIdentityExtensions.cs index e5a58da9be..e3e40d7e62 100644 --- a/src/Umbraco.Core/ClaimsIdentityExtensions.cs +++ b/src/Umbraco.Core/Extensions/ClaimsIdentityExtensions.cs @@ -1,8 +1,9 @@ using System; using System.Security.Claims; using System.Security.Principal; +using Umbraco.Cms.Core; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class ClaimsIdentityExtensions { diff --git a/src/Umbraco.Core/ConfigConnectionStringExtensions.cs b/src/Umbraco.Core/Extensions/ConfigConnectionStringExtensions.cs similarity index 96% rename from src/Umbraco.Core/ConfigConnectionStringExtensions.cs rename to src/Umbraco.Core/Extensions/ConfigConnectionStringExtensions.cs index bb84e064ba..eaf5ebea06 100644 --- a/src/Umbraco.Core/ConfigConnectionStringExtensions.cs +++ b/src/Umbraco.Core/Extensions/ConfigConnectionStringExtensions.cs @@ -1,9 +1,10 @@ using System; using System.IO; using System.Linq; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class ConfigConnectionStringExtensions { diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/Extensions/ContentExtensions.cs similarity index 99% rename from src/Umbraco.Core/ContentExtensions.cs rename to src/Umbraco.Core/Extensions/ContentExtensions.cs index 3b3f11290f..02e9c0c667 100644 --- a/src/Umbraco.Core/ContentExtensions.cs +++ b/src/Umbraco.Core/Extensions/ContentExtensions.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Linq; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; @@ -10,7 +11,7 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class ContentExtensions { diff --git a/src/Umbraco.Core/ContentVariationExtensions.cs b/src/Umbraco.Core/Extensions/ContentVariationExtensions.cs similarity index 99% rename from src/Umbraco.Core/ContentVariationExtensions.cs rename to src/Umbraco.Core/Extensions/ContentVariationExtensions.cs index becf9a90bb..793b4eb68f 100644 --- a/src/Umbraco.Core/ContentVariationExtensions.cs +++ b/src/Umbraco.Core/Extensions/ContentVariationExtensions.cs @@ -1,8 +1,9 @@ using System; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides extension methods for content variations. diff --git a/src/Umbraco.Core/CacheHelperExtensions.cs b/src/Umbraco.Core/Extensions/CoreCacheHelperExtensions.cs similarity index 86% rename from src/Umbraco.Core/CacheHelperExtensions.cs rename to src/Umbraco.Core/Extensions/CoreCacheHelperExtensions.cs index fa194e7785..2b964d1fe3 100644 --- a/src/Umbraco.Core/CacheHelperExtensions.cs +++ b/src/Umbraco.Core/Extensions/CoreCacheHelperExtensions.cs @@ -1,14 +1,12 @@ using Umbraco.Cms.Core.Cache; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { - /// /// Extension methods for the cache helper /// - public static class CacheHelperExtensions + public static class CoreCacheHelperExtensions { - public const string PartialViewCacheKey = "Umbraco.Web.PartialViewCacheKey"; /// diff --git a/src/Umbraco.Core/DataTableExtensions.cs b/src/Umbraco.Core/Extensions/DataTableExtensions.cs similarity index 99% rename from src/Umbraco.Core/DataTableExtensions.cs rename to src/Umbraco.Core/Extensions/DataTableExtensions.cs index 588ecd3397..3ba181ff91 100644 --- a/src/Umbraco.Core/DataTableExtensions.cs +++ b/src/Umbraco.Core/Extensions/DataTableExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Static and extension methods for the DataTable object diff --git a/src/Umbraco.Core/DateTimeExtensions.cs b/src/Umbraco.Core/Extensions/DateTimeExtensions.cs similarity index 98% rename from src/Umbraco.Core/DateTimeExtensions.cs rename to src/Umbraco.Core/Extensions/DateTimeExtensions.cs index dcdd5db7ea..e6b4ed42aa 100644 --- a/src/Umbraco.Core/DateTimeExtensions.cs +++ b/src/Umbraco.Core/Extensions/DateTimeExtensions.cs @@ -1,11 +1,10 @@ using System; using System.Globalization; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class DateTimeExtensions { - /// /// Returns the DateTime as an ISO formatted string that is globally expectable /// diff --git a/src/Umbraco.Core/DecimalExtensions.cs b/src/Umbraco.Core/Extensions/DecimalExtensions.cs similarity index 96% rename from src/Umbraco.Core/DecimalExtensions.cs rename to src/Umbraco.Core/Extensions/DecimalExtensions.cs index 98b844308e..9b485afb27 100644 --- a/src/Umbraco.Core/DecimalExtensions.cs +++ b/src/Umbraco.Core/Extensions/DecimalExtensions.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides extension methods for System.Decimal. diff --git a/src/Umbraco.Core/DelegateExtensions.cs b/src/Umbraco.Core/Extensions/DelegateExtensions.cs similarity index 96% rename from src/Umbraco.Core/DelegateExtensions.cs rename to src/Umbraco.Core/Extensions/DelegateExtensions.cs index cd3fd94f70..db11b83ef3 100644 --- a/src/Umbraco.Core/DelegateExtensions.cs +++ b/src/Umbraco.Core/Extensions/DelegateExtensions.cs @@ -1,8 +1,9 @@ using System; using System.Diagnostics; using System.Threading; +using Umbraco.Cms.Core; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class DelegateExtensions { diff --git a/src/Umbraco.Core/DictionaryExtensions.cs b/src/Umbraco.Core/Extensions/DictionaryExtensions.cs similarity index 99% rename from src/Umbraco.Core/DictionaryExtensions.cs rename to src/Umbraco.Core/Extensions/DictionaryExtensions.cs index 85d7e05da2..2cdf8b5d4a 100644 --- a/src/Umbraco.Core/DictionaryExtensions.cs +++ b/src/Umbraco.Core/Extensions/DictionaryExtensions.cs @@ -7,8 +7,9 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; +using Umbraco.Cms.Core; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Extension methods for Dictionary & ConcurrentDictionary diff --git a/src/Umbraco.Core/EnumExtensions.cs b/src/Umbraco.Core/Extensions/EnumExtensions.cs similarity index 98% rename from src/Umbraco.Core/EnumExtensions.cs rename to src/Umbraco.Core/Extensions/EnumExtensions.cs index 5446afc4e6..240d61ba85 100644 --- a/src/Umbraco.Core/EnumExtensions.cs +++ b/src/Umbraco.Core/Extensions/EnumExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides extension methods to . diff --git a/src/Umbraco.Core/EnumerableExtensions.cs b/src/Umbraco.Core/Extensions/EnumerableExtensions.cs similarity index 99% rename from src/Umbraco.Core/EnumerableExtensions.cs rename to src/Umbraco.Core/Extensions/EnumerableExtensions.cs index fc38064b96..0e88beb6e7 100644 --- a/src/Umbraco.Core/EnumerableExtensions.cs +++ b/src/Umbraco.Core/Extensions/EnumerableExtensions.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; +using Umbraco.Cms.Core; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { - /// + /// /// Extensions for enumerable sources - /// + /// public static class EnumerableExtensions { public static bool IsCollectionEmpty(this IReadOnlyCollection list) => list == null || list.Count == 0; diff --git a/src/Umbraco.Core/ExpressionExtensions.cs b/src/Umbraco.Core/Extensions/ExpressionExtensions.cs similarity index 100% rename from src/Umbraco.Core/ExpressionExtensions.cs rename to src/Umbraco.Core/Extensions/ExpressionExtensions.cs diff --git a/src/Umbraco.Core/KeyValuePairExtensions.cs b/src/Umbraco.Core/Extensions/KeyValuePairExtensions.cs similarity index 95% rename from src/Umbraco.Core/KeyValuePairExtensions.cs rename to src/Umbraco.Core/Extensions/KeyValuePairExtensions.cs index b664a34b0a..38c86318d2 100644 --- a/src/Umbraco.Core/KeyValuePairExtensions.cs +++ b/src/Umbraco.Core/Extensions/KeyValuePairExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides extension methods for the struct. diff --git a/src/Umbraco.Core/MediaTypeExtensions.cs b/src/Umbraco.Core/Extensions/MediaTypeExtensions.cs similarity index 80% rename from src/Umbraco.Core/MediaTypeExtensions.cs rename to src/Umbraco.Core/Extensions/MediaTypeExtensions.cs index 759e71ecf0..51bb2275c4 100644 --- a/src/Umbraco.Core/MediaTypeExtensions.cs +++ b/src/Umbraco.Core/Extensions/MediaTypeExtensions.cs @@ -1,6 +1,7 @@ -using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Core; +using Umbraco.Cms.Core.Models; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class MediaTypeExtensions { diff --git a/src/Umbraco.Core/NameValueCollectionExtensions.cs b/src/Umbraco.Core/Extensions/NameValueCollectionExtensions.cs similarity index 95% rename from src/Umbraco.Core/NameValueCollectionExtensions.cs rename to src/Umbraco.Core/Extensions/NameValueCollectionExtensions.cs index 06a75e0787..bd63e6e416 100644 --- a/src/Umbraco.Core/NameValueCollectionExtensions.cs +++ b/src/Umbraco.Core/Extensions/NameValueCollectionExtensions.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using Umbraco.Cms.Core; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class NameValueCollectionExtensions { diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/Extensions/ObjectExtensions.cs similarity index 99% rename from src/Umbraco.Core/ObjectExtensions.cs rename to src/Umbraco.Core/Extensions/ObjectExtensions.cs index 8cb3d9fffa..e0f7751d32 100644 --- a/src/Umbraco.Core/ObjectExtensions.cs +++ b/src/Umbraco.Core/Extensions/ObjectExtensions.cs @@ -8,16 +8,16 @@ using System.Linq.Expressions; using System.Reflection; using System.Runtime.CompilerServices; using System.Xml; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Collections; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides object extension methods. /// public static class ObjectExtensions { - private static readonly ConcurrentDictionary NullableGenericCache = new ConcurrentDictionary(); private static readonly ConcurrentDictionary InputTypeConverterCache = new ConcurrentDictionary(); private static readonly ConcurrentDictionary DestinationTypeConverterCache = new ConcurrentDictionary(); diff --git a/src/Umbraco.Core/PasswordConfigurationExtensions.cs b/src/Umbraco.Core/Extensions/PasswordConfigurationExtensions.cs similarity index 98% rename from src/Umbraco.Core/PasswordConfigurationExtensions.cs rename to src/Umbraco.Core/Extensions/PasswordConfigurationExtensions.cs index da024986e4..b3e999d670 100644 --- a/src/Umbraco.Core/PasswordConfigurationExtensions.cs +++ b/src/Umbraco.Core/Extensions/PasswordConfigurationExtensions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Configuration; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class PasswordConfigurationExtensions { diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs similarity index 99% rename from src/Umbraco.Core/PublishedContentExtensions.cs rename to src/Umbraco.Core/Extensions/PublishedContentExtensions.cs index bc729998fb..49fbae8059 100644 --- a/src/Umbraco.Core/PublishedContentExtensions.cs +++ b/src/Umbraco.Core/Extensions/PublishedContentExtensions.cs @@ -2,15 +2,15 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; -using Umbraco.Extensions; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class PublishedContentExtensions { diff --git a/src/Umbraco.Core/PublishedElementExtensions.cs b/src/Umbraco.Core/Extensions/PublishedElementExtensions.cs similarity index 100% rename from src/Umbraco.Core/PublishedElementExtensions.cs rename to src/Umbraco.Core/Extensions/PublishedElementExtensions.cs diff --git a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs b/src/Umbraco.Core/Extensions/PublishedModelFactoryExtensions.cs similarity index 98% rename from src/Umbraco.Core/PublishedModelFactoryExtensions.cs rename to src/Umbraco.Core/Extensions/PublishedModelFactoryExtensions.cs index b4f34c6e9f..ec1f630da0 100644 --- a/src/Umbraco.Core/PublishedModelFactoryExtensions.cs +++ b/src/Umbraco.Core/Extensions/PublishedModelFactoryExtensions.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Core.Models.PublishedContent; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// Provides extension methods for . diff --git a/src/Umbraco.Core/PublishedPropertyExtension.cs b/src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs similarity index 98% rename from src/Umbraco.Core/PublishedPropertyExtension.cs rename to src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs index 9f0044cd40..ad0de3edcc 100644 --- a/src/Umbraco.Core/PublishedPropertyExtension.cs +++ b/src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs @@ -1,4 +1,5 @@ using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core { diff --git a/src/Umbraco.Core/SemVersionExtensions.cs b/src/Umbraco.Core/Extensions/SemVersionExtensions.cs similarity index 90% rename from src/Umbraco.Core/SemVersionExtensions.cs rename to src/Umbraco.Core/Extensions/SemVersionExtensions.cs index b869ff109f..e8cfcbb85b 100644 --- a/src/Umbraco.Core/SemVersionExtensions.cs +++ b/src/Umbraco.Core/Extensions/SemVersionExtensions.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Semver; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class SemVersionExtensions { diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/Extensions/StringExtensions.cs similarity index 99% rename from src/Umbraco.Core/StringExtensions.cs rename to src/Umbraco.Core/Extensions/StringExtensions.cs index 6f209edb86..84679ca175 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/Extensions/StringExtensions.cs @@ -8,10 +8,11 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Strings; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { /// /// String extension methods diff --git a/src/Umbraco.Core/ThreadExtensions.cs b/src/Umbraco.Core/Extensions/ThreadExtensions.cs similarity index 98% rename from src/Umbraco.Core/ThreadExtensions.cs rename to src/Umbraco.Core/Extensions/ThreadExtensions.cs index 2714a9b918..10e74f10be 100644 --- a/src/Umbraco.Core/ThreadExtensions.cs +++ b/src/Umbraco.Core/Extensions/ThreadExtensions.cs @@ -1,7 +1,7 @@ using System.Globalization; using System.Threading; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class ThreadExtensions { diff --git a/src/Umbraco.Core/TypeExtensions.cs b/src/Umbraco.Core/Extensions/TypeExtensions.cs similarity index 99% rename from src/Umbraco.Core/TypeExtensions.cs rename to src/Umbraco.Core/Extensions/TypeExtensions.cs index 21ec84c34a..256385d692 100644 --- a/src/Umbraco.Core/TypeExtensions.cs +++ b/src/Umbraco.Core/Extensions/TypeExtensions.cs @@ -4,10 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Strings; -namespace Umbraco.Cms.Core +namespace Umbraco.Extensions { public static class TypeExtensions { diff --git a/src/Umbraco.Core/TypeLoaderExtensions.cs b/src/Umbraco.Core/Extensions/TypeLoaderExtensions.cs similarity index 100% rename from src/Umbraco.Core/TypeLoaderExtensions.cs rename to src/Umbraco.Core/Extensions/TypeLoaderExtensions.cs diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs similarity index 100% rename from src/Umbraco.Core/UdiGetterExtensions.cs rename to src/Umbraco.Core/Extensions/UdiGetterExtensions.cs diff --git a/src/Umbraco.Core/UmbracoContextAccessorExtensions.cs b/src/Umbraco.Core/Extensions/UmbracoContextAccessorExtensions.cs similarity index 100% rename from src/Umbraco.Core/UmbracoContextAccessorExtensions.cs rename to src/Umbraco.Core/Extensions/UmbracoContextAccessorExtensions.cs diff --git a/src/Umbraco.Core/UmbracoContextExtensions.cs b/src/Umbraco.Core/Extensions/UmbracoContextExtensions.cs similarity index 100% rename from src/Umbraco.Core/UmbracoContextExtensions.cs rename to src/Umbraco.Core/Extensions/UmbracoContextExtensions.cs diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/Extensions/UriExtensions.cs similarity index 100% rename from src/Umbraco.Core/UriExtensions.cs rename to src/Umbraco.Core/Extensions/UriExtensions.cs diff --git a/src/Umbraco.Core/VersionExtensions.cs b/src/Umbraco.Core/Extensions/VersionExtensions.cs similarity index 100% rename from src/Umbraco.Core/VersionExtensions.cs rename to src/Umbraco.Core/Extensions/VersionExtensions.cs diff --git a/src/Umbraco.Core/WaitHandleExtensions.cs b/src/Umbraco.Core/Extensions/WaitHandleExtensions.cs similarity index 100% rename from src/Umbraco.Core/WaitHandleExtensions.cs rename to src/Umbraco.Core/Extensions/WaitHandleExtensions.cs diff --git a/src/Umbraco.Core/XmlExtensions.cs b/src/Umbraco.Core/Extensions/XmlExtensions.cs similarity index 99% rename from src/Umbraco.Core/XmlExtensions.cs rename to src/Umbraco.Core/Extensions/XmlExtensions.cs index c4e665ae0f..8e39d889e0 100644 --- a/src/Umbraco.Core/XmlExtensions.cs +++ b/src/Umbraco.Core/Extensions/XmlExtensions.cs @@ -6,6 +6,7 @@ using System.Xml; using System.Xml.Linq; using System.Xml.XPath; using Umbraco.Cms.Core.Xml; +using Umbraco.Extensions; namespace Umbraco.Cms.Core { diff --git a/src/Umbraco.Core/HealthChecks/Checks/AbstractSettingsCheck.cs b/src/Umbraco.Core/HealthChecks/Checks/AbstractSettingsCheck.cs index 0ea8a1f32c..d51ba38e34 100644 --- a/src/Umbraco.Core/HealthChecks/Checks/AbstractSettingsCheck.cs +++ b/src/Umbraco.Core/HealthChecks/Checks/AbstractSettingsCheck.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.HealthChecks.Checks { diff --git a/src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs b/src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs index d5e773eaf0..618b44b9b3 100644 --- a/src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs +++ b/src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.HealthChecks.Checks.Services { diff --git a/src/Umbraco.Core/HealthChecks/HealthCheck.cs b/src/Umbraco.Core/HealthChecks/HealthCheck.cs index 99414f691d..fb006d7fcf 100644 --- a/src/Umbraco.Core/HealthChecks/HealthCheck.cs +++ b/src/Umbraco.Core/HealthChecks/HealthCheck.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using System.Threading.Tasks; using Umbraco.Cms.Core.Composing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.HealthChecks { diff --git a/src/Umbraco.Core/HealthChecks/HealthCheckResults.cs b/src/Umbraco.Core/HealthChecks/HealthCheckResults.cs index c3228bd3d4..dd073f32f5 100644 --- a/src/Umbraco.Core/HealthChecks/HealthCheckResults.cs +++ b/src/Umbraco.Core/HealthChecks/HealthCheckResults.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.HealthChecks { diff --git a/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs b/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs index 4cd8d373e6..51e31b1811 100644 --- a/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs +++ b/src/Umbraco.Core/HealthChecks/NotificationMethods/EmailNotificationMethod.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Mail; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.HealthChecks.NotificationMethods { diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index 6601cba474..56db480632 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reflection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.IO { diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs index 673313bf44..6d598941c5 100644 --- a/src/Umbraco.Core/IO/MediaFileSystem.cs +++ b/src/Umbraco.Core/IO/MediaFileSystem.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.IO { diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index 90ff4667ad..898a7f0ce4 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.IO { diff --git a/src/Umbraco.Core/IO/ShadowWrapper.cs b/src/Umbraco.Core/IO/ShadowWrapper.cs index 3442540657..cda61cf7b5 100644 --- a/src/Umbraco.Core/IO/ShadowWrapper.cs +++ b/src/Umbraco.Core/IO/ShadowWrapper.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.IO { diff --git a/src/Umbraco.Core/IO/ViewHelper.cs b/src/Umbraco.Core/IO/ViewHelper.cs index 028ba7658b..704d95eb92 100644 --- a/src/Umbraco.Core/IO/ViewHelper.cs +++ b/src/Umbraco.Core/IO/ViewHelper.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Text; using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.IO { diff --git a/src/Umbraco.Core/Install/InstallStatusTracker.cs b/src/Umbraco.Core/Install/InstallStatusTracker.cs index 844745900e..66b05d0fe1 100644 --- a/src/Umbraco.Core/Install/InstallStatusTracker.cs +++ b/src/Umbraco.Core/Install/InstallStatusTracker.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Install.Models; using Umbraco.Cms.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Install { diff --git a/src/Umbraco.Core/Install/Models/InstallSetupStep.cs b/src/Umbraco.Core/Install/Models/InstallSetupStep.cs index 64e0a5761d..8bfe1d75ec 100644 --- a/src/Umbraco.Core/Install/Models/InstallSetupStep.cs +++ b/src/Umbraco.Core/Install/Models/InstallSetupStep.cs @@ -1,6 +1,7 @@ using System; using System.Runtime.Serialization; using System.Threading.Tasks; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Install.Models { diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs index 4f27f2f898..d865bb01aa 100644 --- a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs +++ b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Manifest { diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs index 90ee165889..26c54a8b5e 100644 --- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs +++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Manifest { diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs index 3361fceb2d..42efa9b007 100644 --- a/src/Umbraco.Core/Mapping/UmbracoMapper.cs +++ b/src/Umbraco.Core/Mapping/UmbracoMapper.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Exceptions; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Mapping { diff --git a/src/Umbraco.Core/Media/ImageUrlGeneratorExtensions.cs b/src/Umbraco.Core/Media/ImageUrlGeneratorExtensions.cs index fb3171d6cc..aa196609a6 100644 --- a/src/Umbraco.Core/Media/ImageUrlGeneratorExtensions.cs +++ b/src/Umbraco.Core/Media/ImageUrlGeneratorExtensions.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Media { diff --git a/src/Umbraco.Core/Media/UploadAutoFillProperties.cs b/src/Umbraco.Core/Media/UploadAutoFillProperties.cs index 101bd9c4d0..105b0ce074 100644 --- a/src/Umbraco.Core/Media/UploadAutoFillProperties.cs +++ b/src/Umbraco.Core/Media/UploadAutoFillProperties.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Media { diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs index 20b5b806d2..1b4f939d16 100644 --- a/src/Umbraco.Core/Models/Content.cs +++ b/src/Umbraco.Core/Models/Content.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs index 15c53d7ebb..139cfca1ee 100644 --- a/src/Umbraco.Core/Models/ContentBase.cs +++ b/src/Umbraco.Core/Models/ContentBase.cs @@ -5,6 +5,7 @@ using System.Diagnostics; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentEditing/CodeFileDisplay.cs b/src/Umbraco.Core/Models/ContentEditing/CodeFileDisplay.cs index 4f36e3f7b8..49dfa9dd22 100644 --- a/src/Umbraco.Core/Models/ContentEditing/CodeFileDisplay.cs +++ b/src/Umbraco.Core/Models/ContentEditing/CodeFileDisplay.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/ContentTypeBasic.cs b/src/Umbraco.Core/Models/ContentEditing/ContentTypeBasic.cs index 2ee5829aca..dc3e455fb0 100644 --- a/src/Umbraco.Core/Models/ContentEditing/ContentTypeBasic.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ContentTypeBasic.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/ContentTypeSave.cs b/src/Umbraco.Core/Models/ContentEditing/ContentTypeSave.cs index 82d48f605f..a45c4ac4f6 100644 --- a/src/Umbraco.Core/Models/ContentEditing/ContentTypeSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/ContentTypeSave.cs @@ -2,6 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/DocumentTypeSave.cs b/src/Umbraco.Core/Models/ContentEditing/DocumentTypeSave.cs index d216cb5504..d446c19273 100644 --- a/src/Umbraco.Core/Models/ContentEditing/DocumentTypeSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/DocumentTypeSave.cs @@ -2,6 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs b/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs index 4aa5e6e2ac..6b5c0096a0 100644 --- a/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MemberSave.cs @@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Validation; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/MessagesExtensions.cs b/src/Umbraco.Core/Models/ContentEditing/MessagesExtensions.cs index 1d72edfe94..2687691368 100644 --- a/src/Umbraco.Core/Models/ContentEditing/MessagesExtensions.cs +++ b/src/Umbraco.Core/Models/ContentEditing/MessagesExtensions.cs @@ -1,4 +1,5 @@ using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/UserGroupPermissionsSave.cs b/src/Umbraco.Core/Models/ContentEditing/UserGroupPermissionsSave.cs index a22b3347fe..ae5b4805a7 100644 --- a/src/Umbraco.Core/Models/ContentEditing/UserGroupPermissionsSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/UserGroupPermissionsSave.cs @@ -2,6 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/UserGroupSave.cs b/src/Umbraco.Core/Models/ContentEditing/UserGroupSave.cs index 3c3fbeab10..7d24378494 100644 --- a/src/Umbraco.Core/Models/ContentEditing/UserGroupSave.cs +++ b/src/Umbraco.Core/Models/ContentEditing/UserGroupSave.cs @@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentEditing/UserInvite.cs b/src/Umbraco.Core/Models/ContentEditing/UserInvite.cs index 685e5241f2..6eb5c12ddf 100644 --- a/src/Umbraco.Core/Models/ContentEditing/UserInvite.cs +++ b/src/Umbraco.Core/Models/ContentEditing/UserInvite.cs @@ -5,6 +5,7 @@ using System.Runtime.Serialization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.ContentEditing { diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs index ba191f8547..5a62169265 100644 --- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs +++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentSchedule.cs b/src/Umbraco.Core/Models/ContentSchedule.cs index 27a9d46434..ce4686a7b1 100644 --- a/src/Umbraco.Core/Models/ContentSchedule.cs +++ b/src/Umbraco.Core/Models/ContentSchedule.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Core/Models/ContentScheduleCollection.cs index 7018ff9741..34e1dcea3f 100644 --- a/src/Umbraco.Core/Models/ContentScheduleCollection.cs +++ b/src/Umbraco.Core/Models/ContentScheduleCollection.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs index ee00f351e6..9a0e1a6854 100644 --- a/src/Umbraco.Core/Models/ContentType.cs +++ b/src/Umbraco.Core/Models/ContentType.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs index 558c93df27..2bda8d5751 100644 --- a/src/Umbraco.Core/Models/ContentTypeBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeBase.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/CultureImpact.cs b/src/Umbraco.Core/Models/CultureImpact.cs index a913811a8e..1f8e938c63 100644 --- a/src/Umbraco.Core/Models/CultureImpact.cs +++ b/src/Umbraco.Core/Models/CultureImpact.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs index eaeeff530c..2bd4d3db6f 100644 --- a/src/Umbraco.Core/Models/DictionaryItem.cs +++ b/src/Umbraco.Core/Models/DictionaryItem.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/EntityExtensions.cs b/src/Umbraco.Core/Models/EntityExtensions.cs index ea37f1e5ec..24169b6311 100644 --- a/src/Umbraco.Core/Models/EntityExtensions.cs +++ b/src/Umbraco.Core/Models/EntityExtensions.cs @@ -1,4 +1,5 @@ using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs index 1195b46801..7fd60b98f0 100644 --- a/src/Umbraco.Core/Models/Macro.cs +++ b/src/Umbraco.Core/Models/Macro.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/MacroPropertyCollection.cs b/src/Umbraco.Core/Models/MacroPropertyCollection.cs index 915bbb8091..f2f0b6520f 100644 --- a/src/Umbraco.Core/Models/MacroPropertyCollection.cs +++ b/src/Umbraco.Core/Models/MacroPropertyCollection.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Cms.Core.Collections; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Mapping/CommonMapper.cs b/src/Umbraco.Core/Models/Mapping/CommonMapper.cs index 7fa105582a..b6a220e04c 100644 --- a/src/Umbraco.Core/Models/Mapping/CommonMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/CommonMapper.cs @@ -7,6 +7,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; using UserProfile = Umbraco.Cms.Core.Models.ContentEditing.UserProfile; namespace Umbraco.Cms.Core.Models.Mapping diff --git a/src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs index 36646c559d..0b4ade6328 100644 --- a/src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/ContentSavedStateMapper.cs b/src/Umbraco.Core/Models/Mapping/ContentSavedStateMapper.cs index 0e0e1bf79d..a087ce0d3e 100644 --- a/src/Umbraco.Core/Models/Mapping/ContentSavedStateMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/ContentSavedStateMapper.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs index d7ab5e1c35..162032216d 100644 --- a/src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs +++ b/src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs @@ -12,6 +12,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs b/src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs index 9593f6f20c..ddc7add7ed 100644 --- a/src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/ContentVariantMapper.cs @@ -4,6 +4,7 @@ using System.Linq; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs index 0c2bbba98f..c1b60d7d9c 100644 --- a/src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs +++ b/src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs index dfcb9d167a..e54203619e 100644 --- a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs @@ -9,6 +9,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs index 2a1d96a147..4545414e51 100644 --- a/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/PropertyTypeGroupMapper.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/RelationMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/RelationMapDefinition.cs index 88706f6be2..cddb862d50 100644 --- a/src/Umbraco.Core/Models/Mapping/RelationMapDefinition.cs +++ b/src/Umbraco.Core/Models/Mapping/RelationMapDefinition.cs @@ -1,6 +1,7 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs b/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs index 91e4e71875..3716767b3d 100644 --- a/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Dictionary; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs index 2136590120..3631629c7b 100644 --- a/src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs +++ b/src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs @@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Sections; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Mapping { diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs index b442407c12..455aa44c13 100644 --- a/src/Umbraco.Core/Models/Member.cs +++ b/src/Umbraco.Core/Models/Member.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; using Microsoft.Extensions.Logging; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs index c24a88185a..b55c598cac 100644 --- a/src/Umbraco.Core/Models/MemberType.cs +++ b/src/Umbraco.Core/Models/MemberType.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs index f5b5869c9c..3a9dae19d2 100644 --- a/src/Umbraco.Core/Models/Membership/User.cs +++ b/src/Umbraco.Core/Models/Membership/User.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Membership { diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs index c22b27e27d..0c5f4a7d66 100644 --- a/src/Umbraco.Core/Models/Membership/UserGroup.cs +++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Membership { diff --git a/src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs b/src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs index 6b098da0e6..874dc57d2d 100644 --- a/src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs +++ b/src/Umbraco.Core/Models/PartialViewMacroModelExtensions.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Cms.Core.Models +using Umbraco.Extensions; + +namespace Umbraco.Cms.Core.Models { /// /// Extension methods for the PartialViewMacroModel object diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs index f5063b73d4..00a774cc25 100644 --- a/src/Umbraco.Core/Models/Property.cs +++ b/src/Umbraco.Core/Models/Property.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs index 63cbe7c33b..593e163e03 100644 --- a/src/Umbraco.Core/Models/PropertyCollection.cs +++ b/src/Umbraco.Core/Models/PropertyCollection.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs index 750e50a8b1..e086839304 100644 --- a/src/Umbraco.Core/Models/PropertyGroup.cs +++ b/src/Umbraco.Core/Models/PropertyGroup.cs @@ -3,6 +3,7 @@ using System.Collections.Specialized; using System.Diagnostics; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs index fbe7df8004..29e3dd6f33 100644 --- a/src/Umbraco.Core/Models/PropertyType.cs +++ b/src/Umbraco.Core/Models/PropertyType.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs index edc0b47097..7c57b8281f 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.PublishedContent { diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs index da784357cb..b48c13f21f 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.PublishedContent { diff --git a/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs b/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs index be17ae98c2..78825053e0 100644 --- a/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs +++ b/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Cms.Core.Models.PublishedContent +using Umbraco.Extensions; + +namespace Umbraco.Cms.Core.Models.PublishedContent { public static class VariationContextAccessorExtensions { @@ -14,7 +16,10 @@ // use context values var publishedVariationContext = variationContextAccessor?.VariationContext; - if (culture == null) culture = variations.VariesByCulture() ? publishedVariationContext?.Culture : ""; + if (culture == null) + { + culture = variations.VariesByCulture() ? publishedVariationContext?.Culture : ""; + } if (segment == null) { diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs index b45956c722..5aa926bdaa 100644 --- a/src/Umbraco.Core/Models/ServerRegistration.cs +++ b/src/Umbraco.Core/Models/ServerRegistration.cs @@ -1,6 +1,7 @@ using System; using System.Globalization; using Umbraco.Cms.Core.Models.Entities; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs index 8cd93a8d69..56ea073b91 100644 --- a/src/Umbraco.Core/Models/SimpleContentType.cs +++ b/src/Umbraco.Core/Models/SimpleContentType.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Stylesheet.cs b/src/Umbraco.Core/Models/Stylesheet.cs index 3b84a5e1bf..6d796f66d7 100644 --- a/src/Umbraco.Core/Models/Stylesheet.cs +++ b/src/Umbraco.Core/Models/Stylesheet.cs @@ -5,6 +5,7 @@ using System.Data; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Strings.Css; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs index 497c421161..bd90060ce7 100644 --- a/src/Umbraco.Core/Models/Template.cs +++ b/src/Umbraco.Core/Models/Template.cs @@ -1,6 +1,7 @@ using System; using System.Runtime.Serialization; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/Trees/ActionMenuItem.cs b/src/Umbraco.Core/Models/Trees/ActionMenuItem.cs index 654a5bb714..2f05541c19 100644 --- a/src/Umbraco.Core/Models/Trees/ActionMenuItem.cs +++ b/src/Umbraco.Core/Models/Trees/ActionMenuItem.cs @@ -1,4 +1,5 @@ using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Trees { diff --git a/src/Umbraco.Core/Models/Trees/MenuItem.cs b/src/Umbraco.Core/Models/Trees/MenuItem.cs index a309807c0f..4c275709aa 100644 --- a/src/Umbraco.Core/Models/Trees/MenuItem.cs +++ b/src/Umbraco.Core/Models/Trees/MenuItem.cs @@ -5,6 +5,7 @@ using System.Threading; using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models.Trees { diff --git a/src/Umbraco.Core/Models/UmbracoUserExtensions.cs b/src/Umbraco.Core/Models/UmbracoUserExtensions.cs index 0c2a4f7ec9..699f544130 100644 --- a/src/Umbraco.Core/Models/UmbracoUserExtensions.cs +++ b/src/Umbraco.Core/Models/UmbracoUserExtensions.cs @@ -5,6 +5,7 @@ using System.Linq; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs index 501c8c3267..e944107f3f 100644 --- a/src/Umbraco.Core/Models/UserExtensions.cs +++ b/src/Umbraco.Core/Models/UserExtensions.cs @@ -10,6 +10,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Models { diff --git a/src/Umbraco.Core/NetworkHelper.cs b/src/Umbraco.Core/NetworkHelper.cs index 69acb962c4..8e1bfaea92 100644 --- a/src/Umbraco.Core/NetworkHelper.cs +++ b/src/Umbraco.Core/NetworkHelper.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Extensions; namespace Umbraco.Cms.Core { diff --git a/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs b/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs index 8a0c7f8baa..2838a2678d 100644 --- a/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs +++ b/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs @@ -6,6 +6,7 @@ using System.Xml.Linq; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Packaging; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Packaging { diff --git a/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs b/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs index 63cbca30c0..3ba47f09c0 100644 --- a/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs +++ b/src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Xml.Linq; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Configuration; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Packaging { diff --git a/src/Umbraco.Core/Packaging/PackageExtraction.cs b/src/Umbraco.Core/Packaging/PackageExtraction.cs index b932a66a33..fddf9f4d1a 100644 --- a/src/Umbraco.Core/Packaging/PackageExtraction.cs +++ b/src/Umbraco.Core/Packaging/PackageExtraction.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Packaging { diff --git a/src/Umbraco.Core/Packaging/PackageFileInstallation.cs b/src/Umbraco.Core/Packaging/PackageFileInstallation.cs index 3e5a710628..c9feccb6b5 100644 --- a/src/Umbraco.Core/Packaging/PackageFileInstallation.cs +++ b/src/Umbraco.Core/Packaging/PackageFileInstallation.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Packaging; using File = System.IO.File; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Packaging { diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs index 063ff9fb0c..904f73ab93 100644 --- a/src/Umbraco.Core/Packaging/PackagesRepository.cs +++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs @@ -13,6 +13,7 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Packaging; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; using File = System.IO.File; namespace Umbraco.Cms.Core.Packaging diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs index 4b2d044556..d4f1d84984 100644 --- a/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Umbraco.Cms.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs index be5d641d71..8b7abfafe6 100644 --- a/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs +++ b/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs index 6845db7f74..de011c6555 100644 --- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs index d39d0c2f87..2415f48907 100644 --- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs @@ -12,6 +12,7 @@ using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/DateValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DateValueEditor.cs index 311f1fa9fe..2cb9c0f887 100644 --- a/src/Umbraco.Core/PropertyEditors/DateValueEditor.cs +++ b/src/Umbraco.Core/PropertyEditors/DateValueEditor.cs @@ -4,6 +4,7 @@ using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs index f9317e4bd1..b70a1be851 100644 --- a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs +++ b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs index 240a38aa00..45a2dc51bb 100644 --- a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs +++ b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Composing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs index d7d4b98846..53353c878a 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyEditorTagsExtensions.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Cms.Core.PropertyEditors +using Umbraco.Extensions; + +namespace Umbraco.Cms.Core.PropertyEditors { /// /// Provides extension methods for the interface to manage tags. diff --git a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs index 15259bd4fa..136967e7ab 100644 --- a/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs +++ b/src/Umbraco.Core/PropertyEditors/PropertyValueConverterCollection.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Composing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors { diff --git a/src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs index 2e0c7af3fe..69c004376d 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.Validators { diff --git a/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs index 2341dc4957..7393603f85 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.Validators { diff --git a/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs index 9447ccfe95..7ed9a7b56d 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.Validators { diff --git a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs index f272a485ba..3a7ec2b934 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.Validators { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs index c577ebeaf1..c3fa110adb 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/CheckboxListValueConverter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs index 09d141c137..7a7f26ebe9 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs index a5e2610a79..831d574d20 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs @@ -1,6 +1,7 @@ using System; using System.Xml; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs index 94175e7be9..668afe65bf 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/EmailAddressValueConverter.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs index e64d0ad0cf..a27ef9cb49 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs index 213b02a805..61b8a27f24 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs index 7d4d2beeb8..cd8f203cb9 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs @@ -2,6 +2,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs index 8a0447a978..4a00f20737 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs index 342addc93d..f2b41dd139 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/RadioButtonListValueConverter.cs @@ -1,5 +1,6 @@ using System; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs index 410500eff1..a1f3f82f43 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs @@ -3,6 +3,7 @@ using System.Collections.Concurrent; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs index 82387d9b0b..d9c7cbeb75 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs b/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs index 0f47580f8c..e9e5177c17 100644 --- a/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs +++ b/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Xml.XPath; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Xml; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PublishedCache { diff --git a/src/Umbraco.Core/PublishedCache/PublishedMember.cs b/src/Umbraco.Core/PublishedCache/PublishedMember.cs index 2353a04e7d..f5926cf639 100644 --- a/src/Umbraco.Core/PublishedCache/PublishedMember.cs +++ b/src/Umbraco.Core/PublishedCache/PublishedMember.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.PublishedCache { diff --git a/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs index 0d0f28a301..93448c02cf 100644 --- a/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs +++ b/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs @@ -4,6 +4,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs index f418eb930c..2e5515fef2 100644 --- a/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs +++ b/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs @@ -5,6 +5,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/DomainAndUri.cs b/src/Umbraco.Core/Routing/DomainAndUri.cs index 58220ab9fd..751c4ead58 100644 --- a/src/Umbraco.Core/Routing/DomainAndUri.cs +++ b/src/Umbraco.Core/Routing/DomainAndUri.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/DomainUtilities.cs b/src/Umbraco.Core/Routing/DomainUtilities.cs index c32be9034f..a6cd90a3c2 100644 --- a/src/Umbraco.Core/Routing/DomainUtilities.cs +++ b/src/Umbraco.Core/Routing/DomainUtilities.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/SiteDomainHelper.cs b/src/Umbraco.Core/Routing/SiteDomainHelper.cs index 1daa357e04..5b475f72e8 100644 --- a/src/Umbraco.Core/Routing/SiteDomainHelper.cs +++ b/src/Umbraco.Core/Routing/SiteDomainHelper.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Threading; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs b/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs index a7af09c809..084b9b47e3 100644 --- a/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs +++ b/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/UriUtility.cs b/src/Umbraco.Core/Routing/UriUtility.cs index 963261b502..4d349021c4 100644 --- a/src/Umbraco.Core/Routing/UriUtility.cs +++ b/src/Umbraco.Core/Routing/UriUtility.cs @@ -2,6 +2,7 @@ using System; using System.Text; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Routing/UrlProvider.cs b/src/Umbraco.Core/Routing/UrlProvider.cs index 20d78c7fa5..c3f294fbdb 100644 --- a/src/Umbraco.Core/Routing/UrlProvider.cs +++ b/src/Umbraco.Core/Routing/UrlProvider.cs @@ -5,10 +5,10 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { - /// /// Provides URLs. /// diff --git a/src/Umbraco.Core/Routing/UrlProviderExtensions.cs b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs index 0fa56855dd..80f17e3c12 100644 --- a/src/Umbraco.Core/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs @@ -3,12 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -namespace Umbraco.Cms.Core.Routing +namespace Umbraco.Extensions { public static class UrlProviderExtensions { diff --git a/src/Umbraco.Core/Routing/WebPath.cs b/src/Umbraco.Core/Routing/WebPath.cs index 253cd20f15..503cbb27fd 100644 --- a/src/Umbraco.Core/Routing/WebPath.cs +++ b/src/Umbraco.Core/Routing/WebPath.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Routing { diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs index 864e05e443..187a1f377c 100644 --- a/src/Umbraco.Core/Runtime/MainDom.cs +++ b/src/Umbraco.Core/Runtime/MainDom.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Runtime { diff --git a/src/Umbraco.Core/Security/ClaimsPrincipalExtensions.cs b/src/Umbraco.Core/Security/ClaimsPrincipalExtensions.cs index c74dd15f76..a98ea012c4 100644 --- a/src/Umbraco.Core/Security/ClaimsPrincipalExtensions.cs +++ b/src/Umbraco.Core/Security/ClaimsPrincipalExtensions.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Security.Claims; using System.Security.Principal; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Security { diff --git a/src/Umbraco.Core/Security/LegacyPasswordSecurity.cs b/src/Umbraco.Core/Security/LegacyPasswordSecurity.cs index 780f5d7aaa..bf56c3161d 100644 --- a/src/Umbraco.Core/Security/LegacyPasswordSecurity.cs +++ b/src/Umbraco.Core/Security/LegacyPasswordSecurity.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Security.Cryptography; using System.Text; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Security { diff --git a/src/Umbraco.Core/Security/PasswordGenerator.cs b/src/Umbraco.Core/Security/PasswordGenerator.cs index 4d8ff77980..1347d77ab7 100644 --- a/src/Umbraco.Core/Security/PasswordGenerator.cs +++ b/src/Umbraco.Core/Security/PasswordGenerator.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Security.Cryptography; using Umbraco.Cms.Core.Configuration; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Security { diff --git a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs index 1d4fa9a483..a09506b610 100644 --- a/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs +++ b/src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Security { diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs index 42bafc83a0..34d0abdb43 100644 --- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs +++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text.RegularExpressions; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs index 30e744a0f7..088c1a0048 100644 --- a/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs +++ b/src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/DashboardService.cs b/src/Umbraco.Core/Services/DashboardService.cs index b8a18d08f2..3f806bcc43 100644 --- a/src/Umbraco.Core/Services/DashboardService.cs +++ b/src/Umbraco.Core/Services/DashboardService.cs @@ -4,6 +4,7 @@ using System.Linq; using Umbraco.Cms.Core.Dashboards; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs index f1cd675127..980700b56b 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs +++ b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Threading; using Umbraco.Cms.Core.Dictionary; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/Ordering.cs b/src/Umbraco.Core/Services/Ordering.cs index a1f7be4d32..7a843191d3 100644 --- a/src/Umbraco.Core/Services/Ordering.cs +++ b/src/Umbraco.Core/Services/Ordering.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Cms.Core.Services +using Umbraco.Extensions; + +namespace Umbraco.Cms.Core.Services { /// /// Represents ordering information. diff --git a/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs b/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs index 5aa7c6de2f..da79bdb89e 100644 --- a/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs +++ b/src/Umbraco.Core/Services/PublicAccessServiceExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/TreeService.cs b/src/Umbraco.Core/Services/TreeService.cs index fd99284f03..9dbe5edb4f 100644 --- a/src/Umbraco.Core/Services/TreeService.cs +++ b/src/Umbraco.Core/Services/TreeService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Trees; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Services/UserServiceExtensions.cs b/src/Umbraco.Core/Services/UserServiceExtensions.cs index 39361f9117..e3a7e298a4 100644 --- a/src/Umbraco.Core/Services/UserServiceExtensions.cs +++ b/src/Umbraco.Core/Services/UserServiceExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services { diff --git a/src/Umbraco.Core/Strings/Css/StylesheetHelper.cs b/src/Umbraco.Core/Strings/Css/StylesheetHelper.cs index 4297d24809..51dffe5ab9 100644 --- a/src/Umbraco.Core/Strings/Css/StylesheetHelper.cs +++ b/src/Umbraco.Core/Strings/Css/StylesheetHelper.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Strings.Css { diff --git a/src/Umbraco.Core/Strings/Css/StylesheetRule.cs b/src/Umbraco.Core/Strings/Css/StylesheetRule.cs index 6027108b2b..c132c5d592 100644 --- a/src/Umbraco.Core/Strings/Css/StylesheetRule.cs +++ b/src/Umbraco.Core/Strings/Css/StylesheetRule.cs @@ -1,5 +1,6 @@ using System; using System.Text; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Strings.Css { diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs index 167d3c6df9..558e1af75c 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Strings { diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs index 9b7f5598ca..cf5e71a568 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Strings { diff --git a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs index 8a89cfb909..a266b52f6b 100644 --- a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs +++ b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs @@ -1,4 +1,5 @@ using Umbraco.Cms.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Strings { diff --git a/src/Umbraco.Core/Templates/HtmlImageSourceParser.cs b/src/Umbraco.Core/Templates/HtmlImageSourceParser.cs index 37316bf3c3..c14a7a7bdf 100644 --- a/src/Umbraco.Core/Templates/HtmlImageSourceParser.cs +++ b/src/Umbraco.Core/Templates/HtmlImageSourceParser.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using Umbraco.Cms.Core.Routing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Templates { diff --git a/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs b/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs index 4ac448b769..510fa70bcf 100644 --- a/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs +++ b/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Templates { diff --git a/src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs b/src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs index b3f86f1c73..61f10cc96d 100644 --- a/src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs +++ b/src/Umbraco.Core/Tour/TourFilterCollectionBuilder.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using Umbraco.Cms.Core.Composing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Tour { diff --git a/src/Umbraco.Core/Trees/SearchableTreeCollection.cs b/src/Umbraco.Core/Trees/SearchableTreeCollection.cs index 3dc726cab3..8f1b20a7b1 100644 --- a/src/Umbraco.Core/Trees/SearchableTreeCollection.cs +++ b/src/Umbraco.Core/Trees/SearchableTreeCollection.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Trees { diff --git a/src/Umbraco.Core/Trees/TreeNode.cs b/src/Umbraco.Core/Trees/TreeNode.cs index 1eab512ea9..c09f7559ca 100644 --- a/src/Umbraco.Core/Trees/TreeNode.cs +++ b/src/Umbraco.Core/Trees/TreeNode.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Trees { diff --git a/src/Umbraco.Core/UdiParserServiceConnectors.cs b/src/Umbraco.Core/UdiParserServiceConnectors.cs index 4163eea0c3..320cc9a901 100644 --- a/src/Umbraco.Core/UdiParserServiceConnectors.cs +++ b/src/Umbraco.Core/UdiParserServiceConnectors.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Deploy; +using Umbraco.Extensions; namespace Umbraco.Cms.Core { diff --git a/src/Umbraco.Core/UriUtilityCore.cs b/src/Umbraco.Core/UriUtilityCore.cs index 4b1dd3db1d..8716865a9e 100644 --- a/src/Umbraco.Core/UriUtilityCore.cs +++ b/src/Umbraco.Core/UriUtilityCore.cs @@ -1,4 +1,5 @@ using System; +using Umbraco.Extensions; namespace Umbraco.Cms.Core { diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs index f453551cb5..d6edc76605 100644 --- a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs +++ b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs @@ -9,11 +9,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Examine diff --git a/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs b/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs index e130c9fc0f..2d1412565a 100644 --- a/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs +++ b/src/Umbraco.Examine.Lucene/LuceneFileSystemDirectoryFactory.cs @@ -1,19 +1,16 @@ -using Umbraco.Core.Configuration; -using Umbraco.Core; -using Lucene.Net.Store; +using System; using System.IO; -using System; using Examine.LuceneEngine.Directories; +using Lucene.Net.Store; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Examine { - public class LuceneFileSystemDirectoryFactory : ILuceneDirectoryFactory { private readonly ITypeFinder _typeFinder; diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs index 209c0e879b..4c7a1ba687 100644 --- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs +++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; -using Microsoft.Extensions.Logging; using Examine.LuceneEngine.Providers; -using Umbraco.Core; using Lucene.Net.Store; -using System.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs b/src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs index d324e34fe5..7eaf00e2c3 100644 --- a/src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs +++ b/src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Cache { diff --git a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs index 3328cd36e5..56fd755d24 100644 --- a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs +++ b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs @@ -4,12 +4,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Events; +using Umbraco.Extensions; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs b/src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs index c021aaef12..7ba25b8cb8 100644 --- a/src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs +++ b/src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; 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 { diff --git a/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs b/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs index 23f7b922ba..a4f2f625a8 100644 --- a/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs +++ b/src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs @@ -6,9 +6,9 @@ using Newtonsoft.Json.Linq; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Models.Blocks; -using Umbraco.Core; using Umbraco.Core.Models.Blocks; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Compose diff --git a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs index ced81fe342..c173d2cb89 100644 --- a/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs +++ b/src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs @@ -3,14 +3,13 @@ using System.Linq; using Newtonsoft.Json.Linq; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; -using Umbraco.Core; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; using Umbraco.Web.PropertyEditors; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Compose { - /// /// A component for NestedContent used to bind to events /// diff --git a/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs b/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs index 34c970a8c5..fb196c7981 100644 --- a/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs +++ b/src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs @@ -1,12 +1,10 @@ using System; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; namespace Umbraco.Web.Compose { diff --git a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs index 79e4cb4060..81c333cbbc 100644 --- a/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs +++ b/src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs @@ -1,14 +1,11 @@ using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; namespace Umbraco.Core.Compose { diff --git a/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs index a2ad7fc0c1..d014ab4728 100644 --- a/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs @@ -3,13 +3,10 @@ using Examine; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Examine { - /// public abstract class BaseValueSetBuilder : IValueSetBuilder where TContent : IContentBase diff --git a/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs index 894ad0daac..220f8197d2 100644 --- a/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs @@ -1,17 +1,14 @@ -using Examine; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using Examine; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs index 72b21342e3..af40ddc4a0 100644 --- a/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs +++ b/src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Linq; using Examine; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Examine diff --git a/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs b/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs index aff0b3f382..36c3caa6d5 100644 --- a/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs +++ b/src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs @@ -4,7 +4,7 @@ using System.Linq; using Examine; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs index e82b9be0e8..3fb1ab7747 100644 --- a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs @@ -1,7 +1,7 @@ using System; -using Examine; using System.Collections.Generic; using System.Linq; +using Examine; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -9,12 +9,8 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; -using Umbraco.Core.Services; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Examine diff --git a/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs index d4ee549b76..d4c47011ac 100644 --- a/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs @@ -1,12 +1,10 @@ -using Examine; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using Examine; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs index be26a3509c..8efabacc59 100644 --- a/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs +++ b/src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs @@ -1,9 +1,8 @@ -using Examine; -using Examine.Search; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Examine; +using Examine.Search; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs b/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs index c4652a97f1..688ccec345 100644 --- a/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs +++ b/src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; using Examine; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Examine { diff --git a/src/Umbraco.Infrastructure/HostedServices/KeepAlive.cs b/src/Umbraco.Infrastructure/HostedServices/KeepAlive.cs index 0de0d20e19..29514b1885 100644 --- a/src/Umbraco.Infrastructure/HostedServices/KeepAlive.cs +++ b/src/Umbraco.Infrastructure/HostedServices/KeepAlive.cs @@ -6,15 +6,12 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Sync; +using Umbraco.Extensions; namespace Umbraco.Infrastructure.HostedServices { diff --git a/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs b/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs index 108e344cc0..69bc9cffe4 100644 --- a/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs +++ b/src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs @@ -1,16 +1,14 @@ -using Newtonsoft.Json; -using System; +using System; using System.Net.Http; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; +using Newtonsoft.Json; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Infrastructure.HostedServices; namespace Umbraco.Web.Telemetry diff --git a/src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs b/src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs index 2968966a02..16bd3688b2 100644 --- a/src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs +++ b/src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs @@ -9,8 +9,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Infrastructure.HostedServices.ServerRegistration { diff --git a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs index c7ff222068..22dd3d4276 100644 --- a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs @@ -7,12 +7,11 @@ using System.IO; using System.Linq; using System.Security.AccessControl; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Install; using Umbraco.Cms.Core.IO; -using Umbraco.Core; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Infrastructure.Install diff --git a/src/Umbraco.Infrastructure/Install/InstallHelper.cs b/src/Umbraco.Infrastructure/Install/InstallHelper.cs index d4d1e71af0..291bd50a05 100644 --- a/src/Umbraco.Infrastructure/Install/InstallHelper.cs +++ b/src/Umbraco.Infrastructure/Install/InstallHelper.cs @@ -4,13 +4,6 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Migrations.Install; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; @@ -20,6 +13,9 @@ using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; +using Umbraco.Core.Migrations.Install; +using Umbraco.Core.Persistence; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Install diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs index 9ae02d7046..9fb12ca40b 100644 --- a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs +++ b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs @@ -9,6 +9,7 @@ using Umbraco.Cms.Core.Install; using Umbraco.Cms.Core.Install.Models; using Umbraco.Core; using Umbraco.Core.Migrations.Install; +using Umbraco.Extensions; namespace Umbraco.Web.Install.InstallSteps { diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseUpgradeStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseUpgradeStep.cs index d5952352dc..a822331c55 100644 --- a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseUpgradeStep.cs +++ b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseUpgradeStep.cs @@ -13,6 +13,7 @@ using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Migrations.Upgrade; +using Umbraco.Extensions; using Umbraco.Web.Migrations.PostMigrations; namespace Umbraco.Web.Install.InstallSteps diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs index 7cac6d43fa..3b1f39b77a 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs @@ -7,10 +7,10 @@ using Serilog.Core; using Serilog.Events; using Serilog.Formatting; using Serilog.Formatting.Compact; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Core.Logging.Serilog.Enrichers; +using Umbraco.Extensions; namespace Umbraco.Core.Logging.Serilog { diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs index 724c960d3d..c71096e688 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs @@ -3,9 +3,9 @@ using System.IO; using Microsoft.Extensions.Configuration; using Serilog; using Serilog.Events; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; +using Umbraco.Extensions; using LogLevel = Umbraco.Cms.Core.Logging.LogLevel; namespace Umbraco.Core.Logging.Serilog diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs b/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs index 2cf9e9adc9..9c1bff436a 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs @@ -2,7 +2,7 @@ using System.Linq; using Serilog.Events; using Serilog.Filters.Expressions; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Logging.Viewer { diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs index c0d41c2d14..b556ede79e 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Serilog; using Serilog.Events; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Core.Logging.Viewer { - public abstract class SerilogLogViewerSourceBase : ILogViewer { private readonly ILogViewerConfig _logViewerConfig; diff --git a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs index 8125bc5ed0..fac6678c1a 100644 --- a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs +++ b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; @@ -14,10 +13,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Cache; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Manifest { diff --git a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs index a588173d03..33a650bdc8 100644 --- a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs +++ b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models; +using Umbraco.Extensions; namespace Umbraco.Infrastructure.Media { diff --git a/src/Umbraco.Infrastructure/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs index 1c1911867c..0de18a38e5 100644 --- a/src/Umbraco.Infrastructure/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs +++ b/src/Umbraco.Infrastructure/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; -using System.Linq; +using System.Linq; using NPoco; using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Core.Migrations.Expressions.Common; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes { diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs index 783d7e31c6..58de0552fe 100644 --- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs +++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs @@ -1,19 +1,15 @@ using System; using System.IO; -using System.Linq; -using System.Xml.Linq; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Configuration; using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Install { diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs index 2dae5dec2a..d8cdf273a7 100644 --- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs @@ -4,10 +4,9 @@ using NPoco; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Configuration; using Umbraco.Core.Migrations.Upgrade; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Install { diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs index 32e4cf8bc9..1ce3113859 100644 --- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs @@ -6,12 +6,11 @@ using NPoco; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Events; -using Umbraco.Core.Configuration; -using Umbraco.Core.Events; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Install { diff --git a/src/Umbraco.Infrastructure/Migrations/MigrationBase_Extra.cs b/src/Umbraco.Infrastructure/Migrations/MigrationBase_Extra.cs index 033fdedbd1..5c2d44764a 100644 --- a/src/Umbraco.Infrastructure/Migrations/MigrationBase_Extra.cs +++ b/src/Umbraco.Infrastructure/Migrations/MigrationBase_Extra.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations { diff --git a/src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs b/src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs index 23174e0641..4ab807d10e 100644 --- a/src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Migrations; using Umbraco.Core.Scoping; +using Umbraco.Extensions; using Type = System.Type; namespace Umbraco.Core.Migrations diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index f2789920b6..5ad93ad581 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -1,8 +1,6 @@ using System; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Semver; -using Umbraco.Core.Configuration; using Umbraco.Core.Migrations.Upgrade.Common; using Umbraco.Core.Migrations.Upgrade.V_8_0_0; using Umbraco.Core.Migrations.Upgrade.V_8_0_1; @@ -10,6 +8,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_1_0; using Umbraco.Core.Migrations.Upgrade.V_8_6_0; using Umbraco.Core.Migrations.Upgrade.V_8_9_0; using Umbraco.Core.Migrations.Upgrade.V_8_10_0; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs index 0ee719b721..1264b03c8b 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/AddContentNuTable.cs @@ -1,8 +1,5 @@ -using System.Data; -using System.Linq; -using Umbraco.Cms.Core; -using Umbraco.Core.Persistence.DatabaseAnnotations; -using Umbraco.Core.Persistence.Dtos; +using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DecimalPreValueMigrator.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DecimalPreValueMigrator.cs index f63cd5c1ec..cfc011f79f 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DecimalPreValueMigrator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DecimalPreValueMigrator.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DefaultPreValueMigrator.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DefaultPreValueMigrator.cs index c3ff7929dd..ed166b49d1 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DefaultPreValueMigrator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/DefaultPreValueMigrator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/ListViewPreValueMigrator.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/ListViewPreValueMigrator.cs index 02593c2523..b76d4ae0b4 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/ListViewPreValueMigrator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/ListViewPreValueMigrator.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/NestedContentPreValueMigrator.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/NestedContentPreValueMigrator.cs index a73c171d1d..fa922a765e 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/NestedContentPreValueMigrator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/NestedContentPreValueMigrator.cs @@ -1,6 +1,5 @@ -using System.Collections.Generic; -using Newtonsoft.Json; -using Umbraco.Cms.Core; +using Newtonsoft.Json; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/RichTextPreValueMigrator.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/RichTextPreValueMigrator.cs index ab09d786ce..7b7b34f54b 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/RichTextPreValueMigrator.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/RichTextPreValueMigrator.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs index 8022334171..b4d6962787 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs @@ -2,17 +2,14 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; +using Umbraco.Core.Migrations.PostMigrations; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Migrations.PostMigrations; -using Umbraco.Core.Models; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/FallbackLanguage.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/FallbackLanguage.cs index b27c86d81a..7166dd3238 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/FallbackLanguage.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/FallbackLanguage.cs @@ -1,6 +1,6 @@ using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/Models/PropertyDataDto80.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/Models/PropertyDataDto80.cs index 8da5baa409..908f32433b 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/Models/PropertyDataDto80.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/Models/PropertyDataDto80.cs @@ -1,8 +1,8 @@ -using NPoco; -using System; -using Umbraco.Cms.Core; +using System; +using NPoco; using Umbraco.Core.Persistence.DatabaseAnnotations; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.Models { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs index 55f2f92e74..dfafcd5daa 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigrationBase.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs index 496c4da429..53a41e8ff5 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs @@ -2,17 +2,14 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Core.Migrations.PostMigrations; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs index 14406c7757..c91b6b279f 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using Umbraco.Cms.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 { diff --git a/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs index 50ad30487c..363ee3958c 100644 --- a/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs +++ b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs @@ -8,9 +8,8 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Models.Membership; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Examine; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Models.Mapping diff --git a/src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs b/src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs index 05c74b238a..966efda4b7 100644 --- a/src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs +++ b/src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Models { diff --git a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs index 2b64615373..3ecf39f4e7 100644 --- a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs +++ b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs @@ -18,11 +18,8 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Packaging { diff --git a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs index 80a34a313e..3b3ccf2f0d 100644 --- a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs +++ b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models.Packaging; using Umbraco.Cms.Core.Packaging; +using Umbraco.Extensions; namespace Umbraco.Core.Packaging { diff --git a/src/Umbraco.Infrastructure/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs b/src/Umbraco.Infrastructure/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs index 0904d8c0bc..06cdcfed9e 100644 --- a/src/Umbraco.Infrastructure/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs @@ -1,11 +1,11 @@ using System; -using System.Data; using System.Linq; using System.Reflection; using NPoco; using Umbraco.Cms.Core; using Umbraco.Core.Persistence.DatabaseAnnotations; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.DatabaseModelDefinitions { diff --git a/src/Umbraco.Infrastructure/Persistence/DbConnectionExtensions.cs b/src/Umbraco.Infrastructure/Persistence/DbConnectionExtensions.cs index a49f092fe5..dec77c6607 100644 --- a/src/Umbraco.Infrastructure/Persistence/DbConnectionExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/DbConnectionExtensions.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging; using StackExchange.Profiling.Data; using Umbraco.Cms.Core; using Umbraco.Core.Persistence.FaultHandling; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/Persistence/Dtos/PropertyDataDto.cs b/src/Umbraco.Infrastructure/Persistence/Dtos/PropertyDataDto.cs index 99b860b2b4..a904bfc81c 100644 --- a/src/Umbraco.Infrastructure/Persistence/Dtos/PropertyDataDto.cs +++ b/src/Umbraco.Infrastructure/Persistence/Dtos/PropertyDataDto.cs @@ -1,7 +1,7 @@ using System; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Dtos { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs index 23750ef2f0..d870806760 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs @@ -1,13 +1,10 @@ using System; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs index 03793d5e10..5926ca3a5b 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.Globalization; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/PropertyFactory.cs index 6211db5ef4..bbfc4903fd 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/PropertyFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/PropertyFactory.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Repositories; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/PropertyGroupFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/PropertyGroupFactory.cs index e8ce103fde..3f0879a019 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/PropertyGroupFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/PropertyGroupFactory.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs index 345b10b2cf..5cd59f620b 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs @@ -3,8 +3,8 @@ using System.Linq; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; -using Umbraco.Core.Configuration; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/UserGroupFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/UserGroupFactory.cs index 3d0f124e26..fb599f1c18 100644 --- a/src/Umbraco.Infrastructure/Persistence/Factories/UserGroupFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/Factories/UserGroupFactory.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Factories { diff --git a/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs index c840ecb23f..af03f3d155 100644 --- a/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs +++ b/src/Umbraco.Infrastructure/Persistence/Mappers/BaseMapper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Concurrent; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; using Umbraco.Infrastructure.Persistence.Mappers; namespace Umbraco.Core.Persistence.Mappers diff --git a/src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollection.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollection.cs index 104b7f5da7..561a99db5a 100644 --- a/src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollection.cs +++ b/src/Umbraco.Infrastructure/Persistence/Mappers/MapperCollection.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Mappers { diff --git a/src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs index 80f6a6e2a7..7d835c6b9f 100644 --- a/src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs @@ -8,6 +8,7 @@ using StackExchange.Profiling.Data; using Umbraco.Cms.Core; using Umbraco.Core.Persistence.FaultHandling; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs index 4bbf5b34b3..a4ca3c18ec 100644 --- a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs @@ -9,6 +9,7 @@ using System.Text.RegularExpressions; using NPoco; using Umbraco.Cms.Core; using Umbraco.Core.Persistence.Querying; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/Persistence/Querying/ExpressionVisitorBase.cs b/src/Umbraco.Infrastructure/Persistence/Querying/ExpressionVisitorBase.cs index d4b2c40eda..4075e20140 100644 --- a/src/Umbraco.Infrastructure/Persistence/Querying/ExpressionVisitorBase.cs +++ b/src/Umbraco.Infrastructure/Persistence/Querying/ExpressionVisitorBase.cs @@ -5,10 +5,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Linq.Expressions; using System.Text; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Querying { diff --git a/src/Umbraco.Infrastructure/Persistence/Querying/ModelToSqlExpressionVisitor.cs b/src/Umbraco.Infrastructure/Persistence/Querying/ModelToSqlExpressionVisitor.cs index 57cc406122..3164d3f165 100644 --- a/src/Umbraco.Infrastructure/Persistence/Querying/ModelToSqlExpressionVisitor.cs +++ b/src/Umbraco.Infrastructure/Persistence/Querying/ModelToSqlExpressionVisitor.cs @@ -1,8 +1,8 @@ using System; using System.Linq.Expressions; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Querying { diff --git a/src/Umbraco.Infrastructure/Persistence/Querying/SqlExpressionExtensions.cs b/src/Umbraco.Infrastructure/Persistence/Querying/SqlExpressionExtensions.cs index 9f84bfd003..a245ac9be5 100644 --- a/src/Umbraco.Infrastructure/Persistence/Querying/SqlExpressionExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/Querying/SqlExpressionExtensions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Cms.Core; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Querying { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditEntryRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditEntryRepository.cs index f43b335328..2f0030055e 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditEntryRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditEntryRepository.cs @@ -9,12 +9,11 @@ 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.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs index 784e80c4e2..630d88bf53 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using NPoco; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; @@ -16,16 +15,11 @@ 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.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs index 9ac95c6049..278d0a9a7d 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs @@ -8,11 +8,10 @@ using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs index 7dfbb1622e..5c644a899f 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs @@ -3,7 +3,6 @@ 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; @@ -11,11 +10,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs index 0a2e743e99..df31300648 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs @@ -18,6 +18,7 @@ using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs index efbf03ef45..1c7dafaf4d 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs @@ -15,16 +15,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DictionaryRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DictionaryRepository.cs index 596064240f..b14d650cb8 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DictionaryRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DictionaryRepository.cs @@ -10,11 +10,11 @@ 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.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs index 51c332e590..1644d283e2 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs @@ -14,16 +14,13 @@ 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.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DomainRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DomainRepository.cs index c73075fab9..c2af14cd79 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DomainRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DomainRepository.cs @@ -4,17 +4,15 @@ using System.Data; 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.Models; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepository.cs index f41d0d3858..32174ebb17 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepository.cs @@ -8,13 +8,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepositoryBase.cs index 58960ed54b..9502445979 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepositoryBase.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityRepositoryBase.cs @@ -3,7 +3,6 @@ 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.Entities; using Umbraco.Cms.Core.Persistence; @@ -12,10 +11,10 @@ using Umbraco.Cms.Core.Scoping; using Umbraco.Core.Cache; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { - /// /// Provides a base class to all based repositories. /// diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs index fab394bd07..79977d3282 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs @@ -3,18 +3,16 @@ 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.Entities; using Umbraco.Cms.Core.Models.Identity; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Cache; -using Umbraco.Core.Models.Identity; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/FileRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/FileRepository.cs index e3edf1f9ed..73c33af58e 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/FileRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/FileRepository.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using System.IO; using System.Text; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Persistence; -using Umbraco.Core.Models; -using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs index fee56e56d4..861a7c4bc2 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs @@ -3,17 +3,13 @@ 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.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepository.cs index 078732e371..3ead7a9d80 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepository.cs @@ -4,7 +4,6 @@ using System.Linq; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; @@ -12,12 +11,11 @@ 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.Configuration; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepositoryExtensions.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepositoryExtensions.cs index 824a1103ce..273e2c1e7c 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepositoryExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/LanguageRepositoryExtensions.cs @@ -1,5 +1,5 @@ -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Persistence.Repositories; +using Umbraco.Cms.Core.Persistence.Repositories; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs index fb06aec12c..3962d32c76 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs @@ -3,19 +3,17 @@ 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.Strings; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs index d5b88781f5..da2c6c6ed5 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text.RegularExpressions; 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; @@ -14,15 +13,12 @@ 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.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeRepository.cs index a68b638287..ff154621ff 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaTypeRepository.cs @@ -3,7 +3,6 @@ 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; @@ -11,10 +10,10 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs index 342511d402..6663cc5b29 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs @@ -10,13 +10,11 @@ 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.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs index 8388da4e98..978e04bc6d 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs @@ -18,11 +18,8 @@ using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberTypeRepository.cs index 9594c30ac3..45d8b16a65 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberTypeRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberTypeRepository.cs @@ -11,11 +11,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PartialViewRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PartialViewRepository.cs index 517b5d182d..dc1918287d 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PartialViewRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PartialViewRepository.cs @@ -2,11 +2,10 @@ using System.IO; using System.Linq; using System.Text; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PermissionRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PermissionRepository.cs index 9cc7d3c35c..8c41eca486 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PermissionRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/PermissionRepository.cs @@ -3,16 +3,14 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using NPoco; -using Umbraco.Core.Cache; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs index d800d80701..9df21ee598 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs @@ -9,11 +9,9 @@ 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; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ScriptRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ScriptRepository.cs index 5babfcc924..871d098921 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ScriptRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ScriptRepository.cs @@ -3,13 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimilarNodeName.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimilarNodeName.cs index 030d6a53b6..07e9748ef1 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimilarNodeName.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimilarNodeName.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Umbraco.Cms.Core; using static Umbraco.Core.Persistence.Repositories.Implement.SimilarNodeName; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/StylesheetRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/StylesheetRepository.cs index a09fd707a6..eef1434bb8 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/StylesheetRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/StylesheetRepository.cs @@ -4,13 +4,11 @@ using System.IO; using System.Linq; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TagRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TagRepository.cs index 8a75bf9e66..5b8e23c50b 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TagRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TagRepository.cs @@ -4,18 +4,16 @@ using System.Linq; using System.Text; 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.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; namespace Umbraco.Core.Persistence.Repositories.Implement diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs index c1c49edd82..a24265e50a 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using Microsoft.Extensions.Logging; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; @@ -14,11 +13,11 @@ using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Strings; using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs index 527ef365c8..5e09acec04 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs @@ -14,14 +14,12 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Factories; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.Repositories.Implement { diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs index 02bbed70fd..986dd2b4f9 100644 --- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs +++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs @@ -5,8 +5,8 @@ using System.Data.SqlClient; using System.Linq; using Microsoft.Extensions.Logging; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.SqlSyntax { diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs index 58a7b73705..0923e531c2 100644 --- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs +++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs @@ -6,10 +6,10 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using NPoco; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.DatabaseAnnotations; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Querying; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence.SqlSyntax { diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntaxExtensions.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntaxExtensions.cs index 1fe5cf2199..ff98d40b4a 100644 --- a/src/Umbraco.Infrastructure/Persistence/SqlSyntaxExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntaxExtensions.cs @@ -4,6 +4,7 @@ using System.Reflection; using NPoco; using Umbraco.Cms.Core; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs index 266e906f34..8e68688f2c 100644 --- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs +++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Core.Persistence.Dtos; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs index fb0448fbe7..f9f35d3754 100644 --- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs +++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Migrations.Install; using Umbraco.Core.Persistence.FaultHandling; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Core.Persistence { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs index 11510140f8..ba8d26cae2 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs @@ -4,20 +4,15 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Editors; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Models.Blocks; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using static Umbraco.Core.Models.Blocks.BlockItemData; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs index 09a574ddda..43ebe262af 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ColorPickerConfigurationEditor.cs @@ -4,13 +4,11 @@ using System.Linq; using System.Runtime.Serialization; using System.Text.RegularExpressions; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core; using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ComplexEditorValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/ComplexEditorValidator.cs index 3f95e7e687..76b7793d20 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ComplexEditorValidator.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ComplexEditorValidator.cs @@ -2,15 +2,12 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PropertyEditors.Validation; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs b/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs index 65c6bf82f9..3a6b93dfee 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs index 43b86cc566..cce3dc4fac 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Reflection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs index 66ebff0060..bc774b1304 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/DateTimeConfigurationEditor.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs index f09c090226..544f1f2ee0 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/DropDownFlexibleConfigurationEditor.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs index c8252568c7..889b2bb236 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; @@ -14,13 +13,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.Media; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs index 55c6c0b1d3..2359e9f7bf 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs @@ -1,7 +1,6 @@ using System; using System.IO; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.Editors; @@ -9,10 +8,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs index 6d54b83fd4..4f86c03d38 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; @@ -14,12 +13,8 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; -using Umbraco.Core; using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs index 36940fe77a..422f61a653 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs @@ -4,14 +4,12 @@ using System.Linq; using System.Text; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Examine; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs index 3949e7200a..ac7df6ab12 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; @@ -16,13 +15,8 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.Media; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs index 819d01290b..96d0de17eb 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; @@ -11,12 +10,9 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using File = System.IO.File; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs index 2a72fb8574..da032ed39c 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs @@ -16,13 +16,7 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs index 2751d8ea6c..c5f562b134 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/MultipleTextStringConfigurationEditor.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PropertyEditors.Validators; -using Umbraco.Core; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs index 06caf02e19..567093f6c2 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs @@ -4,7 +4,6 @@ using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Editors; @@ -12,11 +11,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs index 8f9f05ddc5..1964041287 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.Extensions.Logging; using HtmlAgilityPack; +using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Hosting; @@ -14,12 +14,7 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.Models; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs index ebd1cd54e4..bc63a6d0d2 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; @@ -12,13 +11,8 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; using Umbraco.Examine; +using Umbraco.Extensions; using Umbraco.Web.Macros; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs index 85cb9d582f..6735a4d027 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/TagsPropertyEditor.cs @@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Editors; @@ -12,10 +11,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors diff --git a/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs index d91b80fd6d..fa2ff597a3 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs @@ -4,15 +4,11 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Microsoft.Extensions.Options; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs index 999a62cf06..cf8bbb4fd6 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs @@ -1,5 +1,3 @@ -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -8,11 +6,9 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Blocks; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Models.Blocks; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors.ValueConverters diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs index 9244944480..d929d0885d 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs index 1d18990aa8..17f50705ed 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs @@ -7,6 +7,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Grid; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs index 4cb022ab91..e4ba356874 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs @@ -4,12 +4,11 @@ using System.ComponentModel; using System.Linq; using System.Runtime.Serialization; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs index c699ff45b4..6e6cd82d66 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs @@ -2,9 +2,9 @@ using System.Globalization; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs index 80fb8ac3c2..439700df09 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs @@ -2,9 +2,9 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.PropertyEditors.ValueConverters { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs index b9409c5d30..9f3f78b16f 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; @@ -10,13 +9,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Web.Models; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors.ValueConverters diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentValueConverterBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentValueConverterBase.cs index c7ba46c0e8..577e636dbc 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentValueConverterBase.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/NestedContentValueConverterBase.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; -using Umbraco.Web.PublishedCache; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.PropertyEditors.ValueConverters diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs index 6fe71b8871..f1ee481123 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs @@ -1,7 +1,6 @@ using System.Linq; using System.Text; using HtmlAgilityPack; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; @@ -9,9 +8,7 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.PropertyEditors.ValueConverters; +using Umbraco.Extensions; using Umbraco.Web.Macros; namespace Umbraco.Web.PropertyEditors.ValueConverters diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueListUniqueValueValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueListUniqueValueValidator.cs index 8f6579e83c..9c77497e4c 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueListUniqueValueValidator.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueListUniqueValueValidator.cs @@ -2,10 +2,8 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Web.PropertyEditors { diff --git a/src/Umbraco.Infrastructure/PublishedContentQuery.cs b/src/Umbraco.Infrastructure/PublishedContentQuery.cs index bac5e23812..9cb5864b31 100644 --- a/src/Umbraco.Infrastructure/PublishedContentQuery.cs +++ b/src/Umbraco.Infrastructure/PublishedContentQuery.cs @@ -9,9 +9,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; using Umbraco.Examine; -using Umbraco.Web.PublishedCache; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web diff --git a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs index 09929877b5..4727bc7a2d 100644 --- a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Globalization; using System.Linq; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; @@ -9,9 +8,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs index d529ebd34e..1afc55240a 100644 --- a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs +++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; @@ -10,12 +9,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Web.PublishedCache; +using Umbraco.Extensions; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs index 0da4c8ee0e..47d9c1ba6c 100644 --- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs +++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs @@ -17,6 +17,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; using MapperCollection = Umbraco.Core.Persistence.Mappers.MapperCollection; namespace Umbraco.Core.Runtime diff --git a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs index d2df075122..8be81b44d4 100644 --- a/src/Umbraco.Infrastructure/Search/ExamineComponent.cs +++ b/src/Umbraco.Infrastructure/Search/ExamineComponent.cs @@ -13,15 +13,9 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Sync; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; -using Umbraco.Core.Sync; using Umbraco.Examine; -using Umbraco.Web.Cache; +using Umbraco.Extensions; namespace Umbraco.Web.Search { diff --git a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs index daf4b96f60..fa2c3e2023 100644 --- a/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs +++ b/src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using Examine; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; @@ -11,13 +10,9 @@ using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; using Umbraco.Examine; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Search diff --git a/src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs b/src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs index 1681f2c95b..33012c21c4 100644 --- a/src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs +++ b/src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs @@ -6,6 +6,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Core.Models.Identity; +using Umbraco.Extensions; namespace Umbraco.Core.Security { diff --git a/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs b/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs index f268c4f368..ad95a5df64 100644 --- a/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs +++ b/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs @@ -15,10 +15,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Identity; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Models.Identity; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Security { diff --git a/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs b/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs index 23f65ba434..3e057a1924 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/ContentService.cs @@ -13,11 +13,10 @@ using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs index 42aaaa80aa..24db01bd45 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs @@ -10,11 +10,10 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs b/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs index 09e0b65446..9854dcc196 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs @@ -12,13 +12,11 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs index 97bd04e69e..d5da64d5a2 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs @@ -10,9 +10,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs index 9706481473..b225f2b051 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using Microsoft.Extensions.Options; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; @@ -13,12 +13,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Configuration; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; -using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs b/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs index 08ee49a2ef..c5d4dd259b 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/LocalizationService.cs @@ -2,15 +2,12 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs b/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs index 334cc32f00..79ccb5e85a 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Xml.Linq; using System.Xml.XPath; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs b/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs index a935bddc6f..83edddf014 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs @@ -5,10 +5,10 @@ using System.IO; using System.Linq; using System.Xml; using System.Xml.Linq; -using Umbraco.Core.Cache; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs index 793983dbea..4a9375ddec 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/MediaService.cs @@ -13,11 +13,10 @@ using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs index 5949b5020b..7288fa190a 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs @@ -9,11 +9,10 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/MemberTypeService.cs b/src/Umbraco.Infrastructure/Services/Implement/MemberTypeService.cs index 69fbf22fa7..dfe7410c1b 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/MemberTypeService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/MemberTypeService.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs index ea11a94ce7..071523853f 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs @@ -5,8 +5,8 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading; -using Microsoft.Extensions.Options; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; @@ -16,9 +16,8 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs index 4bf11fa94f..80aa25127b 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models; @@ -12,9 +11,7 @@ using Umbraco.Cms.Core.Models.Packaging; using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Packaging; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/PropertyValidationService.cs b/src/Umbraco.Infrastructure/Services/Implement/PropertyValidationService.cs index 7dfa5d25ce..777c0ecd30 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PropertyValidationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PropertyValidationService.cs @@ -1,13 +1,12 @@ -using System.Linq; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Linq; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Core.Services { diff --git a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs index 68e2e2e5f2..8fd87666bb 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs @@ -6,10 +6,9 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs b/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs index ee368a6555..2327a1ccfb 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/RelationService.cs @@ -2,16 +2,13 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs b/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs index 2e4fc03fb6..ec55be9973 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs @@ -9,12 +9,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; -using Umbraco.Core.Sync; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs index 54977ce666..3893d90619 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs @@ -13,12 +13,10 @@ using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.Services; -using Umbraco.Core.Configuration; -using Umbraco.Core.Events; using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Services.Implement { diff --git a/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs index a37038a1ec..f18a1f3e09 100644 --- a/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs +++ b/src/Umbraco.Infrastructure/Sync/BatchedDatabaseServerMessenger.cs @@ -4,7 +4,6 @@ using System.Linq; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; @@ -12,11 +11,9 @@ using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; -using Umbraco.Web; +using Umbraco.Extensions; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs index 4ce301d50c..b7b2c7e8ac 100644 --- a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs +++ b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs @@ -17,11 +17,10 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Sync; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; +using Umbraco.Extensions; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs index 567a645b50..040810998b 100644 --- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs +++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs @@ -11,10 +11,7 @@ using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Manifest; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Manifest; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; namespace Umbraco.Web.WebAssets { diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs index 193c037710..35e7d1bf28 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs @@ -9,8 +9,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Editors; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; namespace Umbraco.ModelsBuilder.Embedded.BackOffice { diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs index 6e45f7ebb2..b3ab88d75d 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Security.Cryptography; using System.Text; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.ModelsBuilder.Embedded.Building { diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs index d72b58cf45..44662339cc 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs @@ -10,7 +10,6 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.CodeAnalysis; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; @@ -19,9 +18,7 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; +using Umbraco.Extensions; using Umbraco.ModelsBuilder.Embedded.Building; using File = System.IO.File; diff --git a/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs index 6edbc9e04c..bbe8d5b024 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.ModelsBuilder.Embedded.Building; namespace Umbraco.ModelsBuilder.Embedded diff --git a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs index 6dd53eab6c..4fb4238e03 100644 --- a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs @@ -11,9 +11,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Core.Xml.XPath; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Web.PublishedCache.NuCache.Navigable; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs index 6f460ce47a..883bc6899b 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfCultureVariationSerializer.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.IO; using CSharpTest.Net.Serialization; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs index 68b7a1f91e..ac4465821e 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.IO; using CSharpTest.Net.Serialization; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.PublishedCache.NuCache.DataSource { diff --git a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs index cfccd45502..10bdeb95a4 100644 --- a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs +++ b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs @@ -7,8 +7,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Core.Xml.XPath; -using Umbraco.Core; -using Umbraco.Core.Cache; +using Umbraco.Extensions; using Umbraco.Web.PublishedCache.NuCache.Navigable; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs index ac013addda..499fb3a9f3 100644 --- a/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs +++ b/src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs @@ -5,23 +5,18 @@ using System.Linq; using Microsoft.Extensions.Logging; using Newtonsoft.Json; 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.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.PublishedCache.NuCache; using Umbraco.Web.PublishedCache.NuCache.DataSource; using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics; diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs b/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs index dfe0edbbaa..b305546678 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedContent.cs @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Services; -using Umbraco.Web.Models; +using Umbraco.Extensions; using Umbraco.Web.PublishedCache.NuCache.DataSource; namespace Umbraco.Web.PublishedCache.NuCache diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs index 1c5093dc4a..5a7129aa2d 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Threading; @@ -21,17 +20,10 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Infrastructure.PublishedCache.Persistence; -using Umbraco.Web.Cache; using Umbraco.Web.PublishedCache.NuCache.DataSource; -using Umbraco.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File; diff --git a/src/Umbraco.TestData/SegmentTestController.cs b/src/Umbraco.TestData/SegmentTestController.cs index 8103512943..35c1acb69b 100644 --- a/src/Umbraco.TestData/SegmentTestController.cs +++ b/src/Umbraco.TestData/SegmentTestController.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Configuration; +using System.Configuration; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Web.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Extensions; using Umbraco.Web.Mvc; namespace Umbraco.TestData diff --git a/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs index 93f19aafda..579afc761b 100644 --- a/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs +++ b/src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Linq; using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Engines; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.Benchmarks { diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs index 5d91a9cc6f..bb5419a99e 100644 --- a/src/Umbraco.Tests.Common/TestHelperBase.cs +++ b/src/Umbraco.Tests.Common/TestHelperBase.cs @@ -23,15 +23,10 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence; using Umbraco.Core.Serialization; +using Umbraco.Extensions; using Umbraco.Tests.Common.TestHelpers; -using Umbraco.Web; -using Umbraco.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Common diff --git a/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs b/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs index bbe02e1922..da4d479c3d 100644 --- a/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs +++ b/src/Umbraco.Tests.Common/TestHelpers/SolidPublishedSnapshot.cs @@ -15,13 +15,8 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; -using Umbraco.Web.PublishedCache; +using Umbraco.Extensions; namespace Umbraco.Tests.Common.PublishedContent { diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index 358f78dfb2..250a059300 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.DependencyInjection; @@ -18,14 +17,9 @@ using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Runtime; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Core.Sync; using Umbraco.Examine; +using Umbraco.Extensions; using Umbraco.Infrastructure.HostedServices; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.TestHelpers.Stubs; diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs index 173df24821..53752f6ece 100644 --- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs +++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs @@ -29,13 +29,8 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Runtime; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Runtime; +using Umbraco.Extensions; using Umbraco.Tests.Common; using Umbraco.Web.Common.AspNetCore; using File = System.IO.File; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs index d371b7b296..8d0d0ef948 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs @@ -11,7 +11,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs index e17f449d42..4f002f8a53 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.DependencyInjection; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; @@ -14,7 +13,7 @@ using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Core.PropertyEditors; - +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs index 0ff4cc75d7..0cff2a540f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs @@ -8,12 +8,12 @@ using System.IO.Compression; using System.Linq; using System.Xml.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs index 4df2c24a15..9fcf411b72 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs @@ -8,7 +8,6 @@ using System.Xml.Linq; using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; @@ -16,14 +15,11 @@ using Umbraco.Cms.Core.Models.Packaging; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Packaging; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Services.Importing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs index a50caaa3eb..60f2c0eadd 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs @@ -21,6 +21,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs index 106dd1ca69..6395eb221f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs @@ -17,15 +17,10 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Persistence.Repositories; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Implementations; using Umbraco.Tests.Integration.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs index 39703082f1..05d6fc0ae5 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs @@ -15,17 +15,14 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Mappers; -using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs index ee3a42f613..58628fa81e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs @@ -9,8 +9,8 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; -using Umbraco.Core; using Umbraco.Core.Scoping; +using Umbraco.Extensions; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs index c1113b5dc2..757df239d6 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs @@ -8,13 +8,13 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Sync; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs index f6a9b193ca..a9c91dec39 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceEventTests.cs @@ -3,13 +3,13 @@ using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs index c412498fd8..5e684405ca 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs index 6d06b5e16d..e0738401ab 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Exceptions; using Umbraco.Cms.Core.Models; @@ -14,6 +13,7 @@ using Umbraco.Core.Services.Implement; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs index 4f278e0966..76dbf0b61b 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs @@ -11,15 +11,11 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.PublishedCache.NuCache; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Services diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs index e8323b78da..8b8df1c624 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs @@ -15,14 +15,10 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs index 8213358f9f..e67547eb7f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs @@ -6,12 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs index a6e2dd9af5..0a03dec24e 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs @@ -15,11 +15,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs index abfffddc6c..1d34e7acc2 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -7,13 +7,10 @@ using System.Net.Http; using System.Threading.Tasks; using Newtonsoft.Json; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs index 75245e6308..aaacf1167f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs @@ -1,20 +1,16 @@ // Copyright (c) Umbraco. // See LICENSE for more details. -using System; -using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.TemplateQuery; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Tests.Testing; using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Formatters; diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs index 408d03ca70..df294a1de8 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs @@ -16,15 +16,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.Integration.TestServerTest; -using Umbraco.Tests.Testing; using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.Common.Filters; using Umbraco.Web.Common.Formatters; namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs index 12d339eb1a..c51b76ea52 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs @@ -20,11 +20,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Integration.Testing; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs index accba59f45..91bb6b19d4 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs @@ -5,10 +5,8 @@ using System; using System.Linq; using System.Security.Claims; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Security; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Core.BackOffice diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs index 262f4903d1..2265eb6664 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs @@ -5,8 +5,7 @@ using System; using System.Collections.Generic; using System.Security.Claims; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs index 530037cc17..595678c5ec 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs @@ -8,10 +8,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.UnitTests.TestHelpers; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs index 6f06beb881..11561b9223 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs @@ -15,10 +15,8 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.PropertyEditors; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs index 181dee6871..184473b80a 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs @@ -9,8 +9,7 @@ using System.Threading; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.PropertyEditors; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers.Entities; namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs index c179d2dba3..76b35836e3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs @@ -3,8 +3,7 @@ using System; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core.CoreThings { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs index 2534f9d329..4142305b00 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs @@ -5,7 +5,7 @@ using System; using Lucene.Net.Index; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs index 3b8f695364..5959c5dd9c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs @@ -3,9 +3,8 @@ using System; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs index 13751917f4..bd0fc22eff 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs @@ -5,8 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs index 11d38b37bf..d9fcf58d4c 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs @@ -4,10 +4,8 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs index 57af263506..817f517f54 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs @@ -5,12 +5,9 @@ using System; using System.Linq; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs index 44f1bad220..1b2fbe9aa0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs @@ -12,17 +12,12 @@ using Microsoft.Extensions.Logging.Abstractions; using Moq; using Newtonsoft.Json; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.TestHelpers.Stubs; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs index 5d5b524e30..dd91043fb1 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs @@ -12,11 +12,9 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs index 441f0e254f..a771717727 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs @@ -7,7 +7,7 @@ using System.Linq; using Newtonsoft.Json; using NUnit.Framework; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Compose; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs index 76ec4023bd..4fd6643d2e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs @@ -15,11 +15,9 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.PropertyEditors; using static Umbraco.Cms.Core.Models.Property; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs index 483193b1a0..2fcb275c22 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs @@ -8,9 +8,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers.Entities; namespace Umbraco.Tests.UnitTests.Umbraco.Core.PropertyEditors diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs index 6244b9b529..20e1728727 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs @@ -4,8 +4,7 @@ using System; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs index ad6b235fc6..34a34f797f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs @@ -3,10 +3,9 @@ using Microsoft.Extensions.Options; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs index 6a1eaffbf7..988ac0f908 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs @@ -4,10 +4,9 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs index 40c68bb1d3..7df3846b7d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs @@ -11,7 +11,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs index 3e8d875f16..5e26051639 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Strings.Css; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Core.ShortStringHelper { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs index 1da576f486..d4f202a9fd 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs @@ -9,16 +9,14 @@ using Microsoft.Extensions.Logging.Abstractions; using Moq; using NPoco; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Migrations; using Umbraco.Cms.Core.Services; -using Umbraco.Core; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Upgrade; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs index 764dabaf34..e0eb7f7bd0 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs @@ -5,11 +5,10 @@ using System; using Moq; using NPoco; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs index ec065600b4..a4603f2e66 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs @@ -6,7 +6,6 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; @@ -14,10 +13,7 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common.Builders; using Umbraco.Tests.Common.Builders.Extensions; using Umbraco.Web.BackOffice.Filters; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs index 088e99446a..aa800e294d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs @@ -13,8 +13,7 @@ using Microsoft.Net.Http.Headers; using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Security; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Security; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs index 296853bc9c..30f817ced6 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs @@ -6,9 +6,8 @@ using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs index 791eca61b9..6448417ac7 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs @@ -2,8 +2,7 @@ // See LICENSE for more details. using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.WebAssets; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs index 7f332aaf82..fee2f577ad 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs @@ -5,10 +5,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; -using Umbraco.Core; -using Umbraco.Core.Events; +using Umbraco.Extensions; using Umbraco.Web.WebAssets; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs index 06926f1728..5b0a16c6fa 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs @@ -5,12 +5,9 @@ using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using NUnit.Framework; -using Umbraco.Cms.Core; -using Umbraco.Core; using Umbraco.Extensions; -using Umbraco.Web.Common.Extensions; -using Constants = Umbraco.Cms.Core.Constants; using static Umbraco.Cms.Core.Constants.Web.Routing; +using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Tests.UnitTests.Umbraco.Web.Common.Routing { diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs index b5a7e56deb..4fdeb59b15 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs @@ -13,17 +13,13 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.Testing; -using Current = Umbraco.Web.Composing.Current; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Tests.PublishedContent; -using Umbraco.Web; +using Umbraco.Tests.TestHelpers; +using Umbraco.Tests.Testing; using Constants = Umbraco.Cms.Core.Constants; +using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.Cache.PublishedCache { diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs index 9e4ab9748d..14c0ba9d53 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs @@ -1,17 +1,14 @@ -using Examine; -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Xml.XPath; +using Examine; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; -using Umbraco.Core.Cache; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Web.Models; using Umbraco.Web.PublishedCache; namespace Umbraco.Tests.LegacyXmlPublishedCache diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs index 5912794079..0ff61e7e45 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/DomainCache.cs @@ -1,14 +1,9 @@ using System.Collections.Generic; -using System.Globalization; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; +using Umbraco.Extensions; namespace Umbraco.Tests.LegacyXmlPublishedCache { diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs index c300f435dd..f190b7ee41 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs @@ -3,8 +3,7 @@ using System.IO; using System.Linq; using System.Xml; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Web.Composing; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs index 48f8b4be65..4909f60643 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs @@ -11,12 +11,9 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; namespace Umbraco.Tests.LegacyXmlPublishedCache { diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs index 08921b61f2..8536c2ce33 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs @@ -17,12 +17,8 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Examine; -using Umbraco.Web; using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs index 447bc3e93e..81f4c7a2f0 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedContent.cs @@ -4,14 +4,10 @@ using System.Linq; using System.Xml; using System.Xml.Serialization; using System.Xml.XPath; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Web; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Web.Models; using Umbraco.Web.PublishedCache; namespace Umbraco.Tests.LegacyXmlPublishedCache diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs index 6e86f2fe07..15d3afd6d5 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs @@ -20,17 +20,13 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Repositories; using Umbraco.Core.Persistence.Repositories.Implement; -using Umbraco.Core.Runtime; using Umbraco.Core.Scoping; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Cache; using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; using Umbraco.Web.Scheduling; diff --git a/src/Umbraco.Tests/Models/ContentXmlTest.cs b/src/Umbraco.Tests/Models/ContentXmlTest.cs index b50c3bdc93..91ce2e0034 100644 --- a/src/Umbraco.Tests/Models/ContentXmlTest.cs +++ b/src/Umbraco.Tests/Models/ContentXmlTest.cs @@ -6,8 +6,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs index 5c69b1bf91..68705aac90 100644 --- a/src/Umbraco.Tests/Models/MediaXmlTest.cs +++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs @@ -11,8 +11,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs index 21234c535c..547f4902ab 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs @@ -20,20 +20,13 @@ using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; -using Umbraco.Web.Cache; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.NuCache; using Umbraco.Web.PublishedCache.NuCache.DataSource; diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index f1138d6610..8da3a270ad 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -18,22 +18,13 @@ using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Logging; -using Umbraco.Core.Models; -using Umbraco.Core.Persistence.Repositories; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing.Objects; -using Umbraco.Web; -using Umbraco.Web.Cache; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.NuCache; using Umbraco.Web.PublishedCache.NuCache.DataSource; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs index 0a64a6e5e3..bfa023aba7 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs @@ -5,20 +5,15 @@ using System.Linq; using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Tests.TestHelpers; -using Umbraco.Web.Routing; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs index a93e654c8f..0ef355f784 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs @@ -1,14 +1,10 @@ using System.Collections.Generic; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Web; -using Umbraco.Web.Composing; -using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Extensions; using Umbraco.Tests.Testing; -using Umbraco.Web; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index ce10124095..0fbf36386d 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -5,18 +5,13 @@ using System.Linq; using Microsoft.Extensions.DependencyInjection; using Moq; using NUnit.Framework; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.TestHelpers; +using Umbraco.Extensions; using Umbraco.Tests.Testing; -using Umbraco.Web; using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.PublishedContent diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index b0612de02f..433f96f86b 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -1,18 +1,10 @@ -using System.Web; -using System.Xml.Linq; -using System.Xml.XPath; -using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Tests.TestHelpers; -using Umbraco.Tests.TestHelpers.Entities; -using Umbraco.Tests.UmbracoExamine; -using Umbraco.Web; using System.Linq; using System.Threading; using System.Xml; -using Examine; +using System.Xml.Linq; +using System.Xml.XPath; using Microsoft.Extensions.DependencyInjection; +using NUnit.Framework; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.DependencyInjection; @@ -23,14 +15,13 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Web; -using Umbraco.Core.Cache; using Umbraco.Examine; -using Current = Umbraco.Web.Composing.Current; -using Umbraco.Tests.Testing; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Tests.LegacyXmlPublishedCache; +using Umbraco.Extensions; using Umbraco.Tests.Common; +using Umbraco.Tests.LegacyXmlPublishedCache; +using Umbraco.Tests.TestHelpers.Entities; +using Umbraco.Tests.Testing; +using Umbraco.Tests.UmbracoExamine; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs index 76c070c9b2..945fc360c3 100644 --- a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs +++ b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs @@ -12,14 +12,9 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs index d93043e647..20b44dca9b 100644 --- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs +++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs @@ -1,20 +1,17 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Tests.Common; -using Umbraco.Tests.TestHelpers.Entities; -using Umbraco.Web.Routing; -using Microsoft.Extensions.Logging; -using System.Threading.Tasks; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; +using Umbraco.Tests.TestHelpers.Entities; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index c10595d8b1..75cff6e5f3 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -19,15 +19,9 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Sync; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Events; -using Umbraco.Core.Models; using Umbraco.Core.Persistence.Repositories; -using Umbraco.Core.Security; -using Umbraco.Core.Services; using Umbraco.Core.Services.Implement; -using Umbraco.Core.Sync; +using Umbraco.Extensions; using Umbraco.Infrastructure.PublishedCache.Persistence; using Umbraco.Tests.Common; using Umbraco.Tests.TestHelpers; @@ -35,7 +29,6 @@ using Umbraco.Tests.Testing; using Umbraco.Web; using Umbraco.Web.Cache; using Umbraco.Web.Composing; -using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.NuCache; namespace Umbraco.Tests.Scoping diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs index 36d402b110..cf88208286 100644 --- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs @@ -7,12 +7,9 @@ using System.Web.Routing; using System.Web.SessionState; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Moq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Web; +using Umbraco.Extensions; using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Tests.TestHelpers.Stubs diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs index 705cbd4e6b..89f4730893 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs @@ -14,14 +14,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Persistence.SqlCe; using Umbraco.Tests.Common; using Umbraco.Web; -using Umbraco.Web.PublishedCache; namespace Umbraco.Tests.TestHelpers { diff --git a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs index e451ba7534..1022df3854 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/AdminUsersHandler.cs @@ -7,14 +7,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Editors; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Authorization { diff --git a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs index 68c058e78f..69eec833a9 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/TreeHandler.cs @@ -5,11 +5,9 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Authorization { diff --git a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs b/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs index 61df0bb4f4..8239fd1495 100644 --- a/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs +++ b/src/Umbraco.Web.BackOffice/Authorization/UserGroupHandler.cs @@ -11,9 +11,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Controllers; namespace Umbraco.Web.BackOffice.Authorization diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs index 9eb3abeb55..c9ce8fc233 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs @@ -12,12 +12,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Events; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Filters; namespace Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs index 890d7fcdf0..12d5ebb136 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs @@ -21,16 +21,11 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; using Umbraco.Core.Packaging; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; using ContentType = Umbraco.Cms.Core.Models.ContentType; diff --git a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs index afec5558e6..3dc3fb5ecb 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs @@ -1,23 +1,13 @@ -using System.Collections.Generic; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Newtonsoft.Json.Linq; -using System.Threading.Tasks; -using System.Net.Http; -using System; +using System; +using System.Collections.Generic; using System.Linq; +using System.Net.Http; using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Umbraco.Core.Cache; -using Umbraco.Core.Persistence; -using Umbraco.Core.Services; -using Umbraco.Core.Security; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Filters; -using Microsoft.AspNetCore.Authorization; +using Newtonsoft.Json.Linq; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Configuration; @@ -26,7 +16,12 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Extensions; +using Umbraco.Web.BackOffice.Filters; +using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; +using Umbraco.Web.Common.Controllers; +using Umbraco.Web.Common.Filters; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs index cf5586e90b..fd0237a61b 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs @@ -15,12 +15,8 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Common.ActionsResults; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Routing; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs index 2f8fca5809..11dfe64921 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs @@ -15,11 +15,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs index 757a17d19e..77e17ed9cb 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs @@ -12,10 +12,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs index a61fe7459e..35f957d6bd 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs @@ -3,18 +3,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Packaging; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Models; -using Microsoft.AspNetCore.Authorization; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models; @@ -25,8 +17,10 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Semver; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.WebAssets; -using Umbraco.Web.Common.Authorization; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; +using Umbraco.Web.Common.Attributes; +using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs index f773a5dd20..e73e2849e0 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationController.cs @@ -1,20 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; -using System.Net.Http; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.Common.ActionsResults; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs index 877385c8fd..4d215373c2 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs @@ -11,9 +11,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; diff --git a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs index e1034fddea..8b0f8fdcd1 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/StylesheetController.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs index 73a9e22263..08ffab8d33 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/TinyMceController.cs @@ -8,16 +8,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Web.BackOffice.Filters; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; diff --git a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs index 53525433f2..5eafea6540 100644 --- a/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttribute.cs @@ -1,10 +1,8 @@ using System; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Security; -using Umbraco.Core; -using Umbraco.Core.Security; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs index 8d8ca05862..7b3cd695da 100644 --- a/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs @@ -6,9 +6,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.ContentEditing; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Filters { diff --git a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs index 88949027cb..02231ad61f 100644 --- a/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs @@ -4,16 +4,12 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs index 40e32ffe2f..4fd4f3a08a 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs @@ -2,13 +2,11 @@ using System; using System.Net; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.ActionResults; using Umbraco.Web.Common.ActionsResults; diff --git a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs index 735db0fe12..6b283800d3 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs @@ -14,12 +14,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.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.Models.Mapping; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs index e898a1fc40..e9ca69409a 100644 --- a/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs +++ b/src/Umbraco.Web.BackOffice/Mapping/MediaMapDefinition.cs @@ -9,11 +9,7 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; -using Umbraco.Web.Models.Mapping; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Trees; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs b/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs index c006463ca4..c7e1ddb704 100644 --- a/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs +++ b/src/Umbraco.Web.BackOffice/ModelBinders/ContentItemBinder.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -10,12 +9,8 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Mapping; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Serialization; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Controllers; -using Umbraco.Web.Models.Mapping; namespace Umbraco.Web.BackOffice.ModelBinders { diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs index a87930c2ec..554f12c559 100644 --- a/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs +++ b/src/Umbraco.Web.BackOffice/PropertyEditors/TagsDataController.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.PublishedCache; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Models; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.PropertyEditors diff --git a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs index 49c9e471f5..5983203f19 100644 --- a/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/BackOfficeAreaRoutes.cs @@ -7,11 +7,9 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Extensions; using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs index 6ddbb0e206..26a60a002f 100644 --- a/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs +++ b/src/Umbraco.Web.BackOffice/Routing/PreviewRoutes.cs @@ -6,11 +6,9 @@ using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Web.BackOffice.Controllers; using Umbraco.Web.BackOffice.SignalR; -using Umbraco.Web.Common.Extensions; using Umbraco.Web.Common.Routing; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs index afe185d25e..f7515680e6 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Security { diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs index 7f02e24ba5..e850eb4336 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs @@ -1,12 +1,10 @@ using Microsoft.AspNetCore.Identity; -using Umbraco.Core.Security; -using Umbraco.Core; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; -using Umbraco.Core.Serialization; +using Umbraco.Core.Security; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Security diff --git a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs index e0546899c6..c480b06fa3 100644 --- a/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs +++ b/src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs @@ -1,14 +1,12 @@ using System; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Core; using Umbraco.Core.Compose; using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.Common.Security { diff --git a/src/Umbraco.Web.BackOffice/Services/IconService.cs b/src/Umbraco.Web.BackOffice/Services/IconService.cs index e058467915..627705a5d0 100644 --- a/src/Umbraco.Web.BackOffice/Services/IconService.cs +++ b/src/Umbraco.Web.BackOffice/Services/IconService.cs @@ -3,14 +3,11 @@ using System.IO; using System.Linq; using Ganss.XSS; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Services diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs index 3a0ffe695f..00fef1fb35 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs @@ -10,12 +10,9 @@ using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs index 166d456a74..50b309d0e3 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs @@ -17,12 +17,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs index a30e823a99..ed57f7001e 100644 --- a/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs @@ -11,12 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs index c2b6e46d37..9f1fd2b715 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs @@ -11,12 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs index ca9574a3d8..e70e012a56 100644 --- a/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs @@ -9,12 +9,9 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs index 023d7f95ca..148fbfdac2 100644 --- a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs @@ -10,9 +10,7 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; -using Umbraco.Web.Models.Trees; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Trees diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs index 81a1533c8b..af109e0558 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs @@ -1,21 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models.Trees; -using Umbraco.Web.Search; -using Umbraco.Core.Security; -using Constants = Umbraco.Cms.Core.Constants; -using Umbraco.Web.BackOffice.Filters; -using Umbraco.Web.Common.Attributes; -using Umbraco.Web.Common.Exceptions; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Actions; using Umbraco.Cms.Core.Models; @@ -25,7 +14,11 @@ using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; +using Umbraco.Extensions; +using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; +using Umbraco.Web.Search; +using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.BackOffice.Trees { diff --git a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs index bba0652fd0..a881ab30c1 100644 --- a/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs @@ -11,12 +11,9 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Trees; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Authorization; -using Umbraco.Web.Models.Trees; using Umbraco.Web.Search; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs b/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs index 48d8c968f8..7e23abb90f 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeCollectionBuilder.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Trees { diff --git a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs b/src/Umbraco.Web.BackOffice/Trees/TreeController.cs index 81b99ed99a..7b278c76af 100644 --- a/src/Umbraco.Web.BackOffice/Trees/TreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/TreeController.cs @@ -3,8 +3,7 @@ using System.Collections.Concurrent; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Trees; -using Umbraco.Core; -using Umbraco.Core.Services; +using Umbraco.Extensions; namespace Umbraco.Web.BackOffice.Trees { diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index a0976ab41f..6e97249358 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; namespace Umbraco.Web.Common.AspNetCore diff --git a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs index adb132d847..d042f113a1 100644 --- a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Hosting; -using Umbraco.Core.Cache; namespace Umbraco.Extensions { @@ -44,7 +43,7 @@ namespace Umbraco.Extensions } return appCaches.RuntimeCache.GetCacheItem( - Cms.Core.CacheHelperExtensions.PartialViewCacheKey + cacheKey, + CoreCacheHelperExtensions.PartialViewCacheKey + cacheKey, () => htmlHelper.Partial(partialViewName, model, viewData), timeout: new TimeSpan(0, 0, 0, cachedSeconds)); } diff --git a/src/Umbraco.Web.Common/Extensions/EndpointRouteBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/EndpointRouteBuilderExtensions.cs index 3ef9df0064..d1de1a2248 100644 --- a/src/Umbraco.Web.Common/Extensions/EndpointRouteBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/EndpointRouteBuilderExtensions.cs @@ -3,10 +3,8 @@ using System.Text; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; -using NUglify.Helpers; -using Umbraco.Extensions; -namespace Umbraco.Web.Common.Extensions +namespace Umbraco.Extensions { public static class EndpointRouteBuilderExtensions { diff --git a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs index 477ca57b38..ea31fb81f3 100644 --- a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs @@ -5,10 +5,9 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Common.ModelBinders; namespace Umbraco.Web.Common.Filters diff --git a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs index b6c0e3ac07..29358392c5 100644 --- a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs @@ -1,14 +1,10 @@ using System; using System.Buffers; -using System.Linq; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Common.Formatters; namespace Umbraco.Web.Common.Filters diff --git a/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs b/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs index d33c57e3f0..5783d0bdc0 100644 --- a/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs +++ b/src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs @@ -3,8 +3,7 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Common.Constants; using Umbraco.Web.Common.Exceptions; using Umbraco.Web.Common.Security; diff --git a/src/Umbraco.Web.Common/Install/InstallApiController.cs b/src/Umbraco.Web.Common/Install/InstallApiController.cs index d5ae88a95d..55dfa4c9a0 100644 --- a/src/Umbraco.Web.Common/Install/InstallApiController.cs +++ b/src/Umbraco.Web.Common/Install/InstallApiController.cs @@ -6,14 +6,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Install; using Umbraco.Cms.Core.Install.Models; using Umbraco.Cms.Core.Logging; -using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; +using Umbraco.Extensions; using Umbraco.Web.Common.ActionsResults; using Umbraco.Web.Common.Attributes; using Umbraco.Web.Common.Filters; diff --git a/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs b/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs index 41a07cc8d8..04e2a0fa02 100644 --- a/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs +++ b/src/Umbraco.Web.Common/Install/InstallAreaRoutes.cs @@ -1,15 +1,10 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http.Extensions; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; -using System; -using System.Threading.Tasks; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Extensions; -using Umbraco.Web.Common.Extensions; using Umbraco.Web.Common.Routing; namespace Umbraco.Web.Common.Install diff --git a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs index 147b3e51b2..0867e8880e 100644 --- a/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs +++ b/src/Umbraco.Web.Common/ModelBinders/ContentModelBinder.cs @@ -6,10 +6,8 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.PublishedContent; -using Umbraco.Core; -using Umbraco.Core.Events; +using Umbraco.Extensions; using Umbraco.Web.Common.Routing; -using Umbraco.Web.Models; namespace Umbraco.Web.Common.ModelBinders { diff --git a/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs b/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs index 5d758c0d21..22384e7f61 100644 --- a/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs +++ b/src/Umbraco.Web.Common/Routing/RoutableDocumentFilter.cs @@ -7,11 +7,9 @@ using System.Threading; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Template; using Microsoft.Extensions.Options; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; namespace Umbraco.Web.Common.Routing { diff --git a/src/Umbraco.Web.Common/Security/EncryptionHelper.cs b/src/Umbraco.Web.Common/Security/EncryptionHelper.cs index 3808c57545..b89760ff3f 100644 --- a/src/Umbraco.Web.Common/Security/EncryptionHelper.cs +++ b/src/Umbraco.Web.Common/Security/EncryptionHelper.cs @@ -7,7 +7,7 @@ using System.Web; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Common.Constants; namespace Umbraco.Web.Common.Security diff --git a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs index 3cdd0af4f2..e36a58c118 100644 --- a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs +++ b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs @@ -6,10 +6,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Web.PublishedCache; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web diff --git a/src/Umbraco.Web.Common/UmbracoHelper.cs b/src/Umbraco.Web.Common/UmbracoHelper.cs index f9e5bba4df..df131246b3 100644 --- a/src/Umbraco.Web.Common/UmbracoHelper.cs +++ b/src/Umbraco.Web.Common/UmbracoHelper.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Xml; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.Website { diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml index 358028abc6..585206c015 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml @@ -1,7 +1,5 @@ -@using Umbraco.Cms.Core -@using Umbraco.Cms.Core.Routing -@using Umbraco.Core -@using Umbraco.Web.Routing +@using Umbraco.Cms.Core.Routing +@using Umbraco.Extensions @inherits Umbraco.Web.Common.Macros.PartialViewMacroPage @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml index 70add1cca8..d46e3e9cef 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml @@ -1,7 +1,5 @@ -@using Umbraco.Cms.Core @using Umbraco.Cms.Core.Routing -@using Umbraco.Core -@using Umbraco.Web.Routing +@using Umbraco.Extensions @inherits Umbraco.Web.Common.Macros.PartialViewMacroPage @inject IPublishedUrlProvider PublishedUrlProvider @* diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml index 3c126c05ad..7dbd4d05ef 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml @@ -1,8 +1,6 @@ -@using Umbraco.Cms.Core @using Umbraco.Cms.Core.Routing -@using Umbraco.Core +@using Umbraco.Extensions @using Umbraco.Web -@using Umbraco.Web.Routing @inherits Umbraco.Web.Common.Macros.PartialViewMacroPage @inject IPublishedContentQuery PublishedContentQuery @inject IPublishedUrlProvider PublishedUrlProvider diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml index 4944ea5221..f9516e78ce 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml @@ -1,8 +1,6 @@ -@using Umbraco.Cms.Core @using Umbraco.Cms.Core.Models.PublishedContent @using Umbraco.Cms.Core.Routing -@using Umbraco.Core -@using Umbraco.Web.Routing +@using Umbraco.Extensions @inherits Umbraco.Web.Common.Macros.PartialViewMacroPage @inject IPublishedValueFallback PublishedValueFallback @inject IPublishedUrlProvider PublishedUrlProvider diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs index 914a5a22de..1bde6d0bc4 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginController.cs @@ -8,14 +8,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.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Routing; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs index 06727e3222..b425da1d47 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Security; @@ -8,14 +7,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.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Routing; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs index 2f8f0c0ce1..2c62cfbb06 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbProfileController.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Security; @@ -9,14 +8,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.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Routing; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs index 87be3f2a4f..5593d320fa 100644 --- a/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs +++ b/src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models.Security; @@ -9,14 +8,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.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Security; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Common.Filters; -using Umbraco.Web.Routing; namespace Umbraco.Web.Website.Controllers { diff --git a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs index 3f76a547aa..b68d08db05 100644 --- a/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/PublishedContentExtensions.cs @@ -3,15 +3,12 @@ using System.Collections.Generic; using System.Web; using Examine; using Microsoft.AspNetCore.Html; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Core; -using Umbraco.Core.Services; using Umbraco.Examine; -using Umbraco.Web.Routing; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Website.Extensions diff --git a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs index a3bad55eea..dac8f39dea 100644 --- a/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs +++ b/src/Umbraco.Web.Website/Routing/FrontEndRoutes.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; @@ -11,10 +7,8 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Umbraco.Web.Common.Controllers; -using Umbraco.Web.Common.Extensions; using Umbraco.Web.Common.Routing; using Umbraco.Web.Website.Collections; diff --git a/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs b/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs index ddeca4ba05..b7ea9b0d6d 100644 --- a/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs +++ b/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs @@ -1,11 +1,10 @@ using System.Web; -using Microsoft.Extensions.Options; -using Umbraco.Core; -using Umbraco.Core.Configuration; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.IO; +using Umbraco.Extensions; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs index 6063b0b09b..d1ec9aa60d 100644 --- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs +++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs @@ -8,8 +8,7 @@ using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; -using Umbraco.Core; -using Umbraco.Core.Configuration; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Hosting diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs index a623558ada..aecb124b48 100644 --- a/src/Umbraco.Web/HttpCookieExtensions.cs +++ b/src/Umbraco.Web/HttpCookieExtensions.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Net.Http.Headers; using System.Web; -using Microsoft.Owin; -using Newtonsoft.Json; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web diff --git a/src/Umbraco.Web/HttpRequestExtensions.cs b/src/Umbraco.Web/HttpRequestExtensions.cs index 4a2bc9f0e9..183de2dbe5 100644 --- a/src/Umbraco.Web/HttpRequestExtensions.cs +++ b/src/Umbraco.Web/HttpRequestExtensions.cs @@ -1,9 +1,6 @@ -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web; +using System.Web; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs index 5d02912454..7a2023715e 100644 --- a/src/Umbraco.Web/ModelStateExtensions.cs +++ b/src/Umbraco.Web/ModelStateExtensions.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Web.Mvc; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs index daf50a5c32..6395a0d193 100644 --- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Web; using System.Web.Mvc; -using Umbraco.Cms.Core; +using Umbraco.Extensions; using AuthorizeAttribute = System.Web.Mvc.AuthorizeAttribute; -using Umbraco.Core; -using Umbraco.Web.Security; using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Web.Mvc diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs index de627553da..977150e692 100644 --- a/src/Umbraco.Web/Mvc/PluginController.cs +++ b/src/Umbraco.Web/Mvc/PluginController.cs @@ -2,19 +2,14 @@ using System.Collections.Concurrent; using System.Web.Mvc; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.Web.Mvc; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; using Umbraco.Core.Persistence; -using Umbraco.Core.Services; -using Umbraco.Web.Security; +using Umbraco.Extensions; using Umbraco.Web.WebApi; using Current = Umbraco.Web.Composing.Current; diff --git a/src/Umbraco.Web/Mvc/ViewDataDictionaryExtensions.cs b/src/Umbraco.Web/Mvc/ViewDataDictionaryExtensions.cs index 85c430e471..8178099b3e 100644 --- a/src/Umbraco.Web/Mvc/ViewDataDictionaryExtensions.cs +++ b/src/Umbraco.Web/Mvc/ViewDataDictionaryExtensions.cs @@ -1,6 +1,5 @@ using System.Web.Mvc; -using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index a2ffb69445..961a8cd86d 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -12,12 +12,7 @@ using Umbraco.Cms.Core.Models.Security; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using Umbraco.Web.Models; -using Umbraco.Web.PublishedCache; +using Umbraco.Extensions; using Umbraco.Web.Security.Providers; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web/Security/MembershipProviderBase.cs b/src/Umbraco.Web/Security/MembershipProviderBase.cs index fb30747df8..d664dc527e 100644 --- a/src/Umbraco.Web/Security/MembershipProviderBase.cs +++ b/src/Umbraco.Web/Security/MembershipProviderBase.cs @@ -4,16 +4,12 @@ using System.ComponentModel.DataAnnotations; using System.Configuration.Provider; using System.Text; using System.Text.RegularExpressions; -using System.Web; -using System.Web.Hosting; -using System.Web.Configuration; using System.Web.Security; using Microsoft.Extensions.Logging; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Hosting; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Core.Security; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Security diff --git a/src/Umbraco.Web/Security/MembershipProviderExtensions.cs b/src/Umbraco.Web/Security/MembershipProviderExtensions.cs index 235c22bf00..caf27dddf2 100644 --- a/src/Umbraco.Web/Security/MembershipProviderExtensions.cs +++ b/src/Umbraco.Web/Security/MembershipProviderExtensions.cs @@ -3,10 +3,9 @@ using System.Security.Principal; using System.Threading; using System.Web; using System.Web.Security; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Core; using Umbraco.Web.Models.Membership; using Umbraco.Web.Security.Providers; using Constants = Umbraco.Cms.Core.Constants; diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs index 906a3bc75f..008d81623d 100644 --- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs @@ -1,13 +1,7 @@ -using System.Collections.Specialized; +using System; +using System.Collections.Specialized; using System.Configuration.Provider; using System.Web.Security; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Models; -using Umbraco.Core.Security; -using Umbraco.Core.Services; -using Umbraco.Web.Composing; -using System; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; @@ -15,6 +9,8 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; +using Umbraco.Extensions; +using Umbraco.Web.Composing; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Web.Security.Providers diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs index 0312f73f11..5c21e43b2a 100644 --- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs @@ -6,23 +6,17 @@ using System.Text; using System.Web.Configuration; using System.Web.Security; using Microsoft.Extensions.Logging; -using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Persistence.Querying; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Persistence.Querying; -using Umbraco.Core.Services; +using Umbraco.Extensions; using Umbraco.Web.Composing; namespace Umbraco.Web.Security.Providers { - - /// /// Abstract Membership Provider that users any implementation of IMembershipMemberService{TEntity} service /// diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs index d7778b7c29..10a8894a15 100644 --- a/src/Umbraco.Web/UmbracoApplicationBase.cs +++ b/src/Umbraco.Web/UmbracoApplicationBase.cs @@ -8,7 +8,6 @@ using System.Web.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Serilog.Context; using Umbraco.Cms.Core; @@ -21,12 +20,9 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Net; using Umbraco.Cms.Core.Services; -using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Logging.Serilog; using Umbraco.Core.Logging.Serilog.Enrichers; +using Umbraco.Extensions; using Umbraco.Web.Hosting; using ConnectionStrings = Umbraco.Cms.Core.Configuration.Models.ConnectionStrings; using Current = Umbraco.Web.Composing.Current; diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 58b4ae76ae..d396aee2f0 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Web; using System.Xml.XPath; -using Umbraco.Core; -using Umbraco.Web.Mvc; using Microsoft.Extensions.Logging; -using Umbraco.Web.Security; -using System.Threading.Tasks; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Dictionary; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Core.Templates; using Umbraco.Cms.Core.Xml; +using Umbraco.Extensions; +using Umbraco.Web.Mvc; +using Umbraco.Web.Security; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs index 037208aeb9..0a19f6a738 100644 --- a/src/Umbraco.Web/UrlHelperExtensions.cs +++ b/src/Umbraco.Web/UrlHelperExtensions.cs @@ -1,11 +1,10 @@ using System; -using System.Globalization; using System.Linq; using System.Linq.Expressions; using System.Web.Mvc; using System.Web.Routing; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; using Umbraco.Web.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.WebApi; diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs index 5a38e26ea4..63a59315a4 100644 --- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs @@ -1,14 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Web; using System.Web.Mvc; using Umbraco.Cms.Core; -using Umbraco.Core; -using Umbraco.Core.PropertyEditors.ValueConverters; +using Umbraco.Extensions; using Umbraco.Web.Composing; -using Umbraco.Web.Models; -using Umbraco.Web.Mvc; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs index 6404def298..d91f164cf2 100644 --- a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Web.Http; -using Umbraco.Cms.Core; -using Umbraco.Core; -using Umbraco.Web.Security; +using Umbraco.Extensions; using Current = Umbraco.Web.Composing.Current; namespace Umbraco.Web.WebApi diff --git a/src/Umbraco.Web/WebApi/ParameterSwapControllerActionSelector.cs b/src/Umbraco.Web/WebApi/ParameterSwapControllerActionSelector.cs index 118c7192aa..9ae6786ca4 100644 --- a/src/Umbraco.Web/WebApi/ParameterSwapControllerActionSelector.cs +++ b/src/Umbraco.Web/WebApi/ParameterSwapControllerActionSelector.cs @@ -6,7 +6,7 @@ using System.Web.Http.Controllers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Cms.Core; -using Umbraco.Core; +using Umbraco.Extensions; namespace Umbraco.Web.WebApi {