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 master to features/editorconfig-in-compiler #32109

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/editorconfig-in-compiler.

git fetch --all
git checkout merges/master-to-features/editorconfig-in-compiler
git reset --hard upstream/features/editorconfig-in-compiler
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-features/editorconfig-in-compiler --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

CyrusNajmabadi and others added 26 commits December 13, 2018 11:20
Since #30868, `ContentTypeNames`
has moved to this assembly. Type forwarding doesn't seem to work for
IVT.
Azure Pipelines now supports us putting the branches which trigger PR
and CI validation into the YAML files. This change puts the current
contents of our build definition into the YAML files and updates our
creating feature branches document.

Note: i have not yet changed our build definition to read this
information. Want to commit this, give it a day to flow to the branches
then I will flip our definition over.
Co-Authored-By: jaredpar <jaredpparsons@gmail.com>
It was out of date in a few places as projects have been moved/renamed/created.
Move CI / PR triggers to YAML files
Cache the return values for GetIdForErrorCode
Random code comment typo fixes
Fixed adding attribute list with target specifier
 Rename an enum member to be clearer, and add docs as well.
EditorFeatures.Text IVTs for MonoDevelop
Consistently parse .editorconfig option values containing spaces
…31782)

* Fix additional newlines being added when adding all missing imports

* Use syntax formatter to remove extra newlines when adding missing imports

* Apply suggestions from code review

* Added assert to ensure we retain the final newline

* Updated the assert to include cases where a newline pre-existed
For each reference that doesn't have an .XML doc file we allocate and cache a FileBasedXmlDocumentationProvider that throws a first-chance exception upon first use.

Add and use a singleton NullXmlDocumentationProvider instead when the requested .XML doc file doesn't exist.
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit e5fdf94 into features/editorconfig-in-compiler Jan 3, 2019
@ghost ghost deleted the merges/master-to-features/editorconfig-in-compiler branch January 3, 2019 18:00
This pull request was closed.
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.

None yet