Refactor imports to reduce use of Elsa.Common.Contracts

Consolidate imports by replacing Elsa.Common.Contracts with Elsa.Common and Elsa.Common.Multitenancy. This update streamlines import statements across various modules, improving code readability and maintainability.

samples/aspnet/Elsa.Samples.AspNet.Heartbeats/HeartbeatWorkflow.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;

samples/aspnet/Elsa.Samples.AspNet.QuartzIntegration/Workflows/HeartbeatWorkflow.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Scheduling.Activities;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;

samples/aspnet/Elsa.Samples.AspNet.Tenants.External/Program.cs

@@ -5,7 +5,7 @@ using Elsa.EntityFrameworkCore.Extensions;
 using Elsa.EntityFrameworkCore.Modules.Management;
 using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Tenants.Extensions;
 using FastEndpoints.Swagger;
 using Microsoft.AspNetCore.Authentication.JwtBearer;

samples/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs

@@ -4,7 +4,7 @@ using Elsa.EntityFrameworkCore.Extensions;
 using Elsa.EntityFrameworkCore.Modules.Management;
 using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Tenants.Extensions;
 using FastEndpoints.Swagger;
 

src/apps/Elsa.Server.Web/Program.cs

@@ -14,7 +14,7 @@ using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
 using Elsa.Features.Services;
 using Elsa.Http.MultiTenancy;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.MassTransit.Extensions;
 using Elsa.MongoDb.Extensions;
 using Elsa.MongoDb.Modules.Alterations;

src/common/Elsa.Testing.Shared.Component/Services/TestTenantResolutionStrategy.cs

