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 dev16.0.x to dev16.0.x-vs-deps #30292

Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev16.0.x into dev16.0.x-vs-deps.

git fetch --all
git checkout merges/dev16.0.x-to-dev16.0.x-vs-deps
git reset --hard upstream/dev16.0.x-vs-deps
git merge upstream/dev16.0.x
# Fix merge conflicts
git commit
git push merges/dev16.0.x-to-dev16.0.x-vs-deps --force

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

jasonmalinowski and others added 2 commits September 27, 2018 17:42
The addition of IThreadingContext to this type's constructor broke
TypeScript, which they already have a build for that deals with the
change. However it requires a simultaneous insertion which is proving
difficult to achieve. Adding this overload (which is admittedly a total
hack) allows TypeScript to continue functioning even with Roslyn's
change.
Add a overload to AsynchronousViewTaggerProvider for TypeScript
@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 3, 2018

ubuntu_16_debug_prtest failure is at https://ci.dot.net/job/dotnet_roslyn/job/dev16.0.x-vs-deps/job/ubuntu_16_debug_prtest/26/

/mnt/j/workspace/dotnet_roslyn/dev16.0.x-vs-deps/ubuntu_16_debug_prtest/build/Targets/Imports.targets(87,5): error : Too many compiler server connection failures detected: 21 [/mnt/j/workspace/dotnet_roslyn/dev16.0.x-vs-deps/ubuntu_16_debug_prtest/src/CodeStyle/CSharp/Tests/Microsoft.CodeAnalysis.CSharp.CodeStyle.UnitTests.csproj]

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 3, 2018

retest ubuntu_16_debug_prtest please

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 3, 2018

ubuntu_16_debug_prtest failed again @ https://ci.dot.net/job/dotnet_roslyn/job/dev16.0.x-vs-deps/job/ubuntu_16_debug_prtest/27/, same error as earlier.

Tracked by #30293

@dpoeschl
Copy link
Contributor

dpoeschl commented Oct 3, 2018

retest ubuntu_16_debug_prtest please

@jasonmalinowski jasonmalinowski merged commit 32efa2b into dev16.0.x-vs-deps Oct 3, 2018
@jasonmalinowski jasonmalinowski deleted the merges/dev16.0.x-to-dev16.0.x-vs-deps branch October 3, 2018 20:26
xoofx pushed a commit to stark-lang/stark-roslyn that referenced this pull request Apr 16, 2019
….0.x-vs-deps

Merge dev16.0.x to dev16.0.x-vs-deps
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.

3 participants