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

Change HTTP projects to target netcoreapp3.0 #3754 (#4625)

This commit is contained in:
Chris Ross 2018-12-14 09:36:57 -08:00 committed by GitHub
parent 343208331d
commit 54c1122582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core common types used by the various authentication components.</Description> <Description>ASP.NET Core common types used by the various authentication components.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags> <PackageTags>aspnetcore;authentication;security</PackageTags>

4
src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core common types used by the various authentication middleware components.</Description> <Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;authentication;security</PackageTags> <PackageTags>aspnetcore;authentication;security</PackageTags>

4
src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
src/Http/Headers/src/CacheControlHeaderValue.cs
View File

@ -652,7 +652,7 @@ namespace Microsoft.Net.Http.Headers
sb.Append(", "); sb.Append(", ");
} }
sb.Append(value); sb.Append(value.AsSpan());
} }
} }

2
src/Http/Headers/src/ContentRangeHeaderValue.cs
View File

@ -146,7 +146,7 @@ namespace Microsoft.Net.Http.Headers
public override string ToString() public override string ToString()
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.Append(_unit); sb.Append(_unit.AsSpan());
sb.Append(' '); sb.Append(' ');
if (HasRange) if (HasRange)

4
src/Http/Headers/src/CookieHeaderValue.cs
View File

@ -73,9 +73,9 @@ namespace Microsoft.Net.Http.Headers
{ {
var header = new StringBuilder(); var header = new StringBuilder();
header.Append(_name); header.Append(_name.AsSpan());
header.Append("="); header.Append("=");
header.Append(_value); header.Append(_value.AsSpan());
return header.ToString(); return header.ToString();
} }

2
src/Http/Headers/src/MediaTypeHeaderValue.cs
View File

@ -439,7 +439,7 @@ namespace Microsoft.Net.Http.Headers
public override string ToString() public override string ToString()
{ {
var builder = new StringBuilder(); var builder = new StringBuilder();
builder.Append(_mediaType); builder.Append(_mediaType.AsSpan());
NameValueHeaderValue.ToString(_parameters, separator: ';', leadingSeparator: true, destination: builder); NameValueHeaderValue.ToString(_parameters, separator: ';', leadingSeparator: true, destination: builder);
return builder.ToString(); return builder.ToString();
} }

4
src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>HTTP header parser implementations.</Description> <Description>HTTP header parser implementations.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

4
src/Http/Headers/src/NameValueHeaderValue.cs
View File

@ -226,11 +226,11 @@ namespace Microsoft.Net.Http.Headers
destination.Append(separator); destination.Append(separator);
destination.Append(' '); destination.Append(' ');
} }
destination.Append(values[i].Name); destination.Append(values[i].Name.AsSpan());
if (!StringSegment.IsNullOrEmpty(values[i].Value)) if (!StringSegment.IsNullOrEmpty(values[i].Value))
{ {
destination.Append('='); destination.Append('=');
destination.Append(values[i].Value); destination.Append(values[i].Value.AsSpan());
} }
} }
} }

2
src/Http/Headers/src/RangeHeaderValue.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.Net.Http.Headers
public override string ToString() public override string ToString()
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.Append(_unit); sb.Append(_unit.AsSpan());
sb.Append('='); sb.Append('=');
var first = true; var first = true;

8
src/Http/Headers/src/SetCookieHeaderValue.cs
View File

