From 77a8f5be52fc10d4fd89d734a1fcdbe62cde15e5 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Sun, 28 Feb 2021 13:24:06 +0000 Subject: [PATCH] WIP #564 - Rename Elsa.Activities.Timers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project/NuGet package for common logic relating to temporal actions has been renamed: Elsa.Activities.Timers → Elsa.Activities.Temporal.Common Whilst large numbers of files are "changed" by this commit, it's just a straight move to a new path. --- Elsa.sln | 2 +- .../Activities/ClearTimer/CancelTimer.cs | 0 .../ClearTimer/CancelTimerExtensions.cs | 0 .../Activities/Cron/Cron.cs | 0 .../Activities/Cron/CronBuilderExtensions.cs | 0 .../Activities/StartAt/StartAt.cs | 0 .../StartAt/StartAtBuilderExtensions.cs | 0 .../Activities/Timer/Timer.cs | 0 .../Timer/TimerBuilderExtensions.cs | 0 .../ActivityResults/ScheduleWorkflowResult.cs | 0 .../Bookmarks/CronBookmark.cs | 0 .../Bookmarks/StartAtBookmark.cs | 0 .../Bookmarks/TimerBookmark.cs | 0 .../Elsa.Activities.Temporal.Common.csproj} | 0 .../Extensions/DurationExtensions.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 66 +++++++++---------- .../FodyWeavers.xml | 0 .../Handlers/RemoveScheduledTriggers.cs | 0 .../Handlers/ScheduleWorkflows.cs | 0 .../Options/TimersOptions.cs | 0 .../Services/ICrontabParser.cs | 0 .../Services/IWorkflowScheduler.cs | 0 .../StartupTasks/StartJobs.cs | 0 .../TimerConsts.cs | 0 .../Elsa.Activities.Timers.Hangfire.csproj | 2 +- .../Elsa.Activities.Timers.Quartz.csproj | 2 +- .../Elsa.Activities.Timers/FodyWeavers.xsd | 30 --------- src/core/Elsa/Elsa.csproj | 2 +- .../Elsa.Samples.DistributedLock.csproj | 4 +- 29 files changed, 39 insertions(+), 69 deletions(-) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/ClearTimer/CancelTimer.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/ClearTimer/CancelTimerExtensions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/Cron/Cron.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/Cron/CronBuilderExtensions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/StartAt/StartAt.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/StartAt/StartAtBuilderExtensions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/Timer/Timer.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Activities/Timer/TimerBuilderExtensions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/ActivityResults/ScheduleWorkflowResult.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Bookmarks/CronBookmark.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Bookmarks/StartAtBookmark.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Bookmarks/TimerBookmark.cs (100%) rename src/activities/{Elsa.Activities.Timers/Elsa.Activities.Timers.csproj => Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj} (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Extensions/DurationExtensions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Extensions/ServiceCollectionExtensions.cs (97%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/FodyWeavers.xml (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Handlers/RemoveScheduledTriggers.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Handlers/ScheduleWorkflows.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Options/TimersOptions.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Services/ICrontabParser.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/Services/IWorkflowScheduler.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/StartupTasks/StartJobs.cs (100%) rename src/activities/{Elsa.Activities.Timers => Elsa.Activities.Temporal.Common}/TimerConsts.cs (100%) delete mode 100644 src/activities/Elsa.Activities.Timers/FodyWeavers.xsd diff --git a/Elsa.sln b/Elsa.sln index a5537c516..b5b35f88a 100644 --- a/Elsa.sln +++ b/Elsa.sln @@ -174,7 +174,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.DistributedLocking.Red EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.DistributedLocking.SqlServer", "src\locking\Elsa.DistributedLocking.SqlServer\Elsa.DistributedLocking.SqlServer.csproj", "{78F2A9DC-3092-4371-ABFE-87C5DA4DE351}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.Timers", "src\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj", "{74E83393-50AF-41E3-A1C8-97202673CD85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.Timers", "src\activities\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj", "{74E83393-50AF-41E3-A1C8-97202673CD85}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElsaDashboard.Abstractions", "src\dashboards\blazor\ElsaDashboard.Abstractions\ElsaDashboard.Abstractions.csproj", "{599CEC92-0EC9-4378-A1B6-E7741B1E4E57}" EndProject diff --git a/src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimer.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimer.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimer.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimer.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimerExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimerExtensions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimerExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimerExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/Cron/Cron.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/Cron.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/Cron/Cron.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/Cron.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/Cron/CronBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/CronBuilderExtensions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/Cron/CronBuilderExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/CronBuilderExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAt.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAt.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAtBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAtBuilderExtensions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAtBuilderExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAtBuilderExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/Timer.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/Timer.cs diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/TimerBuilderExtensions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/TimerBuilderExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/ActivityResults/ScheduleWorkflowResult.cs b/src/activities/Elsa.Activities.Temporal.Common/ActivityResults/ScheduleWorkflowResult.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/ActivityResults/ScheduleWorkflowResult.cs rename to src/activities/Elsa.Activities.Temporal.Common/ActivityResults/ScheduleWorkflowResult.cs diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/CronBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/CronBookmark.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Bookmarks/CronBookmark.cs rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/CronBookmark.cs diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/StartAtBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/StartAtBookmark.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Bookmarks/StartAtBookmark.cs rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/StartAtBookmark.cs diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/TimerBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Bookmarks/TimerBookmark.cs rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs diff --git a/src/activities/Elsa.Activities.Timers/Elsa.Activities.Timers.csproj b/src/activities/Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj similarity index 100% rename from src/activities/Elsa.Activities.Timers/Elsa.Activities.Timers.csproj rename to src/activities/Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj diff --git a/src/activities/Elsa.Activities.Timers/Extensions/DurationExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Extensions/DurationExtensions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Extensions/DurationExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Extensions/DurationExtensions.cs diff --git a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs similarity index 97% rename from src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs index deaea269b..158006935 100644 --- a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs +++ b/src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs @@ -1,34 +1,34 @@ -using System; -using Elsa; -using Elsa.Activities.Temporal; -using Elsa.Activities.Temporal.Bookmarks; -using Elsa.Activities.Temporal.Handlers; -using Elsa.Activities.Temporal.Options; -using Elsa.Activities.Temporal.StartupTasks; -using Elsa.Runtime; - -// ReSharper disable once CheckNamespace -namespace Microsoft.Extensions.DependencyInjection -{ - public static class ServiceCollectionExtensions - { - public static ElsaOptions AddTimerActivities(this ElsaOptions options, Action? configure = default) - { - var timersOptions = new TimersOptions(options.Services); - configure?.Invoke(timersOptions); - - options.Services - .AddNotificationHandlers(typeof(RemoveScheduledTriggers)) - .AddStartupTask() - .AddBookmarkProvider() - .AddBookmarkProvider() - .AddBookmarkProvider(); - - return options - .AddActivity() - .AddActivity() - .AddActivity() - .AddActivity(); - } - } +using System; +using Elsa; +using Elsa.Activities.Temporal; +using Elsa.Activities.Temporal.Bookmarks; +using Elsa.Activities.Temporal.Handlers; +using Elsa.Activities.Temporal.Options; +using Elsa.Activities.Temporal.StartupTasks; +using Elsa.Runtime; + +// ReSharper disable once CheckNamespace +namespace Microsoft.Extensions.DependencyInjection +{ + public static class ServiceCollectionExtensions + { + public static ElsaOptions AddTimerActivities(this ElsaOptions options, Action? configure = default) + { + var timersOptions = new TimersOptions(options.Services); + configure?.Invoke(timersOptions); + + options.Services + .AddNotificationHandlers(typeof(RemoveScheduledTriggers)) + .AddStartupTask() + .AddBookmarkProvider() + .AddBookmarkProvider() + .AddBookmarkProvider(); + + return options + .AddActivity() + .AddActivity() + .AddActivity() + .AddActivity(); + } + } } \ No newline at end of file diff --git a/src/activities/Elsa.Activities.Timers/FodyWeavers.xml b/src/activities/Elsa.Activities.Temporal.Common/FodyWeavers.xml similarity index 100% rename from src/activities/Elsa.Activities.Timers/FodyWeavers.xml rename to src/activities/Elsa.Activities.Temporal.Common/FodyWeavers.xml diff --git a/src/activities/Elsa.Activities.Timers/Handlers/RemoveScheduledTriggers.cs b/src/activities/Elsa.Activities.Temporal.Common/Handlers/RemoveScheduledTriggers.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Handlers/RemoveScheduledTriggers.cs rename to src/activities/Elsa.Activities.Temporal.Common/Handlers/RemoveScheduledTriggers.cs diff --git a/src/activities/Elsa.Activities.Timers/Handlers/ScheduleWorkflows.cs b/src/activities/Elsa.Activities.Temporal.Common/Handlers/ScheduleWorkflows.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Handlers/ScheduleWorkflows.cs rename to src/activities/Elsa.Activities.Temporal.Common/Handlers/ScheduleWorkflows.cs diff --git a/src/activities/Elsa.Activities.Timers/Options/TimersOptions.cs b/src/activities/Elsa.Activities.Temporal.Common/Options/TimersOptions.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Options/TimersOptions.cs rename to src/activities/Elsa.Activities.Temporal.Common/Options/TimersOptions.cs diff --git a/src/activities/Elsa.Activities.Timers/Services/ICrontabParser.cs b/src/activities/Elsa.Activities.Temporal.Common/Services/ICrontabParser.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Services/ICrontabParser.cs rename to src/activities/Elsa.Activities.Temporal.Common/Services/ICrontabParser.cs diff --git a/src/activities/Elsa.Activities.Timers/Services/IWorkflowScheduler.cs b/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowScheduler.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/Services/IWorkflowScheduler.cs rename to src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowScheduler.cs diff --git a/src/activities/Elsa.Activities.Timers/StartupTasks/StartJobs.cs b/src/activities/Elsa.Activities.Temporal.Common/StartupTasks/StartJobs.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/StartupTasks/StartJobs.cs rename to src/activities/Elsa.Activities.Temporal.Common/StartupTasks/StartJobs.cs diff --git a/src/activities/Elsa.Activities.Timers/TimerConsts.cs b/src/activities/Elsa.Activities.Temporal.Common/TimerConsts.cs similarity index 100% rename from src/activities/Elsa.Activities.Timers/TimerConsts.cs rename to src/activities/Elsa.Activities.Temporal.Common/TimerConsts.cs diff --git a/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj b/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj index 81d906fac..984fcb609 100644 --- a/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj +++ b/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj b/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj index 13f28508a..490aea7eb 100644 --- a/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj +++ b/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd b/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd deleted file mode 100644 index 3f3946e28..000000000 --- a/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/src/core/Elsa/Elsa.csproj b/src/core/Elsa/Elsa.csproj index 77b387da4..09af21589 100644 --- a/src/core/Elsa/Elsa.csproj +++ b/src/core/Elsa/Elsa.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj index 0a558c816..46516e577 100644 --- a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj +++ b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj @@ -14,11 +14,11 @@ - + - +