yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Netcore: Align namespaces (#9801)

Browse Source 
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
This commit is contained in:
Mole
2021-02-18 11:06:02 +01:00
committed by GitHub
parent f1717a17f5
commit bf41c2eeaa
3188 changed files with 12023 additions and 11215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Infrastructure/Cache/DatabaseServerMessengerNotificationHandler.cs
View File

@@ -1,4 +1,7 @@
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Sync;
using Umbraco.Core.Events;
using Umbraco.Core.Persistence;
using Umbraco.Core.Sync;

4
src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
View File

@@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Models.Entities;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Core.Scoping;
using Umbraco.Extensions;
namespace Umbraco.Core.Cache
{

6
src/Umbraco.Infrastructure/Cache/DistributedCacheBinder.cs
View File

@@ -4,8 +4,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Events;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Web;
using Umbraco.Extensions;
namespace Umbraco.Web.Cache
{

8
src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
View File

@@ -2,11 +2,15 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.Changes;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Changes;
using Umbraco.Core.Services.Implement;
namespace Umbraco.Web.Cache

4
src/Umbraco.Infrastructure/Cache/DistributedCacheExtensions.cs
View File

@@ -1,6 +1,8 @@
using System.Linq;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services.Changes;
using Umbraco.Core.Models;
using Umbraco.Core.Services.Changes;
namespace Umbraco.Web.Cache
{

6
src/Umbraco.Infrastructure/Cache/FullDataSetRepositoryCachePolicy.cs
View File

@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Collections;
using Umbraco.Core.Models.Entities;
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
{

4
src/Umbraco.Infrastructure/Cache/RepositoryCachePolicyBase.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.Models.Entities;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Core.Scoping;
namespace Umbraco.Core.Cache

3
src/Umbraco.Infrastructure/Cache/SingleItemsOnlyRepositoryCachePolicy.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.Models.Entities;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Core.Scoping;
namespace Umbraco.Core.Cache

16
src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
View File

@@ -3,17 +3,21 @@ using System.Linq;
using System.Text;
using System.Threading;
using Microsoft.Extensions.Options;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration.Models;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Net;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Extensions;
using Umbraco.Net;
namespace Umbraco.Core.Compose
{
public sealed class AuditEventsComponent : IComponent
@@ -63,7 +67,7 @@ namespace Umbraco.Core.Compose
MemberService.Exported -= OnMemberExported;
}
public static IUser UnknownUser(GlobalSettings globalSettings) => new User(globalSettings) { Id = Constants.Security.UnknownUserId, Name = Constants.Security.UnknownUserName, Email = "" };
public static IUser UnknownUser(GlobalSettings globalSettings) => new User(globalSettings) { Id = Cms.Core.Constants.Security.UnknownUserId, Name = Cms.Core.Constants.Security.UnknownUserName, Email = "" };
private IUser CurrentPerformingUser
{

2
src/Umbraco.Infrastructure/Compose/AuditEventsComposer.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Core.Compose
{

7
src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
View File

@@ -3,10 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Core.Models.Blocks;
using Umbraco.Core.PropertyEditors;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Compose
{

2
src/Umbraco.Infrastructure/Compose/BlockEditorComposer.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Web.Compose
{

7
src/Umbraco.Infrastructure/Compose/NestedContentPropertyComponent.cs
View File

@@ -1,14 +1,15 @@
using System;
using System.Linq;
using Newtonsoft.Json.Linq;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Composing;
using Umbraco.Core.PropertyEditors;
using Umbraco.Extensions;
using Umbraco.Web.PropertyEditors;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Compose
{
/// <summary>
/// A component for NestedContent used to bind to events
/// </summary>

4
src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs
View File

@@ -1,5 +1,5 @@
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Core;
namespace Umbraco.Web.Compose
{

59
src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
View File

@@ -1,20 +1,25 @@
using System;
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Entities;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Cms.Core.Actions;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Models;
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.Services.Implement;
using Umbraco.Web.Actions;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Compose
{
@@ -72,40 +77,40 @@ namespace Umbraco.Web.Compose
UserService.UserGroupPermissionsAssigned -= UserService_UserGroupPermissionsAssigned;
}
private void UserService_UserGroupPermissionsAssigned(IUserService sender, Core.Events.SaveEventArgs<EntityPermission> args)
private void UserService_UserGroupPermissionsAssigned(IUserService sender, SaveEventArgs<EntityPermission> args)
=> UserServiceUserGroupPermissionsAssigned(args, _contentService);
private void PublicAccessService_Saved(IPublicAccessService sender, Core.Events.SaveEventArgs<PublicAccessEntry> args)
private void PublicAccessService_Saved(IPublicAccessService sender, SaveEventArgs<PublicAccessEntry> args)
=> PublicAccessServiceSaved(args, _contentService);
private void ContentService_RolledBack(IContentService sender, Core.Events.RollbackEventArgs<IContent> args)
private void ContentService_RolledBack(IContentService sender, RollbackEventArgs<IContent> args)
=> _notifier.Notify(_actions.GetAction<ActionRollback>(), args.Entity);
private void ContentService_Copied(IContentService sender, Core.Events.CopyEventArgs<IContent> args)
private void ContentService_Copied(IContentService sender, CopyEventArgs<IContent> args)
=> _notifier.Notify(_actions.GetAction<ActionCopy>(), args.Original);
private void ContentService_Trashed(IContentService sender, Core.Events.MoveEventArgs<IContent> args)
private void ContentService_Trashed(IContentService sender, MoveEventArgs<IContent> args)
=> _notifier.Notify(_actions.GetAction<ActionDelete>(), args.MoveInfoCollection.Select(m => m.Entity).ToArray());
private void ContentService_Moved(IContentService sender, Core.Events.MoveEventArgs<IContent> args)
private void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> args)
=> ContentServiceMoved(args);
private void ContentService_Unpublished(IContentService sender, Core.Events.PublishEventArgs<IContent> args)
private void ContentService_Unpublished(IContentService sender, PublishEventArgs<IContent> args)
=> _notifier.Notify(_actions.GetAction<ActionUnpublish>(), args.PublishedEntities.ToArray());
private void ContentService_Saved(IContentService sender, Core.Events.ContentSavedEventArgs args)
private void ContentService_Saved(IContentService sender, ContentSavedEventArgs args)
=> ContentServiceSaved(args);
private void ContentService_Sorted(IContentService sender, Core.Events.SaveEventArgs<IContent> args)
private void ContentService_Sorted(IContentService sender, SaveEventArgs<IContent> args)
=> ContentServiceSorted(sender, args);
private void ContentService_Published(IContentService sender, Core.Events.ContentPublishedEventArgs args)
private void ContentService_Published(IContentService sender, ContentPublishedEventArgs args)
=> _notifier.Notify(_actions.GetAction<ActionPublish>(), args.PublishedEntities.ToArray());
private void ContentService_SentToPublish(IContentService sender, Core.Events.SendToPublishEventArgs<IContent> args)
private void ContentService_SentToPublish(IContentService sender, SendToPublishEventArgs<IContent> args)
=> _notifier.Notify(_actions.GetAction<ActionToPublish>(), args.Entity);
private void ContentServiceSorted(IContentService sender, Core.Events.SaveEventArgs<IContent> args)
private void ContentServiceSorted(IContentService sender, SaveEventArgs<IContent> args)
{
var parentId = args.SavedEntities.Select(x => x.ParentId).Distinct().ToList();
if (parentId.Count != 1) return; // this shouldn't happen, for sorting all entities will have the same parent id
@@ -120,7 +125,7 @@ namespace Umbraco.Web.Compose
_notifier.Notify(_actions.GetAction<ActionSort>(), new[] { parent });
}
private void ContentServiceSaved(Core.Events.SaveEventArgs<IContent> args)
private void ContentServiceSaved(SaveEventArgs<IContent> args)
{
var newEntities = new List<IContent>();
var updatedEntities = new List<IContent>();
@@ -144,7 +149,7 @@ namespace Umbraco.Web.Compose
_notifier.Notify(_actions.GetAction<ActionUpdate>(), updatedEntities.ToArray());
}
private void UserServiceUserGroupPermissionsAssigned(Core.Events.SaveEventArgs<EntityPermission> args, IContentService contentService)
private void UserServiceUserGroupPermissionsAssigned(SaveEventArgs<EntityPermission> args, IContentService contentService)
{
var entities = contentService.GetByIds(args.SavedEntities.Select(e => e.EntityId)).ToArray();
if (entities.Any() == false)
@@ -154,7 +159,7 @@ namespace Umbraco.Web.Compose
_notifier.Notify(_actions.GetAction<ActionRights>(), entities);
}
private void ContentServiceMoved(Core.Events.MoveEventArgs<IContent> args)
private void ContentServiceMoved(MoveEventArgs<IContent> args)
{
// notify about the move for all moved items
_notifier.Notify(_actions.GetAction<ActionMove>(), args.MoveInfoCollection.Select(m => m.Entity).ToArray());
@@ -170,7 +175,7 @@ namespace Umbraco.Web.Compose
}
}
private void PublicAccessServiceSaved(Core.Events.SaveEventArgs<PublicAccessEntry> args, IContentService contentService)
private void PublicAccessServiceSaved(SaveEventArgs<PublicAccessEntry> args, IContentService contentService)
{
var entities = contentService.GetByIds(args.SavedEntities.Select(e => e.ProtectedNodeId)).ToArray();
if (entities.Any() == false)

5
src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
View File

@@ -1,5 +1,6 @@
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Extensions;
namespace Umbraco.Web.Compose
{

10
src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
View File

@@ -1,8 +1,10 @@
using System;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Services;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Extensions;
namespace Umbraco.Web.Compose
{
@@ -24,7 +26,7 @@ namespace Umbraco.Web.Compose
MemberGroupService.Saved -= MemberGroupService_Saved;
}
private void MemberGroupService_Saved(IMemberGroupService sender, Core.Events.SaveEventArgs<Core.Models.IMemberGroup> e)
private void MemberGroupService_Saved(IMemberGroupService sender, SaveEventArgs<IMemberGroup> e)
{
foreach (var grp in e.SavedEntities)
{

2
src/Umbraco.Infrastructure/Compose/PublicAccessComposer.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Web.Compose
{

17
src/Umbraco.Infrastructure/Compose/RelateOnCopyComponent.cs
View File

@@ -1,4 +1,7 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
@@ -27,20 +30,20 @@ namespace Umbraco.Core.Compose
ContentService.Copied -= ContentServiceCopied;
}
private void ContentServiceCopied(IContentService sender, Events.CopyEventArgs<IContent> e)
private void ContentServiceCopied(IContentService sender, CopyEventArgs<IContent> e)
{
if (e.RelateToOriginal == false) return;
var relationType = _relationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
var relationType = _relationService.GetRelationTypeByAlias(Cms.Core.Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
if (relationType == null)
{
relationType = new RelationType(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias,
Constants.Conventions.RelationTypes.RelateDocumentOnCopyName,
relationType = new RelationType(Cms.Core.Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias,
Cms.Core.Constants.Conventions.RelationTypes.RelateDocumentOnCopyName,
true,
Constants.ObjectTypes.Document,
Constants.ObjectTypes.Document);
Cms.Core.Constants.ObjectTypes.Document,
Cms.Core.Constants.ObjectTypes.Document);
_relationService.Save(relationType);
}

2
src/Umbraco.Infrastructure/Compose/RelateOnCopyComposer.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Core.Compose
{

33
src/Umbraco.Infrastructure/Compose/RelateOnTrashComponent.cs
View File

@@ -1,10 +1,11 @@
using System.Linq;
using Umbraco.Core.Composing;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Scoping;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Extensions;
namespace Umbraco.Core.Compose
{
@@ -48,10 +49,10 @@ namespace Umbraco.Core.Compose
private void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
{
foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Cms.Core.Constants.System.RecycleBinContentString)))
{
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
const string relationTypeAlias = Cms.Core.Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
var relations = _relationService.GetByChildId(item.Entity.Id);
foreach (var relation in relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias)))
@@ -63,9 +64,9 @@ namespace Umbraco.Core.Compose
private void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
{
foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Cms.Core.Constants.System.RecycleBinMediaString)))
{
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
const string relationTypeAlias = Cms.Core.Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
var relations = _relationService.GetByChildId(item.Entity.Id);
foreach (var relation in relations.Where(x => x.RelationType.Alias.InvariantEquals(relationTypeAlias)))
{
@@ -78,15 +79,15 @@ namespace Umbraco.Core.Compose
{
using (var scope = _scopeProvider.CreateScope())
{
const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
const string relationTypeAlias = Cms.Core.Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
var relationType = _relationService.GetRelationTypeByAlias(relationTypeAlias);
// check that the relation-type exists, if not, then recreate it
if (relationType == null)
{
var documentObjectType = Constants.ObjectTypes.Document;
var documentObjectType = Cms.Core.Constants.ObjectTypes.Document;
const string relationTypeName =
Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName;
Cms.Core.Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName;
relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType,
documentObjectType);
@@ -98,7 +99,7 @@ namespace Umbraco.Core.Compose
var originalPath = item.OriginalPath.ToDelimitedList();
var originalParentId = originalPath.Count > 2
? int.Parse(originalPath[originalPath.Count - 2])
: Constants.System.Root;
: Cms.Core.Constants.System.Root;
//before we can create this relation, we need to ensure that the original parent still exists which
//may not be the case if the encompassing transaction also deleted it when this item was moved to the bin
@@ -129,14 +130,14 @@ namespace Umbraco.Core.Compose
using (var scope = _scopeProvider.CreateScope())
{
const string relationTypeAlias =
Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
Cms.Core.Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
var relationType = _relationService.GetRelationTypeByAlias(relationTypeAlias);
// check that the relation-type exists, if not, then recreate it
if (relationType == null)
{
var documentObjectType = Constants.ObjectTypes.Document;
var documentObjectType = Cms.Core.Constants.ObjectTypes.Document;
const string relationTypeName =
Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName;
Cms.Core.Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName;
relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType,
documentObjectType);
_relationService.Save(relationType);
@@ -147,7 +148,7 @@ namespace Umbraco.Core.Compose
var originalPath = item.OriginalPath.ToDelimitedList();
var originalParentId = originalPath.Count > 2
? int.Parse(originalPath[originalPath.Count - 2])
: Constants.System.Root;
: Cms.Core.Constants.System.Root;
//before we can create this relation, we need to ensure that the original parent still exists which
//may not be the case if the encompassing transaction also deleted it when this item was moved to the bin
if (_entityService.Exists(originalParentId))

2
src/Umbraco.Infrastructure/Compose/RelateOnTrashComposer.cs
View File

@@ -1,4 +1,4 @@
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Core.Compose
{

5
src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
View File

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration.Json;
using Microsoft.Extensions.FileProviders;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.Configuration;
namespace Umbraco.Core.Configuration
{
@@ -17,7 +18,7 @@ namespace Umbraco.Core.Configuration
_configuration = configuration;
}
public string UmbracoConnectionPath { get; } = $"ConnectionStrings:{ Constants.System.UmbracoConnectionName}";
public string UmbracoConnectionPath { get; } = $"ConnectionStrings:{ Cms.Core.Constants.System.UmbracoConnectionName}";
public void RemoveConnectionString()
{
var provider = GetJsonConfigurationProvider(UmbracoConnectionPath);
@@ -142,7 +143,7 @@ namespace Umbraco.Core.Configuration
writer.WriteStartObject();
writer.WritePropertyName("ConnectionStrings");
writer.WriteStartObject();
writer.WritePropertyName(Constants.System.UmbracoConnectionName);
writer.WritePropertyName(Cms.Core.Constants.System.UmbracoConnectionName);
writer.WriteValue(connectionString);
writer.WriteEndObject();
writer.WriteEndObject();

1
src/Umbraco.Infrastructure/Configuration/NCronTabParser.cs
View File

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

6
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs
View File

@@ -1,12 +1,8 @@
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Core.Cache;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Manifest;
using Umbraco.Core.PackageActions;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Strings;
using Umbraco.Core.Trees;
using Umbraco.Web.Media.EmbedProviders;
namespace Umbraco.Infrastructure.DependencyInjection
{

36
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
View File

@@ -3,30 +3,41 @@ using Examine;
using Microsoft.Extensions.DependencyInjection;
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.DependencyInjection;
using Umbraco.Cms.Core.HealthChecks.NotificationMethods;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Install;
using Umbraco.Cms.Core.Mail;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Core.Media;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Templates;
using Umbraco.Cms.Core.Trees;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.HealthChecks.NotificationMethods;
using Umbraco.Core.Hosting;
using Umbraco.Core.Install;
using Umbraco.Core.Logging.Serilog.Enrichers;
using Umbraco.Core.Mail;
using Umbraco.Core.Manifest;
using Umbraco.Core.Media;
using Umbraco.Core.Migrations;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Migrations.PostMigrations;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Packaging;
using Umbraco.Core.Persistence;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Core.Runtime;
using Umbraco.Core.Scoping;
using Umbraco.Core.Serialization;
using Umbraco.Core.Strings;
using Umbraco.Core.Templates;
using Umbraco.Examine;
using Umbraco.Extensions;
using Umbraco.Infrastructure.Examine;
using Umbraco.Infrastructure.HealthChecks;
using Umbraco.Infrastructure.HostedServices;
@@ -37,13 +48,10 @@ using Umbraco.Infrastructure.Runtime;
using Umbraco.Web;
using Umbraco.Web.Media;
using Umbraco.Web.Migrations.PostMigrations;
using Umbraco.Web.Models.PublishedContent;
using Umbraco.Web.PropertyEditors;
using Umbraco.Web.PropertyEditors.ValueConverters;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web.Search;
using Umbraco.Web.Trees;
namespace Umbraco.Infrastructure.DependencyInjection
{

12
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs
View File

@@ -1,13 +1,15 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Events;
using Umbraco.Core.Services.Changes;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Services.Changes;
using Umbraco.Cms.Core.Sync;
using Umbraco.Core.Sync;
using Umbraco.Extensions;
using Umbraco.Infrastructure.Cache;
using Umbraco.Web.Cache;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Search;
namespace Umbraco.Infrastructure.DependencyInjection

11
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.FileSystems.cs
View File

@@ -1,11 +1,12 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.IO.MediaPathSchemes;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.IO.MediaPathSchemes;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.DependencyInjection
{

7
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Installer.cs
View File

@@ -1,9 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Install.InstallSteps;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Install.InstallSteps;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Extensions;
using Umbraco.Web.Install;
using Umbraco.Web.Install.InstallSteps;
using Umbraco.Web.Install.Models;
namespace Umbraco.Infrastructure.DependencyInjection
{

6
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
View File

@@ -1,7 +1,9 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Mapping;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models.Mapping;
using Umbraco.Core.Security;
using Umbraco.Extensions;
using Umbraco.Web.Models.Mapping;
namespace Umbraco.Infrastructure.DependencyInjection

4
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs
View File

@@ -1,6 +1,8 @@
using Umbraco.Core.DependencyInjection;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.Repositories.Implement;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.DependencyInjection
{

18
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
View File

@@ -4,17 +4,19 @@ using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Events;
using Umbraco.Core.Hosting;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Packaging;
using Umbraco.Core.Routing;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Infrastructure.DependencyInjection
{

12
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Uniques.cs
View File

@@ -1,12 +1,12 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Dictionary;
using Umbraco.Core.IO;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Dictionary;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core.Logging.Viewer;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Strings;
using Umbraco.Core.Sync;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.DependencyInjection
{

1
src/Umbraco.Infrastructure/Deploy/IGridCellValueConnector.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using Umbraco.Cms.Core.Deploy;
using Umbraco.Core.Models;
namespace Umbraco.Core.Deploy

6
src/Umbraco.Infrastructure/EmailSender.cs
View File

@@ -5,9 +5,11 @@ using MailKit.Security;
using Microsoft.Extensions.Options;
using MimeKit;
using MimeKit.Text;
using Umbraco.Core.Configuration.Models;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Mail;
using Umbraco.Cms.Core.Models;
using Umbraco.Core.Events;
using Umbraco.Core.Mail;
using Umbraco.Core.Models;
using SmtpClient = MailKit.Net.Smtp.SmtpClient;

3
src/Umbraco.Infrastructure/Events/MigrationEventArgs.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Semver;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Semver;
using Umbraco.Core.Migrations;
namespace Umbraco.Core.Events

4
src/Umbraco.Infrastructure/Events/QueuingEventDispatcher.cs
View File

@@ -1,5 +1,5 @@
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.IO;
namespace Umbraco.Core.Events
{

8
src/Umbraco.Infrastructure/Examine/BaseValueSetBuilder.cs
View File

@@ -1,12 +1,12 @@
using System.Collections.Generic;
using Examine;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.PropertyEditors;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Extensions;
namespace Umbraco.Examine
{
/// <inheritdoc />
public abstract class BaseValueSetBuilder<TContent> : IValueSetBuilder<TContent>
where TContent : IContentBase

4
src/Umbraco.Infrastructure/Examine/ContentIndexPopulator.cs
View File

@@ -2,6 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Persistence.Querying;
using Umbraco.Cms.Core.Services;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;

17
src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
View File

@@ -1,13 +1,14 @@
using Examine;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.PropertyEditors;
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.Scoping;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Extensions;
namespace Umbraco.Examine
{

5
src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
View File

@@ -1,8 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Cms.Core.Services;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Examine
{

3
src/Umbraco.Infrastructure/Examine/ExamineExtensions.cs
View File

@@ -1,7 +1,8 @@
using System;
using System.Collections.Generic;
using Examine;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Examine;
using Umbraco.Web.PublishedCache;

5
src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
View File

@@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Composing;
using Umbraco.Extensions;
namespace Umbraco.Examine
{

2
src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs
View File

@@ -1,6 +1,6 @@
using Examine;
using System.Collections.Generic;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Cms.Core.Models.ContentEditing;
namespace Umbraco.Examine
{

1
src/Umbraco.Infrastructure/Examine/IContentValueSetBuilder.cs
View File

@@ -1,4 +1,5 @@
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Core.Models;
namespace Umbraco.Examine

1
src/Umbraco.Infrastructure/Examine/IIndexDiagnostics.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Core;
namespace Umbraco.Examine

3
src/Umbraco.Infrastructure/Examine/IPublishedContentValueSetBuilder.cs
View File

@@ -1,4 +1,5 @@
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Core.Models;
namespace Umbraco.Examine
@@ -9,4 +10,4 @@ namespace Umbraco.Examine
public interface IPublishedContentValueSetBuilder : IValueSetBuilder<IContent>
{
}
}
}

2
src/Umbraco.Infrastructure/Examine/IndexPopulator.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Core.Collections;
using Umbraco.Cms.Core.Collections;
namespace Umbraco.Examine
{

2
src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using Microsoft.Extensions.Logging;
using System.Threading.Tasks;
using Examine;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging;
namespace Umbraco.Examine

2
src/Umbraco.Infrastructure/Examine/MediaIndexPopulator.cs
View File

@@ -1,6 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Models;
using Umbraco.Core.Services;

16
src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
View File

@@ -1,15 +1,17 @@
using System;
using Examine;
using System.Collections.Generic;
using System.Linq;
using Examine;
using Microsoft.Extensions.Logging;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.PropertyEditors;
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.Cms.Core.Strings;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Core.Serialization;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Examine
{

2
src/Umbraco.Infrastructure/Examine/MemberIndexPopulator.cs
View File

@@ -1,6 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Models;
using Umbraco.Core.Services;

11
src/Umbraco.Infrastructure/Examine/MemberValueSetBuilder.cs
View File

@@ -1,9 +1,10 @@
using Examine;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.PropertyEditors;
using Examine;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Extensions;
namespace Umbraco.Examine
{

2
src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs
View File

@@ -1,8 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Examine;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Infrastructure.Examine
{

4
src/Umbraco.Infrastructure/Examine/PublishedContentIndexPopulator.cs
View File

@@ -1,5 +1,5 @@
using Umbraco.Core.Persistence;
using Umbraco.Core.Services;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Persistence;
namespace Umbraco.Examine
{

10
src/Umbraco.Infrastructure/Examine/UmbracoExamineExtensions.cs
View File

@@ -1,8 +1,8 @@
using Examine;
using Examine.Search;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using Umbraco.Core;
using Examine;
using Examine.Search;
using Umbraco.Extensions;
namespace Umbraco.Examine
{
@@ -16,7 +16,7 @@ namespace Umbraco.Examine
/// </remarks>
internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
//TODO: We need a public method here to just match a field name against CultureIsoCodeFieldNameMatchExpression

1
src/Umbraco.Infrastructure/Examine/UmbracoIndexConfig.cs
View File

@@ -1,4 +1,5 @@
using Examine;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Services;
namespace Umbraco.Examine

2
src/Umbraco.Infrastructure/Examine/ValueSetValidator.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Examine;
using Umbraco.Core;
using Umbraco.Extensions;
namespace Umbraco.Examine
{

4
src/Umbraco.Infrastructure/HealthChecks/MarkdownToHtmlConverter.cs
View File

@@ -1,6 +1,6 @@
using HeyRed.MarkdownSharp;
using Umbraco.Core.HealthChecks;
using Umbraco.Core.HealthChecks.NotificationMethods;
using Umbraco.Cms.Core.HealthChecks;
using Umbraco.Cms.Core.HealthChecks.NotificationMethods;
namespace Umbraco.Infrastructure.HealthChecks
{

18
src/Umbraco.Infrastructure/HostedServices/HealthCheckNotifier.cs
View File

@@ -7,15 +7,17 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Extensions;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.HealthChecks;
using Umbraco.Core.HealthChecks.NotificationMethods;
using Umbraco.Core.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.HealthChecks;
using Umbraco.Cms.Core.HealthChecks.NotificationMethods;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Core.Scoping;
using Umbraco.Core.Sync;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.HostedServices
{

11
src/Umbraco.Infrastructure/HostedServices/KeepAlive.cs
View File

@@ -6,11 +6,12 @@ using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.Logging;
using Umbraco.Core.Sync;
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.Extensions;
namespace Umbraco.Infrastructure.HostedServices
{

6
src/Umbraco.Infrastructure/HostedServices/LogScrubber.cs
View File

@@ -5,8 +5,12 @@ using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Logging;
using Umbraco.Core.Scoping;
using Umbraco.Core.Services;

10
src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
View File

@@ -1,14 +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.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Newtonsoft.Json;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Extensions;
using Umbraco.Infrastructure.HostedServices;
namespace Umbraco.Web.Telemetry

6
src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
View File

@@ -6,6 +6,12 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Security;
using Umbraco.Core.Services;

5
src/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTask.cs
View File

@@ -5,8 +5,11 @@ using System;
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.Services;
using Umbraco.Cms.Core.Sync;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Sync;
namespace Umbraco.Infrastructure.HostedServices.ServerRegistration

9
src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
View File

@@ -5,10 +5,11 @@ using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.Services;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Services;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.HostedServices.ServerRegistration
{

3
src/Umbraco.Infrastructure/HostedServices/TempFileCleanup.cs
View File

@@ -5,8 +5,9 @@ using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Core;
using Umbraco.Core.IO;
namespace Umbraco.Infrastructure.HostedServices
{

8
src/Umbraco.Infrastructure/IPublishedContentQuery.cs
View File

@@ -2,9 +2,11 @@
using System.Collections.Generic;
using System.Xml.XPath;
using Examine.Search;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Xml;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Xml;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web
{
@@ -44,7 +46,7 @@ namespace Umbraco.Web
/// </summary>
/// <param name="term">The term to search.</param>
/// <param name="culture">The culture (defaults to a culture insensitive search).</param>
/// <param name="indexName">The name of the index to search (defaults to <see cref="Constants.UmbracoIndexes.ExternalIndexName" />).</param>
/// <param name="indexName">The name of the index to search (defaults to <see cref="Cms.Core.Constants.UmbracoIndexes.ExternalIndexName" />).</param>
/// <returns>
/// The search results.
/// </returns>

11
src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs
View File

@@ -7,11 +7,12 @@ using System.IO;
using System.Linq;
using System.Security.AccessControl;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.Install;
using Umbraco.Core.IO;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Install;
using Umbraco.Cms.Core.IO;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Infrastructure.Install
{

22
src/Umbraco.Infrastructure/Install/InstallHelper.cs
View File

@@ -4,17 +4,19 @@ 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.Net;
using Umbraco.Core.Persistence;
using Umbraco.Core.Serialization;
using Umbraco.Core.Services;
using Umbraco.Web.Install.Models;
using Microsoft.Extensions.Options;
using Umbraco.Core.Configuration.Models;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Install.Models;
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
{

4
src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
View File

@@ -1,8 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Install.InstallSteps;
using Umbraco.Cms.Core.Install.InstallSteps;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Web.Install.InstallSteps;
using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install
{

2
src/Umbraco.Infrastructure/Install/InstallSteps/CompleteInstallStep.cs
View File

@@ -1,5 +1,5 @@
using System.Threading.Tasks;
using Umbraco.Web.Install.Models;
using Umbraco.Cms.Core.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{

9
src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs
View File

@@ -3,10 +3,13 @@ using System.Collections.Generic;
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.Install;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Migrations.Install;
using Umbraco.Web.Install.Models;
using Umbraco.Extensions;
namespace Umbraco.Web.Install.InstallSteps
{
@@ -95,7 +98,7 @@ namespace Umbraco.Web.Install.InstallSteps
// NOTE: Type.GetType will only return types that are currently loaded into the appdomain. In this case
// that is ok because we know if this is availalbe we will have manually loaded it into the appdomain.
// Else we'd have to use Assembly.LoadFrom and need to know the DLL location here which we don't need to do.
return !(Type.GetType("Umbraco.Persistence.SqlCe.SqlCeSyntaxProvider, Umbraco.Persistence.SqlCe") is null);
return !(Type.GetType("Umbraco.Cms.Persistence.SqlCe.SqlCeSyntaxProvider, Umbraco.Persistence.SqlCe") is null);
}
public override string View => ShouldDisplayView() ? base.View : "";

6
src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseInstallStep.cs
View File

@@ -1,12 +1,14 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Install;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{

10
src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseUpgradeStep.cs
View File

@@ -3,13 +3,17 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Install;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.IO;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Migrations.Upgrade;
using Umbraco.Web.Install.Models;
using Umbraco.Extensions;
using Umbraco.Web.Migrations.PostMigrations;
namespace Umbraco.Web.Install.InstallSteps

12
src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
View File

@@ -5,14 +5,16 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using Umbraco.Core;
using Umbraco.Core.Configuration.Models;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Security;
using Umbraco.Core.Persistence;
using Umbraco.Core.Services;
using Umbraco.Core.Security;
using Umbraco.Extensions;
using Umbraco.Web.Install.Models;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Install.InstallSteps
{

10
src/Umbraco.Infrastructure/Install/InstallSteps/StarterKitDownloadStep.cs
View File

@@ -2,13 +2,15 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Install.Models;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Core.Services;
using Umbraco.Core.Configuration;
using Umbraco.Core.Models.Packaging;
using Umbraco.Core.Security;
using Umbraco.Web.Install.Models;
using Umbraco.Web.Security;
using Umbraco.Core.Hosting;
namespace Umbraco.Web.Install.InstallSteps
{

2
src/Umbraco.Infrastructure/Logging/LogHttpRequest.cs
View File

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

1
src/Umbraco.Infrastructure/Logging/MessageTemplates.cs
View File

@@ -5,6 +5,7 @@ using System.Text;
using Serilog;
using Serilog.Events;
using Serilog.Parsing;
using Umbraco.Cms.Core.Logging;
namespace Umbraco.Core.Logging
{

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestIdEnricher.cs
View File

@@ -1,8 +1,8 @@
using System;
using Serilog.Core;
using Serilog.Events;
using Umbraco.Cms.Core.Cache;
using Umbraco.Core.Cache;
using Umbraco.Core.Composing;
namespace Umbraco.Core.Logging.Serilog.Enrichers
{

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpRequestNumberEnricher.cs
View File

@@ -2,8 +2,8 @@
using System.Threading;
using Serilog.Core;
using Serilog.Events;
using Umbraco.Cms.Core.Cache;
using Umbraco.Core.Cache;
using Umbraco.Core.Composing;
namespace Umbraco.Core.Logging.Serilog.Enrichers
{

2
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
View File

@@ -1,7 +1,7 @@
using Serilog.Core;
using Serilog.Events;
using System;
using Umbraco.Net;
using Umbraco.Cms.Core.Net;
namespace Umbraco.Core.Logging.Serilog.Enrichers
{

6
src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs
View File

@@ -4,9 +4,9 @@ using System.Threading;
using Microsoft.Extensions.Options;
using Serilog.Core;
using Serilog.Events;
using Umbraco.Core.Diagnostics;
using Umbraco.Core.Hosting;
using CoreDebugSettings = Umbraco.Core.Configuration.Models.CoreDebugSettings;
using Umbraco.Cms.Core.Diagnostics;
using Umbraco.Cms.Core.Hosting;
using CoreDebugSettings = Umbraco.Cms.Core.Configuration.Models.CoreDebugSettings;
namespace Umbraco.Infrastructure.Logging.Serilog.Enrichers
{

8
src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
View File

@@ -7,8 +7,10 @@ using Serilog.Core;
using Serilog.Events;
using Serilog.Formatting;
using Serilog.Formatting.Compact;
using Umbraco.Core.Hosting;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Core.Logging.Serilog.Enrichers;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Serilog
{
@@ -69,7 +71,7 @@ namespace Umbraco.Core.Logging.Serilog
{
//Main .txt logfile - in similar format to older Log4Net output
//Ends with ..txt as Date is inserted before file extension substring
logConfig.WriteTo.File(Path.Combine(hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.LogFiles), $"UmbracoTraceLog.{Environment.MachineName}..txt"),
logConfig.WriteTo.File(Path.Combine(hostingEnvironment.MapPathContentRoot(Cms.Core.Constants.SystemDirectories.LogFiles), $"UmbracoTraceLog.{Environment.MachineName}..txt"),
shared: true,
rollingInterval: RollingInterval.Day,
restrictedToMinimumLevel: minimumLevel,
@@ -138,7 +140,7 @@ namespace Umbraco.Core.Logging.Serilog
// .clef format (Compact log event format, that can be imported into local SEQ & will make searching/filtering logs easier)
// Ends with ..txt as Date is inserted before file extension substring
logConfig.WriteTo.File(new CompactJsonFormatter(),
Path.Combine(hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.LogFiles) ,$"UmbracoTraceLog.{Environment.MachineName}..json"),
Path.Combine(hostingEnvironment.MapPathContentRoot(Cms.Core.Constants.SystemDirectories.LogFiles) ,$"UmbracoTraceLog.{Environment.MachineName}..json"),
shared: true,
rollingInterval: RollingInterval.Day, // Create a new JSON file every day
retainedFileCountLimit: retainedFileCount, // Setting to null means we keep all files - default is 31 days

7
src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
View File

@@ -1,11 +1,12 @@
using System;
using System.IO;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Serilog;
using Serilog.Events;
using Serilog.Extensions.Logging;
using Umbraco.Core.Hosting;
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
{

1
src/Umbraco.Infrastructure/Logging/Viewer/ExpressionFilter.cs
View File

@@ -2,6 +2,7 @@
using System.Linq;
using Serilog.Events;
using Serilog.Filters.Expressions;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Viewer
{

2
src/Umbraco.Infrastructure/Logging/Viewer/ILogViewer.cs
View File

@@ -1,4 +1,6 @@
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Core.Models;
namespace Umbraco.Core.Logging.Viewer

6
src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs
View File

@@ -1,8 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Serilog;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Composing;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Logging;
using Umbraco.Extensions;
using Umbraco.Infrastructure.DependencyInjection;
namespace Umbraco.Core.Logging.Viewer

6
src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
View File

@@ -2,8 +2,8 @@
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using Umbraco.Core.Hosting;
using Umbraco.Core.Routing;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Routing;
using Formatting = Newtonsoft.Json.Formatting;
namespace Umbraco.Core.Logging.Viewer
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Logging.Viewer
public class LogViewerConfig : ILogViewerConfig
{
private readonly IHostingEnvironment _hostingEnvironment;
private static readonly string _pathToSearches = WebPath.Combine(Constants.SystemDirectories.Config, "logviewer.searches.config.js");
private static readonly string _pathToSearches = WebPath.Combine(Cms.Core.Constants.SystemDirectories.Config, "logviewer.searches.config.js");
private readonly FileInfo _searchesConfig;
public LogViewerConfig(IHostingEnvironment hostingEnvironment)

1
src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Serilog.Events;
using Serilog.Formatting.Compact.Reader;
using Umbraco.Cms.Core.Logging;
namespace Umbraco.Core.Logging.Viewer
{

6
src/Umbraco.Infrastructure/Logging/Viewer/SerilogLogViewerSourceBase.cs
View File

@@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Serilog;
using Serilog.Events;
using Umbraco.Core.Models;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Extensions;
namespace Umbraco.Core.Logging.Viewer
{
public abstract class SerilogLogViewerSourceBase : ILogViewer
{
private readonly ILogViewerConfig _logViewerConfig;

2
src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
using HtmlAgilityPack;
using Umbraco.Core.Xml;
using Umbraco.Cms.Core.Xml;
namespace Umbraco.Web.Macros
{

2
src/Umbraco.Infrastructure/Manifest/DashboardAccessRuleConverter.cs
View File

@@ -1,7 +1,7 @@
using System;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.Dashboards;
using Umbraco.Cms.Core.Dashboards;
using Umbraco.Core.Serialization;
namespace Umbraco.Core.Manifest

10
src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
View File

@@ -2,11 +2,13 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.IO;
using Umbraco.Core.PropertyEditors;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core.Serialization;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Extensions;
namespace Umbraco.Core.Manifest
{

16
src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
View File

@@ -5,13 +5,15 @@ using System.Linq;
using System.Text;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Umbraco.Core.Cache;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Serialization;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Extensions;
namespace Umbraco.Core.Manifest
{

1
src/Umbraco.Infrastructure/Manifest/ValueValidatorConverter.cs
View File

@@ -1,5 +1,6 @@
using System;
using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Serialization;

3
src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs
View File

@@ -1,8 +1,9 @@
using System;
using System.Drawing;
using System.IO;
using Umbraco.Cms.Core.Media;
using Umbraco.Core;
using Umbraco.Core.Media;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Media
{

7
src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using Umbraco.Core;
using Umbraco.Core.Media;
using Umbraco.Core.Models;
using Umbraco.Web.Models;
using Umbraco.Cms.Core.Media;
using Umbraco.Cms.Core.Models;
using Umbraco.Extensions;
namespace Umbraco.Infrastructure.Media
{

15
src/Umbraco.Infrastructure/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.Migrations.Expressions.Common.Expressions;
using Umbraco.Cms.Core;
using Umbraco.Core.Migrations.Expressions.Common.Expressions;
using Umbraco.Core.Persistence.DatabaseAnnotations;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -56,29 +57,29 @@ namespace Umbraco.Core.Migrations.Expressions.Create.Index
/// <inheritdoc />
ICreateIndexOnColumnBuilder ICreateIndexColumnOptionsBuilder.Unique()
{
Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
{
Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
return this;
}
/// <inheritdoc />
public ICreateIndexOnColumnBuilder NonClustered()
{
Expression.Index.IndexType = IndexTypes.NonClustered;
Expression.Index.IndexType = IndexTypes.NonClustered;
return this;
}
/// <inheritdoc />
public ICreateIndexOnColumnBuilder Clustered()
{
Expression.Index.IndexType = IndexTypes.Clustered;
{
Expression.Index.IndexType = IndexTypes.Clustered;
return this;
}
/// <inheritdoc />
ICreateIndexOnColumnBuilder ICreateIndexOptionsBuilder.Unique()
{
Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
return this;
}
}

14
src/Umbraco.Infrastructure/Migrations/Expressions/Delete/KeysAndIndexes/DeleteKeysAndIndexesBuilder.cs
View File

@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq;
using NPoco;
using Umbraco.Core;
using Umbraco.Cms.Core;
using Umbraco.Core.Migrations.Expressions.Common;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Extensions;
namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
{
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
if (DeleteLocal || DeleteForeign)
{
// table, constraint
if (DeleteForeign)
{
//In some cases not all FK's are prefixed with "FK" :/ mostly with old upgraded databases so we need to check if it's either:
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
{
Delete.ForeignKey(key.Item2).OnTable(key.Item1).Do();
}
}
if (DeleteLocal)
{
@@ -68,7 +68,7 @@ namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
// drop indexes
if (DeleteLocal)
{
{
foreach (var index in indexes.Where(x => x.TableName == TableName))
{
//if this is a unique constraint we need to drop the constraint, else drop the index
@@ -79,7 +79,7 @@ namespace Umbraco.Core.Migrations.Expressions.Delete.KeysAndIndexes
else
Delete.Index(index.IndexName).OnTable(index.TableName).Do();
}
}
}

Some files were not shown because too many files have changed in this diff Show More