Merge main to features/sonic by davidwengier · Pull Request #84349 · dotnet/roslyn

davidwengier · 2026-06-30T22:49:39Z

Microsoft Reviewers: Open in CodeFlow

…r warning - New MakeMethodAsynchronousCodeFixBenchmarks.cs in IdeCoreBenchmarks comparing FAR-based vs signature-based event-handler detection with CommonName and UniqueName parameterized scenarios - Add GetMakeAsyncTaskFunctionForEventHandlerResource() abstract method to AbstractMakeMethodAsynchronousCodeFixProvider; RegisterTaskFix uses the warning title when the method looks like an event handler - Add Make_method_async_for_event_handler resource string to CSharp resx + all 13 XLF files - Override new method in CSharpMakeMethodAsynchronousCodeFixProvider - Add Make_Async_Function_for_event_handler resource string to VB resx + all 13 XLF files - Override new method in VisualBasicMakeMethodAsynchronousCodeFixProvider Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Co-authored-by: Cyrus Najmabadi <Cyrus Najmabadi> Co-authored-by: Julien Couvreur <12466233+jcouv@users.noreply.github.com>

…oreBenchmarks Program.cs Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

…h warning; remove benchmark file Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

…github.com/dotnet/roslyn into copilot/fix-async-quick-fix-event-handlers

…gnore Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Co-authored-by: Cyrus Najmabadi <Cyrus Najmabadi> Co-authored-by: Julien Couvreur <12466233+jcouv@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

...to GetAsyncEventHandlersRequireAsyncVoidWarningResource

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

…t-handlers' into copilot/fix-async-quick-fix-event-handlers Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84262)

…a multiplication by a factor 2 (dotnet#84340) From the "IEnumerable" chapter : https://github.com/dotnet/roslyn/blob/main/docs/features/incremental-generators.md#pipeline-based-execution

…net#84337) Found in the logs of https://devdiv.visualstudio.com/DevDiv/_workitems/edit/3023073, we check the buffer type before assigning `_textBuffer`, but later assume it's not null _before_ that same check. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84337)

Fixes dotnet#84104 Fixes dotnet/vscode-csharp#9327 I've been trying to repro this for a while, running my local VS with extra logging etc. and haven't been able to hit it. I've decided therefore to give up, and just not bother the user if we get a bad request from the editor, and simply return no color info. Presumably the editor will follow up with another request, that is hopefully correct this time. If semantic tokens is broken as a result, then I'm sure we'll find out about it, and will probably get more traction from the editor team with that sort of bug anyway. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84334)

# Conflicts: # src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Diagnostics/CohostDocumentPullDiagnosticsEndpointBase.cs # src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Diagnostics/CohostDocumentPullDiagnosticsHelpers.cs # src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs # src/Razor/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/OrganizeUsingsCommand.cs

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

dotnet-policy-service · 2026-06-30T22:50:28Z

This PR modifies public API files. Please follow the instructions at https://github.com/dotnet/roslyn/blob/main/docs/contributing/API%20Review%20Process.md for ensuring all public APIs are reviewed before merging.

…otnet#84346) Register CS1574 in the C# fully-qualify provider and search inside documentation-comment trivia so the fix is offered for unresolved type references in XML doc `<see cref="..."/>` attributes. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84346)

) Entirely copied from the EnC behaviour ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84303)

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

…t#84308) This PR explores moving our AI-agent documentation to the structure from https://github.com/abpiskunov/dev-skills, with the goal of improving context loading — agents read an `INDEX`-driven map and load only the memory/instruction files relevant to the area they're working in, rather than pulling one large monolithic instructions file into context. We expect this documentation to change rapidly over time as we continue to work with Copilot in the product, so it should be treated as a living, evolving baseline rather than a finished spec. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

jjonescz and others added 30 commits June 11, 2026 15:25

