Skip to content

Commit 21b0299

Browse files
authored
Fix System.Threading.Channels change in roslyn patch
1 parent e1729a6 commit 21b0299

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps.patch renamed to src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c8355ffa159872e061789a62e02768c8f52e7c53 Mon Sep 17 00:00:00 2001
1+
From 7cb9fb458c533d0ba183ae84563167b365df7145 Mon Sep 17 00:00:00 2001
22
From: Viktor Hofer <viktor.hofer@microsoft.com>
33
Date: Wed, 18 Dec 2024 14:38:02 +0100
44
Subject: [PATCH] FIx build errors with newer toolset and dependencies
@@ -7,8 +7,6 @@ Fixes the following two errors:
77
- 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]
88
- 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]
99

10-
The underlying SDK being used is "10.0.100-alpha.1.24555.54"
11-
1210
Backport: https://github.com/dotnet/roslyn/pull/76486
1311

1412
---
@@ -47,7 +45,7 @@ index c3729dd7244..48a5d9c53a7 100644
4745
</ItemGroup>
4846
<Import Project="..\..\..\Analyzers\Core\Analyzers\Analyzers.projitems" Label="Shared" />
4947
diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
50-
index 7ddf1ce681c..877356417e5 100644
48+
index 7ddf1ce681c..9e889061c83 100644
5149
--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
5250
+++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
5351
@@ -29,8 +29,8 @@
@@ -56,7 +54,7 @@ index 7ddf1ce681c..877356417e5 100644
5654
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
5755
- <PackageReference Include="System.IO.Pipelines" />
5856
- <PackageReference Include="System.Threading.Channels" />
59-
+ <PackageReference Include="System.IO.Pipelines" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
57+
+ <PackageReference Include="System.IO.Pipelines" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
6058
+ <PackageReference Include="System.Threading.Channels" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
6159
</ItemGroup>
6260
<ItemGroup Label="Linked Files">

0 commit comments

Comments
 (0)