Fix merge conflict and update XML documentation to use simplified type references

Co-authored-by: YunchuWang <[email protected]>

Author: Copilot

src/Generators/DurableTaskSourceGenerator.cs

@@ -453,9 +453,11 @@ static void AddOrchestratorCallMethod(StringBuilder sourceBuilder, DurableTaskTy
                 inputParameter += " = default";
             }
 
+            string simplifiedTypeName = SimplifyTypeNameForNamespace(orchestrator.TypeName, targetNamespace);
+
             sourceBuilder.AppendLine($@"
         /// <summary>
-        /// Schedules a new instance of the <see cref=""{orchestrator.TypeName}""/> orchestrator.
+        /// Schedules a new instance of the <see cref=""{simplifiedTypeName}""/> orchestrator.
         /// </summary>
         /// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
         public static Task<string> ScheduleNew{orchestrator.TaskName}InstanceAsync(
@@ -475,9 +477,11 @@ static void AddSubOrchestratorCallMethod(StringBuilder sourceBuilder, DurableTas
                 inputParameter += " = default";
             }
 
+            string simplifiedTypeName = SimplifyTypeNameForNamespace(orchestrator.TypeName, targetNamespace);
+
             sourceBuilder.AppendLine($@"
         /// <summary>
-        /// Calls the <see cref=""{orchestrator.TypeName}""/> sub-orchestrator.
+        /// Calls the <see cref=""{simplifiedTypeName}""/> sub-orchestrator.
         /// </summary>
         /// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
         public static Task<{outputType}> Call{orchestrator.TaskName}Async(
@@ -497,12 +501,14 @@ static void AddActivityCallMethod(StringBuilder sourceBuilder, DurableTaskTypeIn
                 inputParameter += " = default";
             }
 
+            string simplifiedTypeName = SimplifyTypeNameForNamespace(activity.TypeName, targetNamespace);
+
             sourceBuilder.AppendLine($@"
         /// <summary>
-        /// Calls the <see cref=""{activity.TypeName}""/> activity.
+        /// Calls the <see cref=""{simplifiedTypeName}""/> activity.
         /// </summary>
         /// <inheritdoc cref=""TaskOrchestrationContext.CallActivityAsync(TaskName, object?, TaskOptions?)""/>
-        public static Task<{activity.OutputType}> Call{activity.TaskName}Async(this TaskOrchestrationContext ctx, {activity.InputParameter}, TaskOptions? options = null)
+        public static Task<{outputType}> Call{activity.TaskName}Async(this TaskOrchestrationContext ctx, {inputParameter}, TaskOptions? options = null)
         {{
             return ctx.CallActivityAsync<{outputType}>(""{activity.TaskName}"", input, options);
         }}");

test/Generators.Tests/AzureFunctionsTests.cs

@@ -231,7 +231,7 @@ public class MyOrchestrator : TaskOrchestrator<{inputType}, {outputType}>
 }}
 
 /// <summary>
-/// Schedules a new instance of the <see cref=""MyNS.MyOrchestrator""/> orchestrator.
+/// Schedules a new instance of the <see cref=""MyOrchestrator""/> orchestrator.
 /// </summary>
 /// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
 public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
@@ -241,7 +241,7 @@ public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
 }}
 
 /// <summary>
-/// Calls the <see cref=""MyNS.MyOrchestrator""/> sub-orchestrator.
+/// Calls the <see cref=""MyOrchestrator""/> sub-orchestrator.
 /// </summary>
 /// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<{outputType}> CallMyOrchestratorAsync(
@@ -315,7 +315,7 @@ public abstract class MyOrchestratorBase : TaskOrchestrator<{inputType}, {output
 }}
 
 /// <summary>
-/// Schedules a new instance of the <see cref=""MyNS.MyOrchestrator""/> orchestrator.
+/// Schedules a new instance of the <see cref=""MyOrchestrator""/> orchestrator.
 /// </summary>
 /// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
 public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
@@ -325,7 +325,7 @@ public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
 }}
 
 /// <summary>
-/// Calls the <see cref=""MyNS.MyOrchestrator""/> sub-orchestrator.
+/// Calls the <see cref=""MyOrchestrator""/> sub-orchestrator.
 /// </summary>
 /// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<{outputType}> CallMyOrchestratorAsync(
@@ -527,7 +527,7 @@ public static Task<string> MyOrchestrator([OrchestrationTrigger] TaskOrchestrati
 }}
 
 /// <summary>
-/// Schedules a new instance of the <see cref=""MyNS.MyOrchestrator""/> orchestrator.
+/// Schedules a new instance of the <see cref=""MyOrchestrator""/> orchestrator.
 /// </summary>
 /// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
 public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
@@ -537,7 +537,7 @@ public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
 }}
 
 /// <summary>
-/// Calls the <see cref=""MyNS.MyOrchestrator""/> sub-orchestrator.
+/// Calls the <see cref=""MyOrchestrator""/> sub-orchestrator.
 /// </summary>
 /// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<string> CallMyOrchestratorAsync(
@@ -547,7 +547,7 @@ public static Task<string> CallMyOrchestratorAsync(
 }}
 
 /// <summary>
-/// Calls the <see cref=""MyNS.MyActivity""/> activity.
+/// Calls the <see cref=""MyActivity""/> activity.
 /// </summary>
 /// <inheritdoc cref=""TaskOrchestrationContext.CallActivityAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<string> CallMyActivityAsync(this TaskOrchestrationContext ctx, int input, TaskOptions? options = null)

test/Generators.Tests/ClassBasedSyntaxTests.cs

@@ -228,18 +228,24 @@ class MyActivityImpl : TaskActivity<MyClass, MyClass>
     public class MyClass { }
 }";
 
-        string expectedOutput = TestHelpers.WrapAndFormat(
-            GeneratedClassName,
-            methodList: @"
-/// <summary>
-/// Calls the <see cref=""MyNS.MyActivityImpl""/> activity.
-/// </summary>
-/// <inheritdoc cref=""TaskOrchestrationContext.CallActivityAsync(TaskName, object?, TaskOptions?)""/>
-public static Task<MyNS.MyClass> CallMyActivityAsync(this TaskOrchestrationContext ctx, MyNS.MyClass input, TaskOptions? options = null)
+        string expectedOutput = @"
+// <auto-generated/>
+#nullable enable
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.DurableTask;
+using Microsoft.DurableTask.Internal;
+
+namespace MyNS
 {
     public static class GeneratedDurableTaskExtensions
     {
 
+        /// <summary>
+        /// Calls the <see cref=""MyActivityImpl""/> activity.
+        /// </summary>
+        /// <inheritdoc cref=""TaskOrchestrationContext.CallActivityAsync(TaskName, object?, TaskOptions?)""/>
         public static Task<MyClass> CallMyActivityAsync(this TaskOrchestrationContext ctx, MyClass input, TaskOptions? options = null)
         {
             return ctx.CallActivityAsync<MyClass>(""MyActivity"", input, options);