Update tests and copy constructor

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

Author: halspang

src/Worker.Extensions.DurableTask/FunctionsOrchestrationContext.cs

@@ -95,19 +95,16 @@ public override Task<TResult> CallSubOrchestratorAsync<TResult>(
             SubOrchestrationOptions subOptions;
             if (options is SubOrchestrationOptions subOrchestrationOptions)
             {
-                subOptions = new SubOrchestrationOptions
+                subOptions = new SubOrchestrationOptions(options)
                 {
                     InstanceId = subOrchestrationOptions.InstanceId,
-                    Retry = subOrchestrationOptions.Retry,
                     Version = subOrchestrationOptions.Version?.Version ?? defaultVersion,
                 };
             }
             else
             {
-                subOptions = new SubOrchestrationOptions
+                subOptions = new SubOrchestrationOptions(options)
                 {
-                    InstanceId = null, // No instance ID specified, so we use the default one.
-                    Retry = options?.Retry,
                     Version = defaultVersion
                 };
             }

src/Worker.Extensions.DurableTask/Worker.Extensions.DurableTask.csproj

@@ -56,7 +56,4 @@
       <PackagePath>content/SBOM</PackagePath>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\durabletask-dotnet\src\Abstractions\Abstractions.csproj" />
-  </ItemGroup>
 </Project>

test/e2e/Apps/BasicDotNetIsolated/VersionedOrchestration.cs

@@ -96,22 +96,22 @@ public static async Task<HttpResponseData> HttpSubStart(
         [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequestData req,
         [DurableClient] DurableTaskClient client,
         FunctionContext executionContext,
-        string? version)
+        string? subOrchestrationVersion)
     {
         ILogger logger = executionContext.GetLogger("OrchestrationSubVersion_HttpStart");
 
         // Function input comes from the request content.
         string instanceId;
-        if (version != null)
+        if (subOrchestrationVersion != null)
         {
-            instanceId = await client.ScheduleNewOrchestrationInstanceAsync(nameof(RunWithSubOrchestrator), input: version);
+            instanceId = await client.ScheduleNewOrchestrationInstanceAsync(nameof(RunWithSubOrchestrator), input: subOrchestrationVersion);
         }
         else
         {
             instanceId = await client.ScheduleNewOrchestrationInstanceAsync(nameof(RunWithSubOrchestrator));
         }
 
-        logger.LogInformation("Started orchestration with ID = '{instanceId}' and Version = '{version}'.", instanceId, version);
+        logger.LogInformation("Started orchestration with ID = '{instanceId}' and Version = '{subOrchestrationVersion}'.", instanceId, subOrchestrationVersion);
 
         // Returns an HTTP 202 response with an instance management payload.
         // See https://learn.microsoft.com/azure/azure-functions/durable/durable-functions-http-api#start-orchestration

test/e2e/Tests/Tests/VersioningTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
 using System.Net;
 using Xunit;
 using Xunit.Abstractions;
@@ -53,9 +52,9 @@ public async Task TestVersionedOrchestration_OKWithMatchingVersion(string? versi
     [InlineData("")] // Non-versioned/empty-versioned case.
     [InlineData("1.0")]
     [InlineData("2.0")]
-    public async Task TestVersionedSubOrchestration_OKWithMatchingVersion(string? version)
+    public async Task TestVersionedSubOrchestration_OKWithMatchingVersion(string? subOrchestrationVersion)
     {
-        string queryString = version == null ? string.Empty : $"?version={version}";
+        string queryString = subOrchestrationVersion == null ? string.Empty : $"?subOrchestrationVersion={subOrchestrationVersion}";
         using HttpResponseMessage response = await HttpHelpers.InvokeHttpTrigger("OrchestrationSubVersion_HttpStart", queryString);
 
         Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
@@ -64,9 +63,9 @@ public async Task TestVersionedSubOrchestration_OKWithMatchingVersion(string? ve
         await DurableHelpers.WaitForOrchestrationStateAsync(statusQueryGetUri, "Completed", 30);
 
         var orchestrationDetails = await DurableHelpers.GetRunningOrchestrationDetailsAsync(statusQueryGetUri);
-        if (version != null)
+        if (subOrchestrationVersion != null)
         {
-            Assert.Equal($"Parent Version: '2.0' | Sub Version: '{version}'", orchestrationDetails.Output);
+            Assert.Equal($"Parent Version: '2.0' | Sub Version: '{subOrchestrationVersion}'", orchestrationDetails.Output);
         }
         else
         {