Merge branch 'master' of github.com:Squidex/squidex

src/Squidex.Domain.Apps.Entities/Apps/AppUISettingsGrain.cs

@@ -8,7 +8,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json.Objects;
 using Squidex.Infrastructure.Orleans;

src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByNameIndexGrain.cs

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Squidex.Infrastructure.Orleans;
 using Squidex.Infrastructure.States;
 using Squidex.Infrastructure.Tasks;
 

src/Squidex.Domain.Apps.Entities/Apps/Indexes/AppsByUserIndexGrain.cs

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Squidex.Infrastructure.Orleans;
 using Squidex.Infrastructure.States;
 
 namespace Squidex.Domain.Apps.Entities.Apps.Indexes

src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs

@@ -12,7 +12,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using NodaTime;
 using Orleans.Concurrency;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
 using Squidex.Domain.Apps.Entities.Backup.Helpers;
 using Squidex.Domain.Apps.Entities.Backup.State;
 using Squidex.Domain.Apps.Events;

src/Squidex.Domain.Apps.Entities/Backup/RestoreGrain.cs

@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using NodaTime;
 using Squidex.Domain.Apps.Core.Apps;
 using Squidex.Domain.Apps.Entities.Apps.Commands;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
 using Squidex.Domain.Apps.Entities.Backup.Helpers;
 using Squidex.Domain.Apps.Entities.Backup.State;
 using Squidex.Domain.Apps.Events;

src/Squidex.Domain.Apps.Entities/Rules/Indexes/RulesByAppIndexGrain.cs

@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
+using Squidex.Infrastructure.Orleans;
 using Squidex.Infrastructure.States;
 
 namespace Squidex.Domain.Apps.Entities.Rules.Indexes

src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasByAppIndexGrain.cs

@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
+using Squidex.Infrastructure.Orleans;
 using Squidex.Infrastructure.States;
 
 namespace Squidex.Domain.Apps.Entities.Schemas.Indexes

src/Squidex.Domain.Apps.Entities/Tags/TagGrain.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Squidex.Domain.Apps.Core.Tags;
-using Squidex.Domain.Apps.Entities.Apps.Indexes;
+using Squidex.Infrastructure.Orleans;
 using Squidex.Infrastructure.States;
 
 namespace Squidex.Domain.Apps.Entities.Tags

src/Squidex.Infrastructure/Orleans/GrainOfGuid{T}.cs

@@ -8,11 +8,10 @@
 using System;
 using System.Threading.Tasks;
 using Orleans;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.States;
 using Squidex.Infrastructure.Tasks;
 
-namespace Squidex.Domain.Apps.Entities.Apps.Indexes
+namespace Squidex.Infrastructure.Orleans
 {
     public abstract class GrainOfGuid<T> : Grain where T : class, new()
     {

src/Squidex.Infrastructure/Orleans/GrainOfString{T}.cs

@@ -7,11 +7,10 @@
 
 using System.Threading.Tasks;
 using Orleans;
-using Squidex.Infrastructure;
 using Squidex.Infrastructure.States;
 using Squidex.Infrastructure.Tasks;
 
-namespace Squidex.Domain.Apps.Entities.Apps.Indexes
+namespace Squidex.Infrastructure.Orleans
 {
     public abstract class GrainOfString<T> : Grain where T : class, new()
     {