Merge in 'release/2.1' changes

dotnet-bot · dotnet-bot · commit 6169f4dd5957 · 2018-12-07T23:46:01.000Z
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
@@ -24,7 +24,7 @@ public AutobahnTests(ITestOutputHelper output) : base(output)
 
         // Skip if wstest is not installed for now, see https://github.com/aspnet/WebSockets/issues/95
         // We will enable Wstest on every build once we've gotten the necessary infrastructure sorted out :).
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/4350")]
         [SkipIfWsTestNotPresent]
         public async Task AutobahnTestSuite()
         {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public AutobahnTests(ITestOutputHelper output) : base(output)`
`24`	`24`
`25`	`25`	`// Skip if wstest is not installed for now, see https://github.com/aspnet/WebSockets/issues/95`
`26`	`26`	`// We will enable Wstest on every build once we've gotten the necessary infrastructure sorted out :).`
`27`		`- [ConditionalFact]`
	`27`	`+ [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/4350")]`
`28`	`28`	`[SkipIfWsTestNotPresent]`
`29`	`29`	`public async Task AutobahnTestSuite()`
`30`	`30`	`{`