Merge main into features/labeled-break-and-continue (dotnet#84090)

0393127

Unions: support inheritance of HasValue property in member provider i…

e93c3e4

…nterface (dotnet#84088)

[labeled break/continue] Completion of enclosing labels (dotnet#83199)

5a4cff5

Co-authored-by: Cyrus Najmabadi <Cyrus Najmabadi> Co-authored-by: Julien Couvreur <12466233+jcouv@users.noreply.github.com>

Add NoDetection prod-baseline benchmark; extend build timeout in IdeC…

bd17030

…oreBenchmarks Program.cs Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Scale MakeMethodAsynchronous benchmark to 1000 extra classes

47f54ae

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Use FAR-based event-handler detection; always show Task fix first wit…

8931696

…h warning; remove benchmark file Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Tighten FAR-based event-handler detection

46ee867

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Add comprehensive MakeMethodAsynchronous event-handler tests

b9de2f2

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Merge branch 'copilot/fix-async-quick-fix-event-handlers' of https://…

b0f123f

…github.com/dotnet/roslyn into copilot/fix-async-quick-fix-event-handlers

Use annotation, not title, to inform

4c8be02

Remove benchmark artifacts and add BenchmarkDotNet.Artifacts to .giti…

1fda10f

…gnore Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Revert changes to IdeCoreBenchmarks/Program.cs

2f05012

Fixup annotation text

c16a007

Don't assume documents being saved are documents

f763be7

[labeled break/continue] Go to Definition (dotnet#83200)

1a6cd97

Co-authored-by: Cyrus Najmabadi <Cyrus Najmabadi> Co-authored-by: Julien Couvreur <12466233+jcouv@users.noreply.github.com>

[labeled break/continue] Keyword highlighting (dotnet#83201)

3da49f4

Change "referencing" to "referenced"

1d8b6a8

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Add VB async event-handler regression test

57b3048

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Remove brittle comment

7876a17

Rename GetMakeAsyncTaskFunctionForEventHandlerResource...

c64a784

...to GetAsyncEventHandlersRequireAsyncVoidWarningResource

Make VB annotation match C# annotation

533f318

Update VB XLF files

eeb080c

Use shared ancestor helper in event handler check

d60f172

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Test partial definitions, batch references by document

e9c4166

Resolve merge conflict

8ed4567

Refine async event handler detection

1ecba4e

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Defer async event warning detection

37932b0

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Move FAR to FixNodeAsync; simplify annotation code

e770205

Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

Merge remote-tracking branch 'origin/copilot/fix-async-quick-fix-even…

0063d67

…t-handlers' into copilot/fix-async-quick-fix-event-handlers Co-authored-by: mwiemer-microsoft <80539004+mwiemer-microsoft@users.noreply.github.com>

tmat and others added 6 commits June 30, 2026 11:16

Update VSSDK to 18.9.496-Preview (dotnet#84262)

afda379

###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84262)

doc(IncrementalGenerators): the square example is wrong, that's only …

d9667dc

…a multiplication by a factor 2 (dotnet#84340) From the "IEnumerable" chapter : https://github.com/dotnet/roslyn/blob/main/docs/features/incremental-generators.md#pipeline-based-execution

Fix error handling to not swallow errors with client creation etc.

a00f8d9

Copilot AI review requested due to automatic review settings June 30, 2026 22:49

davidwengier requested review from a team as code owners June 30, 2026 22:49

Copilot AI reviewed Jun 30, 2026

dotnet-policy-service Bot added VSCode Area-Razor Needs API Review Needs to be reviewed by the API review council labels Jun 30, 2026

akhera99 and others added 3 commits June 30, 2026 23:20

Fix test that came in the merge

5243f7b

Collect Razor formatting logs during VS feedback recording (dotnet#84303

a5accec

) Entirely copied from the EnC behaviour ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/84303)

davidwengier commented Jul 1, 2026

View reviewed changes

Comment thread ...ompiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.UnitTests/RazorSourceGeneratorTests.cs Outdated

Apply suggestion from @davidwengier

b06fdd4

Copilot AI review requested due to automatic review settings July 1, 2026 03:28

Copilot AI reviewed Jul 1, 2026

jjonescz and others added 5 commits July 1, 2026 16:31

Dispose builders in declaration computer (dotnet#84339)

83e1242

Handle instrumented conditions in post-lowering passes (dotnet#84244)

4ca37e3

Merge remote-tracking branch 'upstream/main' into MergeMain

340b31e

Merge remote-tracking branch 'upstream/features/sonic' into MergeMain

c502c26

333fred approved these changes Jul 1, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main to features/sonic#84349

Merge main to features/sonic#84349
davidwengier wants to merge 314 commits into
dotnet:features/sonicfrom
davidwengier:MergeMain

davidwengier commented Jun 30, 2026 •

edited by dotnet-policy-service Bot

Loading

Copilot AI left a comment

dotnet-policy-service Bot commented Jun 30, 2026

Uh oh!

Copilot AI left a comment

Labels

20 participants

Uh oh!

Conversation

davidwengier commented Jun 30, 2026 • edited by dotnet-policy-service Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Microsoft Reviewers: Open in CodeFlow

Copilot AI left a comment

Choose a reason for hiding this comment

dotnet-policy-service Bot commented Jun 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Labels

20 participants

davidwengier commented Jun 30, 2026 •

edited by dotnet-policy-service Bot

Loading