Skip to content

Expanding roslyn patch to address all issues #19651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2024
Merged

Expanding roslyn patch to address all issues #19651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 2 May 2024 17:22:41 +0000
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 2 May 2024 21:52:54 +0000
Subject: [PATCH] Avoid ambiguous call site

---
.../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
.../GenerateType/AbstractGenerateTypeService.Editor.cs | 4 ++--
.../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs b/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs
index 8adaaeda551..b099e092c7b 100644
--- a/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs
+++ b/src/Features/Core/Portable/GenerateType/AbstractGenerateTypeService.Editor.cs
@@ -525,7 +525,7 @@ private async Task<ImmutableArray<CodeActionOperation>> GetGenerateIntoContainin
AddFoldersToNamespaceContainers(containerList, folders);

containers = [.. containerList];
- includeUsingsOrImports = string.Join(".", [.. containerList]);
+ includeUsingsOrImports = string.Join(".", containerList);
}

// Case 4 : If the type is generated into the same VB project or
@@ -539,7 +539,7 @@ private async Task<ImmutableArray<CodeActionOperation>> GetGenerateIntoContainin
// Populate the ContainerList
AddFoldersToNamespaceContainers(containerList, folders);
containers = [.. containerList];
- includeUsingsOrImports = string.Join(".", [.. containerList]);
+ includeUsingsOrImports = string.Join(".", containerList);
if (!string.IsNullOrWhiteSpace(rootNamespaceOfTheProjectGeneratedInto))
{
includeUsingsOrImports = string.IsNullOrEmpty(includeUsingsOrImports)
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
index 3839eb370eb..8d272db6b1b 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
@@ -71,7 +71,7 @@ internal static class CodeGenerationHelpers
break;
}

- name = string.Join(".", [.. names]);
+ name = string.Join(".", names);
}
Expand Down