Merge dev15.7.x to dev15.7.x-vs-deps#26353
Merged
jasonmalinowski merged 8 commits intodev15.7.x-vs-depsfrom Apr 24, 2018
Merged
Merge dev15.7.x to dev15.7.x-vs-deps#26353jasonmalinowski merged 8 commits intodev15.7.x-vs-depsfrom
jasonmalinowski merged 8 commits intodev15.7.x-vs-depsfrom
Conversation
Leading/trailing decorative text can interfere with the pattern matcher's ability to find/bold matching spans and add redundant items to the MRU list.
Removal tracked by #26209.
Fix cases where tests fail to clean up files placed in the Temp folder
Make the project participate in package restore. Removal tracked by #26346.
Add VBCSCompiler to SourceBuild.sln
Handle completion items with leading/trailing decorative text
Member
|
Are these actual test failures? @333fred Rerunning in case it helps (although my understanding is that Roslyn is more deterministic than most repos): @dotnet-bot test windows_release_unit64_prtest (was https://ci.dot.net/job/dotnet_roslyn/job/dev15.7.x-vs-deps/job/windows_release_unit64_prtest/233/) (Edit: or not, I guess dotnet-bot doesn't like me.) |
Member
|
@dotnet-bot retest windows_release_unit64_prtest please. |
Member
|
@dagood There's something up with our regex match that doesn't like words after the phrase on the same line. |
jasonmalinowski
approved these changes
Apr 24, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from dev15.7.x into dev15.7.x-vs-deps.
git fetch --all git checkout merges/dev15.7.x-to-dev15.7.x-vs-deps git reset --hard upstream/dev15.7.x-vs-deps git merge upstream/dev15.7.x # Fix merge conflicts git commit git push merges/dev15.7.x-to-dev15.7.x-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.