mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Expanding roslyn patch to address all issues (#19651)

Browse source
This commit is contained in:
Michael Simons 2024-05-02 18:16:57 -05:00 committed by GitHub
parent 241a8a396b
commit eeae65e284
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/SourceBuild/patches/roslyn/0001-ambiguous-call-site.patch
View file

@ -1,12 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com> From: Michael Simons <msimons@microsoft.com>
Date: Thu, 2 May 2024 17:22:41 +0000 Date: Thu, 2 May 2024 21:52:54 +0000
Subject: [PATCH] Avoid ambiguous call site Subject: [PATCH] Avoid ambiguous call site
--- ---
.../GenerateType/AbstractGenerateTypeService.Editor.cs | 4 ++--
.../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +- .../Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs
index 3839eb370eb..8d272db6b1b 100644 index 3839eb370eb..8d272db6b1b 100644
--- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeGeneration/CodeGenerationHelpers.cs