Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into features/FirstClassSpan #75077

Merged
merged 1,694 commits into from
Oct 4, 2024

Conversation

jjonescz
Copy link
Member

@jjonescz jjonescz commented Sep 12, 2024

Conflict resolution is in the last commit (in tests only - changes are due to the "better conversion from collection expression element" feature).

Test plan: #73445

@dotnet-policy-service dotnet-policy-service bot added VSCode Needs UX Triage Needs API Review Needs to be reviewed by the API review council labels Sep 12, 2024
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.

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Sep 12, 2024
@jjonescz
Copy link
Member Author

@cston @333fred for reviews, thanks

@jjonescz jjonescz marked this pull request as ready for review September 12, 2024 14:55
@jjonescz jjonescz requested review from a team as code owners September 12, 2024 14:55
Cosifne and others added 12 commits September 20, 2024 11:28
…6.11-vs-deps-a2079c6a-bca4-4bf3-8d0b-05fb99dcd00b"

This reverts commit 918cc0b, reversing
changes made to 37994ef.
…s-deps-to-release/dev17.6

Merge release/dev16.11-vs-deps to release/dev17.6
…tton

Fix the SmartRename button regressions
…-release/dev17.8

Merge release/dev17.6 to release/dev17.8
* Initial prototype work

* Correctly handle spreads

* Update test baselines

* Add dedicated interpolated string handler test

* Implement params changes and update tests

* Support falling back to C# 12 rules.

* Add more tests, including the table from https://github.com/dotnet/csharplang/blob/main/proposals/collection-expressions-better-conversion.md and an explicit test for dotnet#73857.

* Add tests to the CSharp 12 list as well

* Update language feature status.

* Cleanup

* Correct spread handling

* Only include expected output on .NET Core

* PR feedback.

* Add suggested numeric test.

* Document breaking changes

* More feedback.

* Add examples

* Add example of interpolated string breaking change

* PR feedback

* Update language feature status.

* More tests around dynamic and tuples

* Add collection expressions to test plan

* Spread testing
…-release/dev17.10

Merge release/dev17.8 to release/dev17.10
…o-release/dev17.11

Merge release/dev17.10 to release/dev17.11
…o-release/dev17.12

Merge release/dev17.11 to release/dev17.12
@jjonescz jjonescz force-pushed the FirstClassSpan-19-Main branch 2 times, most recently from a14d479 to 6e51056 Compare October 3, 2024 13:25
@jjonescz jjonescz force-pushed the FirstClassSpan-19-Main branch from 6e51056 to bfa5b15 Compare October 3, 2024 16:40
@jjonescz jjonescz marked this pull request as ready for review October 3, 2024 17:54
@jjonescz jjonescz requested a review from a team as a code owner October 3, 2024 17:54
@jjonescz jjonescz merged commit d63c2fd into dotnet:features/FirstClassSpan Oct 4, 2024
29 checks passed
@jjonescz jjonescz deleted the FirstClassSpan-19-Main branch October 4, 2024 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure Feature - First-class Span Types Needs API Review Needs to be reviewed by the API review council Needs UX Triage 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.