From 804eb27a2bca516df4fd06b5c1f457533e04a02a Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 5 Jun 2021 12:57:01 +0200 Subject: [PATCH] Reconsider activity output --- src/core/Elsa.Abstractions/ActivityResults/OutputResult.cs | 1 - src/core/Elsa.Abstractions/Services/Activity.cs | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/core/Elsa.Abstractions/ActivityResults/OutputResult.cs b/src/core/Elsa.Abstractions/ActivityResults/OutputResult.cs index 1250f4a68..c69fe7f6d 100644 --- a/src/core/Elsa.Abstractions/ActivityResults/OutputResult.cs +++ b/src/core/Elsa.Abstractions/ActivityResults/OutputResult.cs @@ -3,7 +3,6 @@ using Elsa.Services.Models; namespace Elsa.ActivityResults { - [Obsolete("Use activity output properties to return output.")] public class OutputResult : ActivityExecutionResult { public OutputResult(object? output) => Output = output; diff --git a/src/core/Elsa.Abstractions/Services/Activity.cs b/src/core/Elsa.Abstractions/Services/Activity.cs index f35cc0969..d9dbe49c9 100644 --- a/src/core/Elsa.Abstractions/Services/Activity.cs +++ b/src/core/Elsa.Abstractions/Services/Activity.cs @@ -34,18 +34,12 @@ namespace Elsa.Services protected virtual IActivityExecutionResult OnResume() => Done(); protected virtual NoopResult Noop() => new(); protected virtual OutcomeResult Done() => Outcome(OutcomeNames.Done); - - [Obsolete("Do not use methods that accept an output. Use Done() instead and activity output properties to return output.")] protected virtual CombinedResult Done(object? output) => Combine(Output(output), Done()); protected virtual OutcomeResult Outcomes(IEnumerable outcomes) => new(outcomes); protected virtual OutcomeResult Outcomes(params string[] outcomes) => Outcomes((IEnumerable) outcomes); protected virtual OutcomeResult Outcome(string outcome) => Outcomes(outcome); - - [Obsolete("Do not use methods that accept an output. Use Outcome(string outcome) instead and activity output properties to return output.")] protected virtual CombinedResult Outcome(string outcome, object? output) => Combine(Output(output), Outcome(outcome)); - - [Obsolete("Use activity output properties to return output.")] protected virtual OutputResult Output(object? output) => new(output); protected virtual SuspendResult Suspend() => new();