Merge pull request #683 from danielgerlag/issue660

Issue 660: pass current context to default branch
danielgerlag · Oct 22, 2020 · b2cecfb · b2cecfb
2 parents 32fedfd + 665e945
commit b2cecfb
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/WorkflowCore/Primitives/If.cs b/src/WorkflowCore/Primitives/If.cs
@@ -15,7 +15,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
             {
                 if (Condition)
                 {
-                    return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                    return ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
                 }
 
                 return ExecutionResult.Next();

diff --git a/src/WorkflowCore/Primitives/OutcomeSwitch.cs b/src/WorkflowCore/Primitives/OutcomeSwitch.cs
@@ -12,7 +12,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
         {
             if (context.PersistenceData == null)
             {
-                var result = ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                var result = ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
                 result.OutcomeValue = GetPreviousOutcome(context);
                 return result;
             }

diff --git a/src/WorkflowCore/Primitives/Schedule.cs b/src/WorkflowCore/Primitives/Schedule.cs
@@ -20,7 +20,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
             {
                 if (!((SchedulePersistenceData)context.PersistenceData).Elapsed)
                 {
-                    return ExecutionResult.Branch(new List<object>() { null }, new SchedulePersistenceData() { Elapsed = true });
+                    return ExecutionResult.Branch(new List<object>() { context.Item }, new SchedulePersistenceData() { Elapsed = true });
                 }
 
                 if (context.Workflow.IsBranchComplete(context.ExecutionPointer.Id))

diff --git a/src/WorkflowCore/Primitives/Sequence.cs b/src/WorkflowCore/Primitives/Sequence.cs
@@ -11,7 +11,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
         {
             if (context.PersistenceData == null)
             {
-                return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                return ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
             }
 
             if ((context.PersistenceData is ControlPersistenceData) && ((context.PersistenceData as ControlPersistenceData).ChildrenActive))

diff --git a/src/WorkflowCore/Primitives/When.cs b/src/WorkflowCore/Primitives/When.cs
@@ -25,7 +25,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
 
             if (context.PersistenceData == null)
             {
-                return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                return ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
             }
 
             if ((context.PersistenceData is ControlPersistenceData) && ((context.PersistenceData as ControlPersistenceData).ChildrenActive))

diff --git a/src/WorkflowCore/Primitives/While.cs b/src/WorkflowCore/Primitives/While.cs
@@ -15,7 +15,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
             {
                 if (Condition)
                 {
-                    return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                    return ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
                 }
 
                 return ExecutionResult.Next();

diff --git a/src/WorkflowCore/WorkflowCore.csproj b/src/WorkflowCore/WorkflowCore.csproj
@@ -15,12 +15,12 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
-    <Version>3.2.5</Version>
-    <AssemblyVersion>3.2.5.0</AssemblyVersion>
-    <FileVersion>3.2.5.0</FileVersion>
+    <Version>3.2.6</Version>
+    <AssemblyVersion>3.2.6.0</AssemblyVersion>
+    <FileVersion>3.2.6.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
-    <PackageVersion>3.2.5</PackageVersion>
+    <PackageVersion>3.2.6</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/extensions/WorkflowCore.Users/Primitives/UserTask.cs b/src/extensions/WorkflowCore.Users/Primitives/UserTask.cs
@@ -50,7 +50,7 @@ public override ExecutionResult Run(IStepExecutionContext context)
 
             if (context.PersistenceData == null)
             {
-                var result = ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                var result = ExecutionResult.Branch(new List<object>() { context.Item }, new ControlPersistenceData() { ChildrenActive = true });
                 result.OutcomeValue = action.OutcomeValue;
                 return result;
             }

diff --git a/src/extensions/WorkflowCore.Users/WorkflowCore.Users.csproj b/src/extensions/WorkflowCore.Users/WorkflowCore.Users.csproj
@@ -15,9 +15,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Provides extensions for Workflow Core to enable human workflows.</Description>
-    <Version>2.1.0</Version>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
+    <Version>2.1.1</Version>
+    <AssemblyVersion>2.1.1.0</AssemblyVersion>
+    <FileVersion>2.1.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>