@ -206,9 +206,9 @@ namespace Microsoft.Net.Http.Headers
/// </param> /// </param>
public void AppendToStringBuilder(StringBuilder builder) public void AppendToStringBuilder(StringBuilder builder)
{ {
builder.Append(_name); builder.Append(_name.AsSpan());
builder.Append("="); builder.Append("=");
builder.Append(_value); builder.Append(_value.AsSpan());
if (Expires.HasValue) if (Expires.HasValue)
{ {
@ -249,11 +249,11 @@ namespace Microsoft.Net.Http.Headers
private static void AppendSegment(StringBuilder builder, StringSegment name, StringSegment value) private static void AppendSegment(StringBuilder builder, StringSegment name, StringSegment value)
{ {
builder.Append("; "); builder.Append("; ");
builder.Append(name); builder.Append(name.AsSpan());
if (value != null) if (value != null)
{ {
builder.Append("="); builder.Append("=");
builder.Append(value); builder.Append(value.AsSpan());
} }
} }

4
src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
@ -8,7 +8,7 @@ Microsoft.AspNetCore.Builder.IApplicationBuilder
Microsoft.AspNetCore.Http.HttpContext Microsoft.AspNetCore.Http.HttpContext
Microsoft.AspNetCore.Http.HttpRequest Microsoft.AspNetCore.Http.HttpRequest
Microsoft.AspNetCore.Http.HttpResponse</Description> Microsoft.AspNetCore.Http.HttpResponse</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags> <PackageTags>aspnetcore</PackageTags>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>

4
src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state.</Description> <Description>ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore</PackageTags> <PackageTags>aspnetcore</PackageTags>

4
src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<ServerGarbageCollection>true</ServerGarbageCollection> <ServerGarbageCollection>true</ServerGarbageCollection>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

4
src/Http/Http/src/Microsoft.AspNetCore.Http.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core default HTTP feature implementations.</Description> <Description>ASP.NET Core default HTTP feature implementations.</Description>
<TargetFrameworks>netstandard2.0;netcoreapp2.2</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

2
src/Http/Http/src/StreamPipeReader.cs
View File

@ -227,7 +227,7 @@ namespace Microsoft.AspNetCore.Http
try try
{ {
AllocateReadTail(); AllocateReadTail();
#if NETCOREAPP2_2 #if NETCOREAPP3_0
var length = await _readingStream.ReadAsync(_readTail.AvailableMemory.Slice(_readTail.End), tokenSource.Token); var length = await _readingStream.ReadAsync(_readTail.AvailableMemory.Slice(_readTail.End), tokenSource.Token);
#elif NETSTANDARD2_0 #elif NETSTANDARD2_0
if (!MemoryMarshal.TryGetArray<byte>(_readTail.AvailableMemory.Slice(_readTail.End), out var arraySegment)) if (!MemoryMarshal.TryGetArray<byte>(_readTail.AvailableMemory.Slice(_readTail.End), out var arraySegment))

4
src/Http/Http/src/StreamPipeWriter.cs
View File

@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.Http
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
var segment = _completedSegments[0]; var segment = _completedSegments[0];
#if NETCOREAPP2_2 #if NETCOREAPP3_0
await _writingStream.WriteAsync(segment.Buffer.Slice(0, segment.Length), localToken); await _writingStream.WriteAsync(segment.Buffer.Slice(0, segment.Length), localToken);
#elif NETSTANDARD2_0 #elif NETSTANDARD2_0
MemoryMarshal.TryGetArray<byte>(segment.Buffer, out var arraySegment); MemoryMarshal.TryGetArray<byte>(segment.Buffer, out var arraySegment);
@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Http
if (!_currentSegment.IsEmpty) if (!_currentSegment.IsEmpty)
{ {
#if NETCOREAPP2_2 #if NETCOREAPP3_0
await _writingStream.WriteAsync(_currentSegment.Slice(0, _position), localToken); await _writingStream.WriteAsync(_currentSegment.Slice(0, _position), localToken);
#elif NETSTANDARD2_0 #elif NETSTANDARD2_0
MemoryMarshal.TryGetArray<byte>(_currentSegment, out var arraySegment); MemoryMarshal.TryGetArray<byte>(_currentSegment, out var arraySegment);

2
src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>

6
src/Http/Http/test/StreamPipeReaderTests.cs
View File

@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Http.Tests
await Assert.ThrowsAsync<TaskCanceledException>(async () => await pipeReader.ReadAsync(cts.Token)); await Assert.ThrowsAsync<TaskCanceledException>(async () => await pipeReader.ReadAsync(cts.Token));
} }
[Fact] [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")]
public async Task ReadCanBeCanceledViaCancelPendingReadWhenReadIsAsync() public async Task ReadCanBeCanceledViaCancelPendingReadWhenReadIsAsync()
{ {
var pipeReader = new StreamPipeReader(new HangingStream()); var pipeReader = new StreamPipeReader(new HangingStream());
@ -169,9 +169,9 @@ namespace Microsoft.AspNetCore.Http.Tests
var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously); var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
var task = Task.Run(async () => var task = Task.Run(async () =>
{ {
var writingTask = pipeReader.ReadAsync(); var readingTask = pipeReader.ReadAsync();
tcs.SetResult(0); tcs.SetResult(0);
result = await writingTask; result = await readingTask;
}); });
await tcs.Task; await tcs.Task;
pipeReader.CancelPendingRead(); pipeReader.CancelPendingRead();

5
src/Http/Http/test/StreamPipeWriterTests.cs
View File

@ -141,7 +141,7 @@ namespace Microsoft.AspNetCore.Http.Tests
} }
} }
[Fact] [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")]
public async Task CancelPendingFlushBetweenWritesAllDataIsPreserved() public async Task CancelPendingFlushBetweenWritesAllDataIsPreserved()
{ {
MemoryStream = new SingleWriteStream(); MemoryStream = new SingleWriteStream();
@ -214,7 +214,7 @@ namespace Microsoft.AspNetCore.Http.Tests
Assert.True(flushResult.IsCanceled); Assert.True(flushResult.IsCanceled);
} }
[Fact] [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")]
public async Task CancelPendingFlushLostOfCancellationsNoDataLost() public async Task CancelPendingFlushLostOfCancellationsNoDataLost()
{ {
var writeSize = 16; var writeSize = 16;
@ -228,7 +228,6 @@ namespace Microsoft.AspNetCore.Http.Tests
var expectedData = Encoding.ASCII.GetBytes(new string('a', writeSize)); var expectedData = Encoding.ASCII.GetBytes(new string('a', writeSize));
var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously); var tcs = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
// TaskCreationOptions.RunAsync
var task = Task.Run(async () => var task = Task.Run(async () =>
{ {

4
src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>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.</Description> <Description>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.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;owin</PackageTags> <PackageTags>aspnetcore;owin</PackageTags>

4
src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core utilities, such as for working with forms, multipart messages, and query strings.</Description> <Description>ASP.NET Core utilities, such as for working with forms, multipart messages, and query strings.</Description>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<DefineConstants>$(DefineConstants);WebEncoders_In_WebUtilities</DefineConstants> <DefineConstants>$(DefineConstants);WebEncoders_In_WebUtilities</DefineConstants>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

4
src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Http/samples/SampleApp/SampleApp.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks> <TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
</PropertyGroup> </PropertyGroup>