Skip to content

Commit 74a830d

Browse files
authored
Update roslyn patch
1 parent 0a225e8 commit 74a830d

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 826604a1eef61831f205169d392b33983aa0340c Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <viktor.hofer@microsoft.com>
3+
Date: Wed, 18 Dec 2024 14:38:02 +0100
4+
Subject: [PATCH] FIx build errors with newer toolset and dependencies
5+
6+
Fixes the following two errors:
7+
- src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(217,13): error CS1503: Argument 4: cannot convert from 'System.Collections.Immutable.ImmutableHashSet<Microsoft.CodeAnalysis.Project>' to 'System.Collections.Generic.IReadOnlySet<Microsoft.CodeAnalysis.Project>' [src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0]
8+
- src/roslyn/src/Features/Core/Portable/ExternalAccess/Watch/Api/WatchHotReloadService.cs(218,13): error CS1503: Argument 5: cannot convert from 'System.Collections.Immutable.ImmutableHashSet<Microsoft.CodeAnalysis.Project>' to 'System.Collections.Generic.IReadOnlySet<Microsoft.CodeAnalysis.Project>' [src/roslyn/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj::TargetFramework=net9.0]
9+
10+
The underlying SDK being used is "10.0.100-alpha.1.24555.54"
11+
12+
Backport: https://github.com/dotnet/roslyn/pull/76486
13+
14+
---
15+
.../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 2 +-
16+
1 file changed, 1 insertion(+), 1 deletion(-)
17+
18+
diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
19+
index c3729dd7244..48a5d9c53a7 100644
20+
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
21+
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
22+
@@ -139,7 +139,7 @@
23+
<PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.Elfie" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
25+
<PackageReference Include="Microsoft.DiaSymReader" />
26+
- <PackageReference Include="System.Text.Json" />
27+
+ <PackageReference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
28+
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
29+
</ItemGroup>
30+
<Import Project="..\..\..\Analyzers\Core\Analyzers\Analyzers.projitems" Label="Shared" />

src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-immutablehashset.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)