Fix System.Threading.Channels change in roslyn patch

dotnet · Dec 18, 2024 · 21b0299 · 21b0299
1 parent e1729a6
commit 21b0299
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...rrors-downgraded-sci-and-other-deps.patch → ...downgraded-sci-and-other-deps-again.patch b/...rrors-downgraded-sci-and-other-deps.patch → ...downgraded-sci-and-other-deps-again.patch
@@ -1,4 +1,4 @@
-From c8355ffa159872e061789a62e02768c8f52e7c53 Mon Sep 17 00:00:00 2001
+From 7cb9fb458c533d0ba183ae84563167b365df7145 Mon Sep 17 00:00:00 2001
 From: Viktor Hofer <viktor.hofer@microsoft.com>
 Date: Wed, 18 Dec 2024 14:38:02 +0100
 Subject: [PATCH] FIx build errors with newer toolset and dependencies
@@ -7,8 +7,6 @@ Fixes the following two errors:
 - 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]
 - 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]
 
-The underlying SDK being used is "10.0.100-alpha.1.24555.54"
-
 Backport: https://github.com/dotnet/roslyn/pull/76486
 
 ---
@@ -47,7 +45,7 @@ index c3729dd7244..48a5d9c53a7 100644
    </ItemGroup>
    <Import Project="..\..\..\Analyzers\Core\Analyzers\Analyzers.projitems" Label="Shared" />
 diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
-index 7ddf1ce681c..877356417e5 100644
+index 7ddf1ce681c..9e889061c83 100644
 --- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
 +++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
 @@ -29,8 +29,8 @@
@@ -56,7 +54,7 @@ index 7ddf1ce681c..877356417e5 100644
      <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 -    <PackageReference Include="System.IO.Pipelines" />
 -    <PackageReference Include="System.Threading.Channels" />
-+    <PackageReference Include="System.IO.Pipelines" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
++    <PackageReference Include="System.IO.Pipelines" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
 +    <PackageReference Include="System.Threading.Channels" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
    </ItemGroup>
    <ItemGroup Label="Linked Files">