huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Doug Bunting 2019-10-17 13:03:25 -07:00 committed by GitHub
parent 6d43b50183 b9aeff4250
commit 60ace9d6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Hosting/test/FunctionalTests/ShutdownTests.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run"); 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)] [Flaky("https://github.com/aspnet/Hosting/issues/1214", FlakyOn.All)]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]