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

Update features/source generators to main #54147

Merged

Conversation

chsienki
Copy link
Contributor

Resolve conflict in PublicAPI.Unshipped.txt

ryzngard and others added 30 commits March 11, 2021 15:56
Merge main into feature/value_tracking
Merge 'main' into 'features/StaticAbstractMembersInInterfaces'
Co-authored-by: David Wengier <david.wengier@microsoft.com>
Cosifne and others added 19 commits June 15, 2021 11:25
…MembersInInterfaceFix

Fix GoToBase/GoToImplementation/FAR/InheritanceMargin for static abstract member
Add Quick Info tests for static abstract inheritdoc
* Add formatting options

* Update codestyle version

* Update version

* enable

* keep together

* Fix warning

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Formatting style

* Revert

* Disable

* Place colon consistently

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Revert

* Disable

* Disable

* Disable

* Disable

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Fix IDE0059: Unnecessary assignment

* Update .editorconfig

* Update .editorconfig

* move options

* Only run on IDE code
…ginTitleFix

Change the header of inheritance margin
…ethods. (dotnet#54118)

* Pack error codes.

* Disallow UnmanagedCallersOnly for abstract static methods.
…nInterfaces_32

Merge 'features/StaticAbstractMembersInInterfaces' into 'main'
@chsienki chsienki self-assigned this Jun 16, 2021
@chsienki chsienki requested review from a team as code owners June 16, 2021 20:39
@chsienki chsienki enabled auto-merge June 16, 2021 20:52
@chsienki
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@chsienki chsienki merged commit 80fe0a6 into dotnet:features/source-generators Jun 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.