diff --git a/build/dependencies.props b/build/dependencies.props index df41032480..8666e2bfc5 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -11,7 +11,6 @@ 2.0.9 2.1.3 2.2.0-preview3-27014-02 - 1.0.0-alpha-004 3.0.0-alpha1-10653 15.6.1 4.6.0-preview1-26907-04 diff --git a/build/sources.props b/build/sources.props index 2fcf9273e5..9215df9751 100644 --- a/build/sources.props +++ b/build/sources.props @@ -8,7 +8,6 @@ https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; $(RestoreSources); diff --git a/test/Directory.Build.props b/test/Directory.Build.props index f66637ad9f..ffd3106b17 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,7 +5,6 @@ netcoreapp2.2 $(DeveloperBuildTestTfms) $(StandardTestTfms) - $(StandardTestTfms);net472 @@ -16,8 +15,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs index 1b3bbd7a33..ed3bfde554 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs @@ -159,19 +159,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET472 - // HttpClient retries the request because it didn't get a response. - context = await server.AcceptAsync(Utilities.DefaultTimeout).Before(responseTask); - cts = new CancellationTokenSource(); - cts.Cancel(); - // First write sends headers - writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); - Assert.True(writeTask.IsCanceled); - context.Dispose(); -#elif NETCOREAPP2_2 -#else -#error Target framework needs to be updated -#endif + await Assert.ThrowsAsync(() => responseTask); } } @@ -191,19 +179,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET472 - // HttpClient retries the request because it didn't get a response. - context = await server.AcceptAsync(Utilities.DefaultTimeout).Before(responseTask); - cts = new CancellationTokenSource(); - cts.Cancel(); - // First write sends headers - writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); - Assert.True(writeTask.IsCanceled); - context.Dispose(); -#elif NETCOREAPP2_2 -#else -#error Target framework needs to be updated -#endif + await Assert.ThrowsAsync(() => responseTask); } } diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseHeaderTests.cs index 270e5aeaa7..2fe93b2cdf 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseHeaderTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseHeaderTests.cs @@ -81,13 +81,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_2 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]); -#elif NET472 - Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate")); -#else -#error Target framework needs to be updated -#endif } } @@ -111,13 +105,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(0, response.ContentLength); Assert.NotNull(response.Headers["Date"]); Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]); -#if NETCOREAPP2_2 // WebHeaderCollection.GetValues() not available in CoreCLR. Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]); -#elif NET472 - Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1")); -#else -#error Target framework needs to be updated -#endif } }