Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ internal static partial class AuthenticationHelper
private static Task<HttpResponseMessage> InnerSendAsync(HttpRequestMessage request, Uri authUri, bool async, ICredentials credentials, bool isProxyAuth, HttpConnection connection, HttpConnectionPool connectionPool, CancellationToken cancellationToken)
{
return isProxyAuth ?
SendWithProxyAuthAsync(request, authUri, async, credentials, true, connectionPool, cancellationToken).AsTask() :
SendWithRequestAuthAsync(request, async, credentials, true, connectionPool, cancellationToken).AsTask();
SendWithProxyAuthAsync(request, authUri, async, credentials, false, connectionPool, cancellationToken).AsTask() :
SendWithRequestAuthAsync(request, async, credentials, false, connectionPool, cancellationToken).AsTask();
}

public static Task<HttpResponseMessage> SendWithNtProxyAuthAsync(HttpRequestMessage request, Uri proxyUri, bool async, ICredentials proxyCredentials, HttpConnection connection, HttpConnectionPool connectionPool, CancellationToken cancellationToken)
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
[InlineData(true)]
[InlineData(false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37087", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/56798", TestPlatforms.tvOS)]
public async Task GetResponseAsync_UseDefaultCredentials_ExpectSuccess(bool useSsl)
{
var options = new LoopbackServer.Options { UseSsl = useSsl };
Expand Down Expand Up @@ -1499,6 +1500,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
[InlineData(true)]
[InlineData(false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37087", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/56798", TestPlatforms.tvOS)]
public async Task HaveResponse_GetResponseAsync_ExpectTrue(bool useSsl)
{
var options = new LoopbackServer.Options { UseSsl = useSsl };
Expand Down Expand Up @@ -1991,8 +1993,7 @@ private static async Task VerifyResponse(string expectedResponse, Task<WebRespon
}
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37087", TestPlatforms.Android)]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public void HttpWebRequest_Serialize_Fails()
{
using (MemoryStream fs = new MemoryStream())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
});
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37087", TestPlatforms.Android)]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public async Task HttpWebResponse_Serialize_ExpectedResult()
{
await LoopbackServer.CreateServerAsync(async (server, url) =>
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/tests.proj
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj" />

<!-- Crashes or hangs, did not produce testResults.xml -->
<!-- https://github.com/dotnet/runtime/issues/52117 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Requests/tests/System.Net.Requests.Tests.csproj" />
<!-- https://github.com/dotnet/runtime/issues/52120 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj" />

Expand Down