@@ -1,8 +1,6 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 
-namespace Elsa.Workflows.ComponentTests.Helpers.Services;
+namespace Elsa.Testing.Shared.Services;
 
 public class TestTenantResolutionStrategy : TenantResolutionStrategyBase
 {

src/common/Elsa.Testing.Shared.Component/Services/TestTenantsProvider.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants;
 using Elsa.Tenants.Models;
 

src/modules/Elsa.Alterations.Core/Models/AlterationLog.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Microsoft.Extensions.Logging;
 
 namespace Elsa.Alterations.Core.Models;

src/modules/Elsa.Alterations/Activities/GenerateAlterationJobs.cs

@@ -5,7 +5,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Workflows;
 using Elsa.Workflows.Attributes;

src/modules/Elsa.Alterations/Activities/SubmitAlterationPlan.cs

@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Workflows;
 using Elsa.Workflows.Attributes;

src/modules/Elsa.Alterations/Endpoints/Alterations/Submit/Endpoint.cs

@@ -1,7 +1,7 @@
 using Elsa.Abstractions;
 using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using JetBrains.Annotations;
 

src/modules/Elsa.Alterations/Services/AlterationPlanManager.cs

@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Notifications;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 
 namespace Elsa.Alterations.Services;

src/modules/Elsa.Alterations/Services/DefaultAlterationJobRunner.cs

@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Notifications;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 
 namespace Elsa.Alterations.Services;

src/modules/Elsa.Alterations/Services/DefaultAlterationPlanScheduler.cs

@@ -1,7 +1,7 @@
 using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
 using Elsa.Alterations.Workflows;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;

src/modules/Elsa.Alterations/Services/DefaultAlterationRunner.cs

@@ -2,7 +2,7 @@ using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
 using Elsa.Alterations.Core.Results;
 using Elsa.Alterations.Middleware.Workflows;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;

src/modules/Elsa.AzureServiceBus/Activities/MessageReceived.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Elsa.AzureServiceBus.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Workflows;

src/modules/Elsa.AzureServiceBus/Activities/SendMessage.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Azure.Messaging.ServiceBus;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Services;
 using Elsa.Extensions;
 using Elsa.Workflows;

src/modules/Elsa.Common/Contracts/IFormatter.cs

@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Represents a formatter that can serialize an object to and from a string.

src/modules/Elsa.Common/Contracts/IJsonSerializer.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Provides JSON serialization services.

src/modules/Elsa.Common/Contracts/ILogRecord.cs

@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// Represents a log record.
 public interface ILogRecord;

src/modules/Elsa.Common/Contracts/ISerializationOptionsConfigurator.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Configures <see cref="JsonSerializerOptions"/> objects.

src/modules/Elsa.Common/Contracts/ISystemClock.cs

@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Represents a system clock.

src/modules/Elsa.Common/Elsa.Common.csproj.DotSettings

@@ -1,2 +1,9 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=attributes/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=attributes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=contracts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cabstractions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Ccontexts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Ccontracts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Centities/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cimplementations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cresults/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/modules/Elsa.Common/Extensions/DependencyInjectionExtensions.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;

src/modules/Elsa.Common/Features/DefaultFormattersFeature.cs

@@ -1,4 +1,3 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;

src/modules/Elsa.Common/Features/SystemClockFeature.cs

@@ -1,4 +1,3 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;

src/modules/Elsa.Common/Features/TenantResolverFeature.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;

src/modules/Elsa.Common/Multitenancy/Abstractions/TenantResolutionStrategyBase.cs

@@ -1,8 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Contracts;
-using Elsa.Common.Results;
-
-namespace Elsa.Common.Abstractions;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Base class for implementing a tenant resolution strategy.

src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolutionContext.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Contexts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents the context for resolving a tenant in a tenant resolution strategy pipeline.

src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolutionStrategy.cs

@@ -1,7 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
-
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// A tenant resolver strategy in a pipeline of tenant resolvers.

src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolver.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Provides access to the current tenant ID.

src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs

@@ -1,6 +1,7 @@
-using JetBrains.Annotations;
+using Elsa.Common.Entities;
+using JetBrains.Annotations;
 
-namespace Elsa.Common.Entities;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents a tenant.

src/modules/Elsa.Common/Multitenancy/Implementations/DefaultTenantResolver.cs

@@ -1,7 +1,4 @@
-using Elsa.Common.Contracts;
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Services;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// An implementation of <see cref="ITenantResolver"/> that always returns the default tenant.

src/modules/Elsa.Common/Multitenancy/Results/TenantResolutionResult.cs

@@ -1,4 +1,4 @@
-namespace Elsa.Common.Results;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents the result of a tenant resolution.

src/modules/Elsa.Common/Serialization/ConfigurableSerializer.cs

@@ -3,7 +3,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Text.Unicode;
-using Elsa.Common.Contracts;
 using Elsa.Common.Converters;
 using Microsoft.Extensions.DependencyInjection;
 

src/modules/Elsa.Common/Serialization/JsonSerializer.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using Elsa.Common.Contracts;
 
 namespace Elsa.Common.Serialization;
 

src/modules/Elsa.Common/Services/JsonFormatter.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Elsa.Common.Contracts;
 
 namespace Elsa.Common.Services;
 

src/modules/Elsa.Common/Services/SystemClock.cs

@@ -1,5 +1,3 @@
-using Elsa.Common.Contracts;
-
 namespace Elsa.Common.Services;
 
 /// <inheritdoc />

src/modules/Elsa.Dapper/Services/Store.cs

@@ -1,7 +1,7 @@
 using Dapper;
-using Elsa.Common.Contracts;
 using Elsa.Common.Entities;
 using Elsa.Common.Models;
+using Elsa.Common.Multitenancy;
 using Elsa.Dapper.Contracts;
 using Elsa.Dapper.Extensions;
 using Elsa.Dapper.Models;

src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Elasticsearch.Contracts;
 using Humanizer;
 using JetBrains.Annotations;

src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatMonitorService.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Hosting.Management.Notifications;
 using Elsa.Hosting.Management.Options;
 using Elsa.KeyValues.Contracts;

src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatService.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Hosting.Management.Contracts;
 using Elsa.Hosting.Management.Options;
 using Elsa.KeyValues.Contracts;

src/modules/Elsa.Http/Features/HttpFeature.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.Expressions.Options;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;

src/modules/Elsa.Http/MultiTenancy/HttpContextTenantResolver.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Http.Extensions;
 using Microsoft.AspNetCore.Http;
 

src/modules/Elsa.Http/MultiTenancy/RoutePrefixTenantResolver.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.Http.Contracts;
 using Microsoft.AspNetCore.Http;

src/modules/Elsa.Http/Services/ZipManager.cs

@@ -1,5 +1,5 @@
 using System.IO.Compression;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Http.Contracts;
 using Elsa.Http.Models;
 using Elsa.Http.Options;

src/modules/Elsa.Identity/Features/IdentityFeature.cs

@@ -1,13 +1,13 @@
 using AspNetCore.Authentication.ApiKey;
-using Elsa.Common.Contracts;
 using Elsa.Common.Features;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Attributes;
 using Elsa.Features.Services;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Entities;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Identity.Options;
 using Elsa.Identity.Providers;
 using Elsa.Identity.Services;

src/modules/Elsa.Identity/Multitenancy/ClaimsTenantResolver.cs

@@ -1,11 +1,9 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Identity.Options;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Elsa.Identity.MultiTenancy;
+namespace Elsa.Identity.Multitenancy;
 
 /// <summary>
 /// Resolves the tenant from the user's claims.

src/modules/Elsa.Identity/Multitenancy/CurrentUserTenantResolver.cs

@@ -1,11 +1,9 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Models;
 using Microsoft.AspNetCore.Http;
 
-namespace Elsa.Identity.MultiTenancy;
+namespace Elsa.Identity.Multitenancy;
 
 /// <summary>
 /// Resolves the tenant from the current user.

src/modules/Elsa.Identity/Services/DefaultAccessTokenIssuer.cs

@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Entities;

src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Reflection;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;

src/modules/Elsa.MongoDb/Common/MongoDbStore.cs

@@ -1,9 +1,8 @@
 using System.Linq.Expressions;
-using Elsa.Common.Contracts;
 using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.MongoDb.Extensions;
-using Elsa.Tenants;
 using JetBrains.Annotations;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;

src/modules/Elsa.Quartz/Jobs/ResumeWorkflowJob.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Scheduling;
 using Elsa.Workflows.Models;

src/modules/Elsa.Quartz/Services/QuartzCronParser.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Scheduling;
 using Quartz;
 

src/modules/Elsa.Quartz/Services/QuartzWorkflowScheduler.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Quartz.Jobs;
 using Elsa.Scheduling;

src/modules/Elsa.Scheduling/Activities/Delay.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;

src/modules/Elsa.Scheduling/Activities/StartAt.cs

@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;

src/modules/Elsa.Scheduling/Activities/Timer.cs

@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;
 using Elsa.Workflows;

src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledCronTask.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;

src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledRecurringTask.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;

src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledSpecificInstantTask.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;

src/modules/Elsa.Scheduling/Services/CronosCronParser.cs

@@ -1,5 +1,5 @@
 using Cronos;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Scheduling.Services;
 

src/modules/Elsa.Scheduling/Services/DefaultTriggerScheduler.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Activities;

src/modules/Elsa.Secrets.Api/Endpoints/Secrets/Update/Endpoint.cs

@@ -1,5 +1,4 @@
 using Elsa.Abstractions;
-using Elsa.Common.Contracts;
 using Elsa.Secrets.Management;
 using JetBrains.Annotations;
 

src/modules/Elsa.Secrets.Management/Services/DefaultExpiredSecretsUpdater.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Secrets.Management;
 

src/modules/Elsa.Secrets.Management/Services/DefaultSecretEncryptor.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 
 namespace Elsa.Secrets.Management;

src/modules/Elsa.Secrets.Management/Services/DefaultSecretManager.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Secrets.Management.Notifications;
 using Elsa.Workflows.Contracts;

src/modules/Elsa.Secrets.Management/Services/DefaultSecretUpdater.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 
 namespace Elsa.Secrets.Management;

src/modules/Elsa.Tenants/Contracts/ITenantResolutionPipeline.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 
 namespace Elsa.Tenants;
 

src/modules/Elsa.Tenants/Contracts/ITenantsProvider.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Models;
 
 namespace Elsa.Tenants;

src/modules/Elsa.Tenants/Features/TenantsFeature.cs

@@ -1,5 +1,5 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Features;
+using Elsa.Common.Multitenancy;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
 using Elsa.Tenants.Options;

src/modules/Elsa.Tenants/Models/TenantFilter.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using JetBrains.Annotations;
 
 namespace Elsa.Tenants.Models;

src/modules/Elsa.Tenants/Options/MultitenancyOptions.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Providers;
 using Elsa.Tenants.Resolvers;
 using Elsa.Tenants.Services;

src/modules/Elsa.Tenants/Providers/ConfigurationTenantsProvider.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Models;
 using Elsa.Tenants.Options;
 using Microsoft.Extensions.Options;

src/modules/Elsa.Tenants/Resolvers/AmbientTenantResolver.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 
 namespace Elsa.Tenants.Resolvers;
 

src/modules/Elsa.Tenants/Services/PipelinedTenantResolver.cs

@@ -1,6 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Contracts;
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Options;
 using Microsoft.Extensions.Options;
 

src/modules/Elsa.Tenants/Services/TenantResolutionPipelineBuilder.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.Tenants.Services;

src/modules/Elsa.WorkflowProviders.BlobStorage/Providers/BlobStorageWorkflowsProvider.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Dsl.Contracts;
 using Elsa.WorkflowProviders.BlobStorage.Contracts;
 using Elsa.Workflows.Contracts;
@@ -6,7 +6,6 @@ using Elsa.Workflows.Management.Mappers;
 using Elsa.Workflows.Management.Materializers;
 using Elsa.Workflows.Management.Models;
 using Elsa.Workflows.Runtime;
-using Elsa.Workflows.Runtime.Contracts;
 using FluentStorage.Blobs;
 using JetBrains.Annotations;
 

src/modules/Elsa.Workflows.Core/Abstractions/SerializationOptionsConfiguratorBase.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows;
 

src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;

src/modules/Elsa.Workflows.Core/Contexts/WorkflowExecutionContext.cs

@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;

src/modules/Elsa.Workflows.Core/Extensions/ExpressionExecutionContextExtensions.cs

@@ -3,7 +3,7 @@ using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Workflows;

src/modules/Elsa.Workflows.Core/Features/WorkflowsFeature.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Features;
 using Elsa.Common.Serialization;
 using Elsa.Expressions.Features;

src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.ActivityExecution;

src/modules/Elsa.Workflows.Core/Middleware/Workflows/EngineExceptionHandlingMiddleware.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.WorkflowExecution;

src/modules/Elsa.Workflows.Core/Middleware/Workflows/ExceptionHandlingMiddleware.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.WorkflowExecution;

src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 using Elsa.Common.Models;
 using Elsa.Extensions;

src/modules/Elsa.Workflows.Management/Services/WorkflowInstanceFactory.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management.Contracts;

src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordExtractor.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 

src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordSink.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 

src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordStore.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 

src/modules/Elsa.Workflows.Runtime/Entities/ActivityExecutionRecord.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 using Elsa.Workflows.State;
 

src/modules/Elsa.Workflows.Runtime/Entities/WorkflowExecutionLogRecord.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 
 namespace Elsa.Workflows.Runtime.Entities;

src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;

src/modules/Elsa.Workflows.Runtime/Services/StimulusProxyWorkflowInbox.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Runtime.Contracts;

src/modules/Elsa.Workflows.Runtime/Services/StoreBookmarkQueue.cs

@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Runtime.Entities;
 using Elsa.Workflows.Runtime.Filters;

test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs

@@ -13,7 +13,6 @@ using Elsa.MassTransit.Extensions;
 using Elsa.Tenants.Extensions;
 using Elsa.Testing.Shared.Handlers;
 using Elsa.Testing.Shared.Services;
-using Elsa.Workflows.ComponentTests.Helpers.Services;
 using Elsa.Workflows.Management;
 using Elsa.Workflows.Runtime.Distributed.Extensions;
 using FluentStorage;

test/unit/Elsa.MongoDb.UnitTests/MongoKeyValueStoreTests.cs

@@ -1,8 +1,7 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.KeyValues.Entities;
 using Elsa.MongoDb.Common;
 using Elsa.MongoDb.Modules.Runtime;
-using Elsa.Tenants;
 using MongoDB.Driver;
 using NSubstitute;
 

test/unit/Elsa.Workflows.Runtime.UnitTests/Services/DefaultWorkflowDefinitionStorePopulatorTests.cs

@@ -1,11 +1,10 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Management.Filters;
 using Elsa.Workflows.Models;
-using Elsa.Workflows.Runtime.Contracts;
 using Microsoft.Extensions.Logging;
 using NSubstitute;