From 0dc2b95e5aba15f7e3ad43a4f84c670ade986a16 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Wed, 6 Sep 2023 22:04:49 +0200
Subject: [PATCH] Maintain tool version of imported file

---
 .../Services/WorkflowDefinitionImporter.cs                      | 1 +
 .../Services/WorkflowDefinitionPublisher.cs                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs
index f45036121..babea7419 100644
--- a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs
+++ b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionImporter.cs
@@ -70,6 +70,7 @@ namespace Elsa.Workflows.Management.Services
             draft.Outcomes = model.Outcomes ?? new List<string>();
             draft.IsReadonly = model.IsReadonly;
             draft.Options = model.Options ?? new WorkflowOptions();
+            draft.ToolVersion = model.ToolVersion;
 
             if (request.Publish ?? model.IsPublished)
             {
diff --git a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
index 166ba8146..402636a3f 100644
--- a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
+++ b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
@@ -150,7 +150,7 @@ public class WorkflowDefinitionPublisher : IWorkflowDefinitionPublisher
         var filter = new WorkflowDefinitionFilter { DefinitionId = definitionId, VersionOptions = versionOptions };
         var order = new WorkflowDefinitionOrder<int>(x => x.Version, OrderDirection.Descending);
         var lastVersion = await _workflowDefinitionStore.FindLastVersionAsync(new WorkflowDefinitionFilter { DefinitionId = definitionId }, cancellationToken);
-        var definition = (await _workflowDefinitionStore.FindAsync(filter, order, cancellationToken)) ?? lastVersion;
+        var definition = await _workflowDefinitionStore.FindAsync(filter, order, cancellationToken) ?? lastVersion;
 
         if (definition == null!)
             return null;