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

Remove obsolete #if's

This commit is contained in:
Chris Ross (ASP.NET) 2018-05-16 14:59:58 -07:00
parent b9114ae40a
commit 922b1ea8a3
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/AuthenticationTests.cs
View File

@ -40,8 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
Assert.Empty(response.Headers.WwwAuthenticate); Assert.Empty(response.Headers.WwwAuthenticate);
} }
} }
#if !NETCOREAPP2_0
// https://github.com/aspnet/ServerTests/issues/82
[ConditionalTheory] [ConditionalTheory]
[InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.Negotiate)]
[InlineData(AuthenticationSchemes.NTLM)] [InlineData(AuthenticationSchemes.NTLM)]
@ -107,7 +106,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase);
} }
} }
#endif
[ConditionalTheory] [ConditionalTheory]
[InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.Negotiate)]
[InlineData(AuthenticationSchemes.NTLM)] [InlineData(AuthenticationSchemes.NTLM)]
@ -238,8 +237,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(HttpStatusCode.OK, response.StatusCode);
} }
} }
#if !NETCOREAPP2_0
// https://github.com/aspnet/ServerTests/issues/82
[ConditionalTheory] [ConditionalTheory]
[InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.Negotiate)]
[InlineData(AuthenticationSchemes.NTLM)] [InlineData(AuthenticationSchemes.NTLM)]
@ -329,7 +327,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
Assert.Equal(authTypeList.Count(), response.Headers.WwwAuthenticate.Count); Assert.Equal(authTypeList.Count(), response.Headers.WwwAuthenticate.Count);
} }
} }
#endif
[ConditionalFact] [ConditionalFact]
public async Task AuthTypes_Forbid_Forbidden() public async Task AuthTypes_Forbid_Forbidden()
{ {

5
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/AuthenticationTests.cs
View File

@ -40,8 +40,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
Assert.Empty(response.Headers.WwwAuthenticate); Assert.Empty(response.Headers.WwwAuthenticate);
} }
} }
#if !NETCOREAPP2_0
// https://github.com/aspnet/ServerTests/issues/82
[ConditionalTheory] [ConditionalTheory]
[InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.Negotiate)]
[InlineData(AuthenticationSchemes.NTLM)] [InlineData(AuthenticationSchemes.NTLM)]
@ -111,7 +110,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase); Assert.Equal("Negotiate, NTLM, basic", response.Headers.WwwAuthenticate.ToString(), StringComparer.OrdinalIgnoreCase);
} }
} }
#endif
[ConditionalTheory] [ConditionalTheory]
[InlineData(AuthenticationSchemes.Negotiate)] [InlineData(AuthenticationSchemes.Negotiate)]
[InlineData(AuthenticationSchemes.NTLM)] [InlineData(AuthenticationSchemes.NTLM)]