Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Mar 5, 2025

I detected changes in the main branch which have not been merged yet to release/dev18.0. I'm a robot and am configured to help you automatically keep release/dev18.0 up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • jjonescz

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout release/dev18.0
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev18.0
or if you are using SSH
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev18.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-release/dev18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-release/dev18.0 origin/release/dev18.0
git pull https://github.com/dotnet/roslyn merge/main-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev18.0
or if you are using SSH
git fetch
git checkout -b merge/main-to-release/dev18.0 origin/release/dev18.0
git pull git@github.com:dotnet/roslyn merge/main-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev18.0

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

jjonescz and others added 13 commits January 28, 2025 14:08
* Parse partial events and constructors

* Update pre-existing tests

* Explain why partial ctors are sometimes disallowed

* Parse `partial` constructors unconditionally

* Gate parsing on LangVersion

* Extend tests and docs

* Fix indentation

* Rename combinatorial values

* Test more lang versions

* Parse partial events unconditionally
* Partial events and constructors: merge and check symbols

* Improve code

* Move partial availability check

* Improve code

* Fix duplicate definition diagnostic

* Test different ordering

* Avoid reporting diagnostic for escaped `partial`

* Clarify naming of AccessorsHaveImplementation property

* Add event definition accessor symbol

* Improve code

* Test sequence points

* Test extern IL

* Fix interface container diagnostics

* Fix sequence points issue in the test utility

* Ensure the new accessor owner is a definition
* Partial events and constructors: check differences

* Improve code and tests

* Complete constructor implementation part

* Report error for tuple differences in constructors
* Partial events and constructors: attributes

* Update pre-existing tests

* Fixup expected PEVerify output

* Check a flag before materializing syntax nodes

* Assert that the definition part of an event doesn't have accessors

* Keep pre-existing event attribute target behavior

* Improve code

* Add WorkItem attribute

* Strengthen asserts

Co-authored-by: Rikki Gibson <rikkigibson@gmail.com>

---------

Co-authored-by: Rikki Gibson <rikkigibson@gmail.com>
* Partial events and constructors: public API

* Simplify code

* Add more `sealed`

* Add more asserts
* Partial events and constructors: IDE

* Fix event keyword recommender

* Fix symbol suggestions

* Fixup failing tests

* Fixup SymbolKey

* Improve code

* Use `Equal` instead of `Same` in SymbolKey tests

* Extend a test

* Use collection expressions

Co-authored-by: Cyrus Najmabadi <cyrus.najmabadi@gmail.com>

---------

Co-authored-by: Cyrus Najmabadi <cyrus.najmabadi@gmail.com>
@github-actions github-actions bot requested review from a team as code owners March 5, 2025 12:04
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Mar 5, 2025
@dotnet-policy-service dotnet-policy-service bot added VSCode Needs API Review Needs to be reviewed by the API review council labels Mar 5, 2025
@dotnet-policy-service
Copy link
Contributor

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.

@jjonescz jjonescz merged commit 9f3fb56 into release/dev18.0 Mar 5, 2025
39 of 42 checks passed
JoeRobich added a commit to dotnet/roslyn-tools that referenced this pull request Mar 6, 2025
The Arcade inter-branch merge GH action creates merge commits with a
differently formatted message (ex. `[automated] Merge branch
'prerelease' => 'main' (#8039)`)

Tested by generating PR list between Roslyn main and Roslyn
release/dev18.0:
*Before*:
```md
### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0):
[View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77445)](dotnet/roslyn#77445)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77441)](dotnet/roslyn#77441)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77431)](dotnet/roslyn#77431)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77409)](dotnet/roslyn#77409)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77374)](dotnet/roslyn#77374)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77292)](dotnet/roslyn#77292)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77226)](dotnet/roslyn#77226)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77153)](dotnet/roslyn#77153)
- [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138)
```

*After*:
```md
### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0):
[View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1)
- [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138)
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure Needs API Review Needs to be reviewed by the API review council untriaged Issues and PRs which have not yet been triaged by a lead VSCode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants