Skip to content

Merge release/2.1 #8448

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

Merged
merged 6 commits into from
Mar 14, 2019
Merged

Merge release/2.1 #8448

merged 6 commits into from
Mar 14, 2019

Conversation

pranavkm
Copy link
Contributor

No description provided.

pranavkm and others added 5 commits March 1, 2019 10:49
* Add some additional logging to ErrorPageMiddlewareWebSite

DeveloperExceptionMiddleware will log an error if rendering the exception page
throws. The test failure in https://github.com/aspnet/AspNetCore-Internal/issues/1730
suggests that we encountered an error like so but do not have anything further to go by.

This change adds logging to the test so we could identify possible issues
Possible fix to #7313
One of the characteristics of these failures were that the
test took long to run. The build log has warnings for
several long running tests. This might be a result of CPU
contention since mondo-ification that make MVC's functional tests
run with nearly every other test project in the solution
- shipped in the past patch
Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Please hold off on this until I get the queue changes into release/2.2. You're backing those changes out while making it seem as if they're already in this branch.

I'll be updating #7920 to install Chrome and that one working after lunch.

@dougbu
Copy link
Contributor

dougbu commented Mar 14, 2019

@pranavkm I just merged #7920 which should unblock this. You probably need to redo the merge to avoid conflicts and correct the list of commits.

@pranavkm pranavkm force-pushed the prkrishn/merge/2.1 branch 2 times, most recently from 499cc96 to 47698fe Compare March 14, 2019 17:00
@pranavkm pranavkm force-pushed the prkrishn/merge/2.1 branch from 47698fe to 7557cb9 Compare March 14, 2019 17:05
@pranavkm
Copy link
Contributor Author

:update:

Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Looks fine to me

@dougbu dougbu merged commit 20b596a into release/2.2 Mar 14, 2019
@dougbu dougbu deleted the prkrishn/merge/2.1 branch March 14, 2019 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants