Merge branch 'release/3.0' => 'release/3.1' (#15086)

dougbu · web-flow · commit 60ace9d6f68b · 2019-10-17T13:03:25.000-07:00
diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
@@ -33,7 +33,7 @@ public async Task ShutdownTestRun()
             await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run");
         }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/2577")]
         [Flaky("https://github.com/aspnet/Hosting/issues/1214", FlakyOn.All)]
         [OSSkipCondition(OperatingSystems.Windows)]
         [OSSkipCondition(OperatingSystems.MacOSX)]

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task ShutdownTestRun()`
`33`	`33`	`await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run");`
`34`	`34`	`}`
`35`	`35`
`36`		`- [ConditionalFact]`
	`36`	`+ [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/2577")]`
`37`	`37`	`[Flaky("https://github.com/aspnet/Hosting/issues/1214", FlakyOn.All)]`
`38`	`38`	`[OSSkipCondition(OperatingSystems.Windows)]`
`39`	`39`	`[OSSkipCondition(OperatingSystems.MacOSX)]`