From 922b1ea8a3d8f04ed63cec954695a4ed46c1950b Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Wed, 16 May 2018 14:59:58 -0700 Subject: [PATCH] Remove obsolete #if's --- .../AuthenticationTests.cs | 10 ++++------ .../Listener/AuthenticationTests.cs | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/AuthenticationTests.cs index 06bc6f2c32..f533303309 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/AuthenticationTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/AuthenticationTests.cs @@ -40,8 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Empty(response.Headers.WwwAuthenticate); } } -#if !NETCOREAPP2_0 - // https://github.com/aspnet/ServerTests/issues/82 + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -107,7 +106,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); } } -#endif + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -238,8 +237,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(HttpStatusCode.OK, response.StatusCode); } } -#if !NETCOREAPP2_0 - // https://github.com/aspnet/ServerTests/issues/82 + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -329,7 +327,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(authTypeList.Count(), response.Headers.WwwAuthenticate.Count); } } -#endif + [ConditionalFact] public async Task AuthTypes_Forbid_Forbidden() { diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/AuthenticationTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/AuthenticationTests.cs index db32323bdf..404bcdd7c8 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/AuthenticationTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/AuthenticationTests.cs @@ -40,8 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Empty(response.Headers.WwwAuthenticate); } } -#if !NETCOREAPP2_0 - // https://github.com/aspnet/ServerTests/issues/82 + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)] @@ -111,7 +110,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); } } -#endif + [ConditionalTheory] [InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.NTLM)]