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 #34616

Conversation

Projects
None yet
4 participants
@dotnet-bot
Copy link
Collaborator

commented Mar 31, 2019

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 upstream 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.

jaredpar and others added some commits Mar 28, 2019

Move Powershell formatting to match arcade
Two space indent is an abomination but it's the standard that Arcade
chose. Moving our Powershell to be consistent with the standard.
Implement pattern-matching in the nullable walker (#34273)
* Implement pattern-matching in the nullable walker

Fixes #29909
Fixes #31881
Fixes #30952
Fixes #33499
Fixes #30597
Fixes #32414
Fixes #23944

* Remove infinite recursion by using an empty struct cache.

* Changes per code review comments.

* Remove debugging code accidentally left behind.

* Analysis of patterns-matching in the nullable walker requires valid (>0) slots.

* Skip a flaky test

* Patch after merge.

* Make ctor private to force use of factory methods

* Correct a typo.

* Fixup after merge.
Merge pull request #34560 from jaredpar/fix-format
Move Powershell formatting to match arcade

@dotnet-bot dotnet-bot requested a review from dotnet/roslyn-compiler as a code owner Mar 31, 2019

@dotnet-automerge-bot
Copy link
Collaborator

left a comment

Auto-approval

@dotnet-automerge-bot dotnet-automerge-bot merged commit ec8507c into features/editorconfig-in-compiler Mar 31, 2019

14 of 15 checks passed

roslyn-integration-CI Build #20190330.15 had test failures
Details
WIP Ready for review
Details
license/cla All CLA requirements met.
Details
roslyn-CI Build #20190330.16 succeeded
Details
roslyn-CI (Linux_Test coreclr) Linux_Test coreclr succeeded
Details
roslyn-CI (Linux_Test mono) Linux_Test mono succeeded
Details
roslyn-CI (Windows_CoreClr_Unit_Tests debug) Windows_CoreClr_Unit_Tests debug succeeded
Details
roslyn-CI (Windows_CoreClr_Unit_Tests release) Windows_CoreClr_Unit_Tests release succeeded
Details
roslyn-CI (Windows_Correctness_Test) Windows_Correctness_Test succeeded
Details
roslyn-CI (Windows_Desktop_Spanish_Unit_Tests) Windows_Desktop_Spanish_Unit_Tests succeeded
Details
roslyn-CI (Windows_Desktop_Unit_Tests debug_32) Windows_Desktop_Unit_Tests debug_32 succeeded
Details
roslyn-CI (Windows_Desktop_Unit_Tests debug_64) Windows_Desktop_Unit_Tests debug_64 succeeded
Details
roslyn-CI (Windows_Desktop_Unit_Tests release_32) Windows_Desktop_Unit_Tests release_32 succeeded
Details
roslyn-CI (Windows_Desktop_Unit_Tests release_64) Windows_Desktop_Unit_Tests release_64 succeeded
Details
roslyn-CI (Windows_Determinism_Test) Windows_Determinism_Test succeeded
Details

@dotnet-automerge-bot dotnet-automerge-bot deleted the merges/master-to-features/editorconfig-in-compiler branch Mar 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.