From 54c11225823ce579dbd505a4e87904164b18ba71 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 14 Dec 2018 09:36:57 -0800 Subject: [PATCH] Change HTTP projects to target netcoreapp3.0 #3754 (#4625) --- ...icrosoft.AspNetCore.Authentication.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Authentication.Core.csproj | 4 ++-- .../Microsoft.AspNetCore.Authentication.Core.Test.csproj | 4 ++-- src/Http/Headers/src/CacheControlHeaderValue.cs | 2 +- src/Http/Headers/src/ContentRangeHeaderValue.cs | 2 +- src/Http/Headers/src/CookieHeaderValue.cs | 6 +++--- src/Http/Headers/src/MediaTypeHeaderValue.cs | 2 +- src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj | 4 ++-- src/Http/Headers/src/NameValueHeaderValue.cs | 4 ++-- src/Http/Headers/src/RangeHeaderValue.cs | 2 +- src/Http/Headers/src/SetCookieHeaderValue.cs | 8 ++++---- .../Headers/test/Microsoft.Net.Http.Headers.Tests.csproj | 4 ++-- .../src/Microsoft.AspNetCore.Http.Abstractions.csproj | 4 ++-- .../Microsoft.AspNetCore.Http.Abstractions.Tests.csproj | 4 ++-- .../src/Microsoft.AspNetCore.Http.Extensions.csproj | 4 ++-- .../Microsoft.AspNetCore.Http.Extensions.Tests.csproj | 4 ++-- .../perf/Microsoft.AspNetCore.Http.Performance.csproj | 4 ++-- src/Http/Http/src/Microsoft.AspNetCore.Http.csproj | 4 ++-- src/Http/Http/src/StreamPipeReader.cs | 2 +- src/Http/Http/src/StreamPipeWriter.cs | 4 ++-- src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj | 2 +- src/Http/Http/test/StreamPipeReaderTests.cs | 6 +++--- src/Http/Http/test/StreamPipeWriterTests.cs | 5 ++--- src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj | 4 ++-- src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj | 4 ++-- .../src/Microsoft.AspNetCore.WebUtilities.csproj | 4 ++-- .../test/Microsoft.AspNetCore.WebUtilities.Tests.csproj | 4 ++-- src/Http/samples/SampleApp/SampleApp.csproj | 4 ++-- 28 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj index bfb6e8e9ed..15bc1ffaf3 100644 --- a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj +++ b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj @@ -1,7 +1,7 @@  ASP.NET Core common types used by the various authentication components. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;authentication;security diff --git a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj index c10bfb3656..b0a3354125 100644 --- a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj +++ b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core common types used by the various authentication middleware components. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;authentication;security diff --git a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj index 4819703197..ca122fdb44 100644 --- a/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj +++ b/src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/Headers/src/CacheControlHeaderValue.cs b/src/Http/Headers/src/CacheControlHeaderValue.cs index 655d9447ce..cee7f8b8c1 100644 --- a/src/Http/Headers/src/CacheControlHeaderValue.cs +++ b/src/Http/Headers/src/CacheControlHeaderValue.cs @@ -652,7 +652,7 @@ namespace Microsoft.Net.Http.Headers sb.Append(", "); } - sb.Append(value); + sb.Append(value.AsSpan()); } } diff --git a/src/Http/Headers/src/ContentRangeHeaderValue.cs b/src/Http/Headers/src/ContentRangeHeaderValue.cs index 1149c33865..99723864f3 100644 --- a/src/Http/Headers/src/ContentRangeHeaderValue.cs +++ b/src/Http/Headers/src/ContentRangeHeaderValue.cs @@ -146,7 +146,7 @@ namespace Microsoft.Net.Http.Headers public override string ToString() { var sb = new StringBuilder(); - sb.Append(_unit); + sb.Append(_unit.AsSpan()); sb.Append(' '); if (HasRange) diff --git a/src/Http/Headers/src/CookieHeaderValue.cs b/src/Http/Headers/src/CookieHeaderValue.cs index 3061b7d2fa..54753d2830 100644 --- a/src/Http/Headers/src/CookieHeaderValue.cs +++ b/src/Http/Headers/src/CookieHeaderValue.cs @@ -73,9 +73,9 @@ namespace Microsoft.Net.Http.Headers { var header = new StringBuilder(); - header.Append(_name); + header.Append(_name.AsSpan()); header.Append("="); - header.Append(_value); + header.Append(_value.AsSpan()); return header.ToString(); } @@ -274,4 +274,4 @@ namespace Microsoft.Net.Http.Headers return _name.GetHashCode() ^ _value.GetHashCode(); } } -} \ No newline at end of file +} diff --git a/src/Http/Headers/src/MediaTypeHeaderValue.cs b/src/Http/Headers/src/MediaTypeHeaderValue.cs index e069210843..a7a39c904e 100644 --- a/src/Http/Headers/src/MediaTypeHeaderValue.cs +++ b/src/Http/Headers/src/MediaTypeHeaderValue.cs @@ -439,7 +439,7 @@ namespace Microsoft.Net.Http.Headers public override string ToString() { var builder = new StringBuilder(); - builder.Append(_mediaType); + builder.Append(_mediaType.AsSpan()); NameValueHeaderValue.ToString(_parameters, separator: ';', leadingSeparator: true, destination: builder); return builder.ToString(); } diff --git a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj index 80b0f49989..88fdff1694 100644 --- a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj +++ b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj @@ -1,8 +1,8 @@ - + HTTP header parser implementations. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true true diff --git a/src/Http/Headers/src/NameValueHeaderValue.cs b/src/Http/Headers/src/NameValueHeaderValue.cs index ba197e986c..58d337d55a 100644 --- a/src/Http/Headers/src/NameValueHeaderValue.cs +++ b/src/Http/Headers/src/NameValueHeaderValue.cs @@ -226,11 +226,11 @@ namespace Microsoft.Net.Http.Headers destination.Append(separator); destination.Append(' '); } - destination.Append(values[i].Name); + destination.Append(values[i].Name.AsSpan()); if (!StringSegment.IsNullOrEmpty(values[i].Value)) { destination.Append('='); - destination.Append(values[i].Value); + destination.Append(values[i].Value.AsSpan()); } } } diff --git a/src/Http/Headers/src/RangeHeaderValue.cs b/src/Http/Headers/src/RangeHeaderValue.cs index 934b6b6cc1..67d671267b 100644 --- a/src/Http/Headers/src/RangeHeaderValue.cs +++ b/src/Http/Headers/src/RangeHeaderValue.cs @@ -54,7 +54,7 @@ namespace Microsoft.Net.Http.Headers public override string ToString() { var sb = new StringBuilder(); - sb.Append(_unit); + sb.Append(_unit.AsSpan()); sb.Append('='); var first = true; diff --git a/src/Http/Headers/src/SetCookieHeaderValue.cs b/src/Http/Headers/src/SetCookieHeaderValue.cs index 3070a6e1f9..979844613e 100644 --- a/src/Http/Headers/src/SetCookieHeaderValue.cs +++ b/src/Http/Headers/src/SetCookieHeaderValue.cs @@ -206,9 +206,9 @@ namespace Microsoft.Net.Http.Headers /// public void AppendToStringBuilder(StringBuilder builder) { - builder.Append(_name); + builder.Append(_name.AsSpan()); builder.Append("="); - builder.Append(_value); + builder.Append(_value.AsSpan()); if (Expires.HasValue) { @@ -249,11 +249,11 @@ namespace Microsoft.Net.Http.Headers private static void AppendSegment(StringBuilder builder, StringSegment name, StringSegment value) { builder.Append("; "); - builder.Append(name); + builder.Append(name.AsSpan()); if (value != null) { builder.Append("="); - builder.Append(value); + builder.Append(value.AsSpan()); } } diff --git a/src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj b/src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj index eb53233e33..06b6fecb95 100644 --- a/src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj +++ b/src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj index b95ea9c28c..74b69e0bbb 100644 --- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ Microsoft.AspNetCore.Builder.IApplicationBuilder Microsoft.AspNetCore.Http.HttpContext Microsoft.AspNetCore.Http.HttpRequest Microsoft.AspNetCore.Http.HttpResponse - netstandard2.0 + netcoreapp3.0 true aspnetcore $(NoWarn);CS1591 diff --git a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj index a97c164925..4b3a83f1d9 100644 --- a/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj +++ b/src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj index 25ae2af17a..f59ccfca18 100644 --- a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj +++ b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore diff --git a/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj b/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj index fae14d9f7a..1ef7469dba 100644 --- a/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj +++ b/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj b/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj index 8f1fed848b..f9c19e3805 100644 --- a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj +++ b/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2 + netcoreapp3.0 Exe true true diff --git a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj index 1359ecf6e9..110f17509c 100644 --- a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj +++ b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core default HTTP feature implementations. - netstandard2.0;netcoreapp2.2 + netcoreapp3.0 $(NoWarn);CS1591 true true diff --git a/src/Http/Http/src/StreamPipeReader.cs b/src/Http/Http/src/StreamPipeReader.cs index 032ee6b728..241bfb4549 100644 --- a/src/Http/Http/src/StreamPipeReader.cs +++ b/src/Http/Http/src/StreamPipeReader.cs @@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Http try { AllocateReadTail(); -#if NETCOREAPP2_2 +#if NETCOREAPP3_0 var length = await _readingStream.ReadAsync(_readTail.AvailableMemory.Slice(_readTail.End), tokenSource.Token); #elif NETSTANDARD2_0 if (!MemoryMarshal.TryGetArray(_readTail.AvailableMemory.Slice(_readTail.End), out var arraySegment)) diff --git a/src/Http/Http/src/StreamPipeWriter.cs b/src/Http/Http/src/StreamPipeWriter.cs index 91162fb962..4a75db24f9 100644 --- a/src/Http/Http/src/StreamPipeWriter.cs +++ b/src/Http/Http/src/StreamPipeWriter.cs @@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.Http for (var i = 0; i < count; i++) { var segment = _completedSegments[0]; -#if NETCOREAPP2_2 +#if NETCOREAPP3_0 await _writingStream.WriteAsync(segment.Buffer.Slice(0, segment.Length), localToken); #elif NETSTANDARD2_0 MemoryMarshal.TryGetArray(segment.Buffer, out var arraySegment); @@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Http if (!_currentSegment.IsEmpty) { -#if NETCOREAPP2_2 +#if NETCOREAPP3_0 await _writingStream.WriteAsync(_currentSegment.Slice(0, _position), localToken); #elif NETSTANDARD2_0 MemoryMarshal.TryGetArray(_currentSegment, out var arraySegment); diff --git a/src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj b/src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj index e8afc2b0c5..888e8211e7 100644 --- a/src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj +++ b/src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj @@ -1,7 +1,7 @@ - net461 + netcoreapp3.0 true diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs index 4f4cbf5b23..8eb6fcdf91 100644 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ b/src/Http/Http/test/StreamPipeReaderTests.cs @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Http.Tests await Assert.ThrowsAsync(async () => await pipeReader.ReadAsync(cts.Token)); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")] public async Task ReadCanBeCanceledViaCancelPendingReadWhenReadIsAsync() { var pipeReader = new StreamPipeReader(new HangingStream()); @@ -169,9 +169,9 @@ namespace Microsoft.AspNetCore.Http.Tests var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var task = Task.Run(async () => { - var writingTask = pipeReader.ReadAsync(); + var readingTask = pipeReader.ReadAsync(); tcs.SetResult(0); - result = await writingTask; + result = await readingTask; }); await tcs.Task; pipeReader.CancelPendingRead(); diff --git a/src/Http/Http/test/StreamPipeWriterTests.cs b/src/Http/Http/test/StreamPipeWriterTests.cs index eb00303080..daa4298a11 100644 --- a/src/Http/Http/test/StreamPipeWriterTests.cs +++ b/src/Http/Http/test/StreamPipeWriterTests.cs @@ -141,7 +141,7 @@ namespace Microsoft.AspNetCore.Http.Tests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")] public async Task CancelPendingFlushBetweenWritesAllDataIsPreserved() { MemoryStream = new SingleWriteStream(); @@ -214,7 +214,7 @@ namespace Microsoft.AspNetCore.Http.Tests Assert.True(flushResult.IsCanceled); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")] public async Task CancelPendingFlushLostOfCancellationsNoDataLost() { var writeSize = 16; @@ -228,7 +228,6 @@ namespace Microsoft.AspNetCore.Http.Tests var expectedData = Encoding.ASCII.GetBytes(new string('a', writeSize)); var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - // TaskCreationOptions.RunAsync var task = Task.Run(async () => { diff --git a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj index cf9574d7f8..354454b384 100644 --- a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj +++ b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core component for running OWIN middleware in an ASP.NET Core application, and to run ASP.NET Core middleware in an OWIN application. - netstandard2.0 + netcoreapp3.0 $(NoWarn);CS1591 true aspnetcore;owin diff --git a/src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj b/src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj index 359aff75b9..b447a72968 100644 --- a/src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj +++ b/src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj index 3c7d2d8255..376d23b28d 100644 --- a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core utilities, such as for working with forms, multipart messages, and query strings. - netstandard2.0 + netcoreapp3.0 $(DefineConstants);WebEncoders_In_WebUtilities $(NoWarn);CS1591 true diff --git a/src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj b/src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj index 8a91421e65..c5a7649de2 100644 --- a/src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj +++ b/src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj @@ -1,7 +1,7 @@ - + - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/Http/samples/SampleApp/SampleApp.csproj b/src/Http/samples/SampleApp/SampleApp.csproj index 6bccd19d19..60e2ddd0c5 100644 --- a/src/Http/samples/SampleApp/SampleApp.csproj +++ b/src/Http/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2;net461 + netcoreapp3.0 Exe