Update sub-orchestration default versioning

This commit updates the sub-orchestration default version handling
to incorporate properties from TaskOrchestrationContext. These
properties are generated and passed into the context by systems
using Durable Functions.

Signed-off-by: halspang <[email protected]>

Author: halspang

src/Abstractions/TaskOptions.cs

@@ -94,7 +94,7 @@ public SubOrchestrationOptions(TaskOptions options, string? instanceId = null)
     /// <summary>
     /// Gets the version to associate with the sub-orchestration instance.
     /// </summary>
-    public TaskVersion Version { get; init; } = default!;
+    public TaskVersion? Version { get; init; }
 }
 
 /// <summary>

src/Client/Grpc/GrpcDurableTaskClient.cs

@@ -79,7 +79,7 @@ public override async Task<string> ScheduleNewOrchestrationInstanceAsync(
         Check.NotEntity(this.options.EnableEntitySupport, options?.InstanceId);
 
         // We're explicitly OK with an empty version from the options as that had to be explicitly set. It should take precedence over the default.
-        string version = string.Empty;
+        string? version = null;
         if (options?.Version is { } v)
         {
             version = v;

src/Worker/Core/Shims/TaskOrchestrationContextWrapper.cs

@@ -179,9 +179,8 @@ public override async Task<TResult> CallSubOrchestratorAsync<TResult>(
         static string? GetInstanceId(TaskOptions? options)
             => options is SubOrchestrationOptions derived ? derived.InstanceId : null;
         string instanceId = GetInstanceId(options) ?? this.NewGuid().ToString("N");
-        string defaultVersion = this.invocationContext.Options?.Versioning?.DefaultVersion ?? string.Empty;
-        string version = options is SubOrchestrationOptions subOptions ? subOptions.Version : defaultVersion;
-
+        string defaultVersion = this.GetDefaultVersion();
+        string version = options is SubOrchestrationOptions { Version: { } v } ? v.Version : defaultVersion;
         Check.NotEntity(this.invocationContext.Options.EnableEntitySupport, instanceId);
 
         // if this orchestration uses entities, first validate that the suborchestration call is allowed in the current context
@@ -482,4 +481,32 @@ async Task<T> InvokeWithCustomRetryHandler<T>(
             }
         }
     }
+
+    string GetDefaultVersion()
+    {
+        // The default version can come from two different places depending on the context of the invocation.
+        string? propertiesDefault;
+        string? optionsDefault;
+
+        if (this.invocationContext.Options.Versioning?.DefaultVersion is { } v)
+        {
+            optionsDefault = v;
+        }
+        else
+        {
+            optionsDefault = null;
+        }
+
+        if (this.Properties.TryGetValue("defaultVersion", out var propVersion) && propVersion is string v2)
+        {
+            propertiesDefault = v2;
+        }
+        else
+        {
+            propertiesDefault = null;
+        }
+
+        // Prefer the options default, if both are null there was no provided default version.
+        return optionsDefault ?? propertiesDefault ?? string.Empty;
+    }
 }