Merge branch 'release' into dev

2015-10-29 12:06:18 -07:00 · 2015-10-29 12:06:18 -07:00 · 9247f6624c
parent f7489c2108 ddf6a45f80
commit 9247f6624c
1 changed files with 2 additions and 1 deletions
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@ -281,7 +281,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
            }
        }

-        [Fact]
+        [ConditionalTheory]
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
        public async Task Pass_thru_when_context_not_in_services()
        {
            using (var database = SqlServerTestStore.CreateScratch())