From fe942b969f96c896edd130e00cafe090e81b23fa Mon Sep 17 00:00:00 2001
From: Manuel Menegazzo <manuel.menegazzo@outlook.com>
Date: Tue, 3 Sep 2024 19:21:20 +0200
Subject: [PATCH] Fixed merge errors Signed-off-by: Manuel Menegazzo
 <manuel.menegazzo@outlook.com>

---
 all.sln                                            |  5 ++---
 src/Dapr.Actors.Generators/ActorClientGenerator.cs | 14 +++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/all.sln b/all.sln
index 4a8fd0aca..12c1dca68 100644
--- a/all.sln
+++ b/all.sln
@@ -32,6 +32,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1BD1276E-D28A-45EA-89B1-6AD48471500D}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Actors.AspNetCore.Test", "test\Dapr.Actors.AspNetCore.Test\Dapr.Actors.AspNetCore.Test.csproj", "{9C1D6ABA-5EDE-4FA0-A8A9-0AB98CB74737}"
@@ -346,6 +347,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {65220BF2-EAE1-4CB2-AA58-EBE80768CB40}
 	EndGlobalSection
-EndGlobal
-lobalSection
-EndGlobal
+EndGlobal
\ No newline at end of file
diff --git a/src/Dapr.Actors.Generators/ActorClientGenerator.cs b/src/Dapr.Actors.Generators/ActorClientGenerator.cs
index 50c022a9f..bec1d9706 100644
--- a/src/Dapr.Actors.Generators/ActorClientGenerator.cs
+++ b/src/Dapr.Actors.Generators/ActorClientGenerator.cs
@@ -195,10 +195,14 @@ static void GenerateActorClientCode(SourceProductionContext context, ActorClient
     /// <summary>
     /// Generates the method implementation for the specified method.
     /// </summary>
-    /// <param name="method"></param>
-    /// <param name="generateActorClientAttributeSymbol"></param>
-    /// <param name="cancellationTokenSymbol"></param>
-    /// <returns></returns>
+    /// <param name="method">
+    /// MethodSymbol extracted from the actor interface representing the method to generate.
+    /// </param>
+    /// <param name="generateActorClientAttributeSymbol">
+    /// ActorMethodAttribute symbol used to extract generation the original actor method to use when making runtime calls.
+    /// </param>
+    /// <param name="cancellationTokenSymbol">Used to check search the position of optional cancellationToken.</param>
+    /// <returns>Returns a <see cref="MethodDeclarationSyntax"/> of the generated method.</returns>
     private static MethodDeclarationSyntax GenerateMethodImplementation(
         IMethodSymbol method,
         INamedTypeSymbol generateActorClientAttributeSymbol,
@@ -262,7 +266,7 @@ private static MethodDeclarationSyntax GenerateMethodImplementation(
             }
         }
 
-        // Extract the return type of the method.
+        // Extract the return type of the original method.
         var methodReturnType = (INamedTypeSymbol)method.ReturnType;
 
         // Generate the method implementation.