From 4fcfaf61f9cdf7a8ef42a94af00931bb4ae3d80a Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Mon, 12 Apr 2021 10:18:56 +0200
Subject: [PATCH] Update Workflow ctor to read variables from definition

---
 src/core/Elsa.Abstractions/Models/Variables.cs         | 6 ++++--
 src/core/Elsa.Abstractions/Services/Models/Workflow.cs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/Elsa.Abstractions/Models/Variables.cs b/src/core/Elsa.Abstractions/Models/Variables.cs
index 1564c6c67..35641b695 100644
--- a/src/core/Elsa.Abstractions/Models/Variables.cs
+++ b/src/core/Elsa.Abstractions/Models/Variables.cs
@@ -49,13 +49,15 @@ namespace Elsa.Models
             return SetVariable(name, variable.Value);
         }
 
-        public void SetVariables(Variables variables) =>
+        public Variables SetVariables(Variables variables) =>
             SetVariables((IEnumerable<KeyValuePair<string, Variable>>) variables);
 
-        public void SetVariables(IEnumerable<KeyValuePair<string, Variable>> variables)
+        public Variables SetVariables(IEnumerable<KeyValuePair<string, Variable>> variables)
         {
             foreach (var variable in variables)
                 SetVariable(variable.Key, variable.Value);
+
+            return this;
         }
 
         public bool HasVariable(string name)
diff --git a/src/core/Elsa.Abstractions/Services/Models/Workflow.cs b/src/core/Elsa.Abstractions/Services/Models/Workflow.cs
index 0699616aa..0129365dd 100644
--- a/src/core/Elsa.Abstractions/Services/Models/Workflow.cs
+++ b/src/core/Elsa.Abstractions/Services/Models/Workflow.cs
@@ -25,7 +25,7 @@ namespace Elsa.Services.Models
             CorrelationId = correlationId;
             Activities = activities.ToList();
             Connections = connections.ToList();
-            Input = new Variables(input ?? Variables.Empty);
+            Input = new Variables().SetVariables(definition.Variables).SetVariables(new Variables(input ?? Variables.Empty));
         }
 
         public Workflow()