Fixes #7536

dotnet · Jan 19, 2025 · 16b25a0 · 16b25a0
1 parent 45caa45
commit 16b25a0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/...itTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_0_False/Resources.Designer.cs b/...itTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_0_False/Resources.Designer.cs
diff --git a/...nitTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_0_True/Resources.Designer.cs b/...nitTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_0_True/Resources.Designer.cs
diff --git a/...sources/SingleString_EmitFormatMethodsCSharpAsync_replacement_False/Resources.Designer.cs b/...sources/SingleString_EmitFormatMethodsCSharpAsync_replacement_False/Resources.Designer.cs
diff --git a/...esources/SingleString_EmitFormatMethodsCSharpAsync_replacement_True/Resources.Designer.cs b/...esources/SingleString_EmitFormatMethodsCSharpAsync_replacement_True/Resources.Designer.cs
diff --git a/...itTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_x_False/Resources.Designer.cs b/...itTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_x_False/Resources.Designer.cs
diff --git a/...nitTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_x_True/Resources.Designer.cs b/...nitTests/Resources/SingleString_EmitFormatMethodsCSharpAsync_x_True/Resources.Designer.cs
diff --git a/...ourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/ResxGeneratorTests.cs b/...ourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/ResxGeneratorTests.cs
@@ -630,7 +630,7 @@ public async Task SingleString_EmitFormatMethodsCSharpAsync(
             bool emitFormatMethods)
         {
             var code = ResxHeader
-                + $@"  <data name=""Name"" xml:space=""preserve"">
+                + $@"  <data name=""Name.with.dots"" xml:space=""preserve"">
     <value>value {{{placeholder}}}</value>
     <comment>comment</comment>
   </data>"

diff --git a/...s.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/AbstractResxGenerator.cs b/...s.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/AbstractResxGenerator.cs
@@ -450,7 +450,7 @@ public bool Execute(CancellationToken cancellationToken)
                                 if (resourceString.HasArguments)
                                 {
                                     RenderDocComment(language, memberIndent, strings, docCommentString);
-                                    RenderFormatMethod(memberIndent, language, CompilationInformation.SupportsNullable, strings, resourceString);
+                                    RenderFormatMethod(memberIndent, language, CompilationInformation.SupportsNullable, strings, resourceString, identifier);
                                 }
                             }
 
@@ -811,9 +811,9 @@ private static void SplitName(string fullName, out string? namespaceName, out st
                 }
             }
 
-            private static void RenderFormatMethod(string indent, Lang language, bool supportsNullable, StringBuilder strings, ResourceString resourceString)
+            private static void RenderFormatMethod(string indent, Lang language, bool supportsNullable, StringBuilder strings, ResourceString resourceString, string identifier)
             {
-                strings.AppendLine($"{indent}internal static string Format{resourceString.Name}({resourceString.GetMethodParameters(language, supportsNullable)})");
+                strings.AppendLine($"{indent}internal static string Format{identifier}({resourceString.GetMethodParameters(language, supportsNullable)})");
                 if (resourceString.UsingNamedArgs)
                 {
                     strings.AppendLine($@"{indent}   => string.Format(Culture, GetResourceString(""{resourceString.Name}"", new[] {{ {resourceString.GetArgumentNames()} }}), {resourceString.GetArguments()});");