A conflict was detected when trying to update this PR with changes from build 334749 of https://github.com/dotnet/roslyn/tree/a1bbcb8c7337ff9c51e642bdb9564577a3d928b9.

@dotnet/roslyn-infrastructure, please resolve the merge conflict.

@jjonescz, Roslyn flow remains red after its replacement run.

Root cause

Roslyn upstream collapsed the  ...Handler.Diagnostics.Public  namespace in commit range  c370e64…9e0445c . That change has two halves:

1. delete  src/LanguageServer/Protocol/Handler/Diagnostics/Public/PublicDocumentPullDiagnosticHandlerFactory.cs  and  PublicWorkspacePullDiagnosticHandlerFactory.cs 
2. strip the matching references out of  src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptPullDiagnosticHandlerProvider.cs  ( +4/−23  upstream)

The codeflow applied half 1 but only  +4/−4  of half 2 — 19 deletions were dropped: the  using …Handler.Diagnostics.Public;  on line 12, and the two  Public*  factory classes on lines 34–51. Upstream's file is 33 lines with zero  Public  references; the PR head is 52 lines with seven.  source-manifest.json  was still advanced to  9e0445c , so the recorded SHA says "fully synced" while the tree isn't.

Result: the consumer references types whose definitions were deleted in the same PR →  CS0234  /  CS0246 .

It got into that state because Maestro could never complete an update. Five consecutive attempts (builds 334749, 334854, 334857, 334869, 334871) all conflicted and were never resolved, leaving the branch partially applied.

The conflict is on one element in  src/roslyn/src/ProjectData/Microsoft.NET.ProjectData.Tasks/Microsoft.NET.ProjectData.Tasks.csproj :

• VMR  release/11.0.2xx  added  $(NetRoslyn)  plus  EnableAotAnalyzer / EnableTrimAnalyzer  false
• roslyn upstream rewrote the same    to  $(NetRoslynSourceBuild)  and deleted those analyzer lines

Both sides edited the same element, so every roslyn flow into that branch conflicts. Only  release/11.0.2xx  carries the override —  main  and  release/11.0.1xx  match upstream and flow cleanly.

Recommended fix

1. Unblock the PR now — resolve the conflict and let the full roslyn diff land:

git clone https://github.com/dotnet/dotnet && cd dotnet
./eng/common/darc-init.ps1
darc vmr resolve-conflict --subscription 0ced2b69-f424-4e43-96ce-6a74693be251

When resolving  Microsoft.NET.ProjectData.Tasks.csproj , take the upstream side — drop the VMR-local block:

netstandard2.0
$(NetRoslyn)
false
false

$(NetRoslynSourceBuild)

Safe for source-build: roslyn's  eng/targets/TargetFrameworks.props  sets both  NetRoslyn  and  NetRoslynSourceBuild  to  $(NetCurrent)  when  DotNetBuildSourceOnly == true , so the override was already redundant there. Outside source-build the TFM changes from  netstandard2.0  to  $(NetRoslynAll)  — roslyn's own decision, validated by their CI.

Then confirm  VSTypeScriptPullDiagnosticHandlerProvider.cs  ends up at 33 lines with zero  Public  references, matching upstream. That's the check that the dropped 19 deletions actually landed.

2. Prevent the recurrence — the local override is why every roslyn flow into  release/11.0.2xx  conflicts. Removing it in step 1 fixes this permanently. If some VMR-specific need still requires it, upstream it to dotnet/roslyn rather than re-patching the branch.