Fix casting during workflow instance restart

src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs

@@ -135,11 +135,11 @@ protected virtual async Task<IContent> GetContentAsync(WorkflowExecutionContext
             else
             {
                 // If no expression was provided, see if the content item was provided as an input or as a property.
-                content = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)
-                    ?? workflowContext.Properties.GetValue<IContent>(ContentEventConstants.ContentItemInputKey);
+                content = workflowContext.Input.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey)
+                    ?? workflowContext.Properties.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey);
             }
 
-            if (content != null && content.ContentItem.ContentItemId != null)
+            if (content?.ContentItem?.ContentItemId != null)
             {
                 return content;
             }

src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs

@@ -98,7 +98,7 @@ public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
             }
             else
             {
-                contentItem = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
+                contentItem = workflowContext.Input.GetValue<ContentItem>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
             }
 
             if (contentItem == null)
@@ -155,7 +155,7 @@ public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
                 {
                     workflowContext.CorrelationId = contentItem.ContentItemId;
                 }
-                
+
                 workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
                 workflowContext.LastResult = contentItem;
 

src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text.Json;
 
 namespace OrchardCore.Workflows.Helpers
 {
@@ -19,12 +20,19 @@ public static TValue GetValue<TValue>(this IDictionary<string, object> dictionar
         {
             var value = dictionary.GetValue(key);
 
-            if (value != null)
+            if (value == null)
             {
-                return (TValue)value;
+                return default;
             }
 
-            return default;
+            if (value is not TValue castedValued)
+            {
+                var json = JConvert.SerializeObject(value);
+
+                return JConvert.DeserializeObject<TValue>(json);
+            }
+
+            return castedValued;
         }
 
         /// <summary>