Merge pull request #19726 from dotnet/prkrishn/merge-5.0-preview2

pranavkm · web-flow · commit 7e0e50f052bf · 2020-03-10T07:37:11.000-07:00
Merge 5.0-preview2
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
@@ -16,7 +16,7 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepoRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.UI" ProjectPath="$(RepoRoot)src\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" ProjectPath="$(RepoRoot)src\Servers\Kestrel\Transport.Libuv\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj"  />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" ProjectPath="$(RepoRoot)src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" ProjectPath="$(RepoRoot)src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Certificate" ProjectPath="$(RepoRoot)src\Security\Authentication\Certificate\src\Microsoft.AspNetCore.Authentication.Certificate.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Facebook" ProjectPath="$(RepoRoot)src\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Google" ProjectPath="$(RepoRoot)src\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj"  />
diff --git a/src/Servers/Kestrel/Kestrel.sln b/src/Servers/Kestrel/Kestrel.sln
@@ -86,7 +86,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http2cat", "samples\http2ca
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicSampleApp", "samples\QuicSampleApp\QuicSampleApp.csproj", "{53A8634C-DFC5-4A5B-8864-9EF1707E3F18}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic", "Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj", "{62CFF861-807E-43F6-9403-22AA7F06C9A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic", "Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj", "{62CFF861-807E-43F6-9403-22AA7F06C9A6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicSampleClient", "samples\QuicSampleClient\QuicSampleClient.csproj", "{F39A942B-85A8-4C1B-A5BC-435555E79F20}"
 EndProject
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/FakeTlsConnectionFeature.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal class FakeTlsConnectionFeature : ITlsConnectionFeature
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/IQuicTrace.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal interface IQuicTrace : ILogger
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs
@@ -10,7 +10,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal class QuicConnectionContext : TransportMultiplexedConnection, IProtocolErrorCodeFeature
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs
@@ -12,7 +12,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     /// <summary>
     /// Listens for new Quic Connections.
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs
@@ -12,7 +12,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal class QuicStreamContext : TransportConnection, IStreamDirectionFeature, IProtocolErrorCodeFeature, IStreamIdFeature
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTrace.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal class QuicTrace : IQuicTrace
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicTransportContext.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Hosting;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal
 {
     internal class QuicTransportContext
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj b/src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj
@@ -7,7 +7,7 @@
     <PackageTags>aspnetcore;kestrel</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1591;CS0436;$(NoWarn)</NoWarn><!-- Conflicts between internal and public Quic APIs -->
-    <IsShippingPackage>false</IsShippingPackage>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicConnectionFactory.cs
@@ -10,11 +10,11 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic
 {
     public class QuicConnectionFactory : IMultiplexedConnectionFactory
     {
@@ -27,7 +27,7 @@ public QuicConnectionFactory(IOptions<QuicTransportOptions> options, ILoggerFact
                 throw new ArgumentNullException(nameof(options));
             }
 
-            var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Client");
+            var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Client");
             var trace = new QuicTrace(logger);
 
             _transportContext = new QuicTransportContext(trace, options.Value);
diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportFactory.cs
@@ -7,11 +7,11 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic
 {
     public class QuicTransportFactory : IMultiplexedConnectionListenerFactory
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs
@@ -5,7 +5,7 @@
 using System.Buffers;
 using System.Security.Cryptography.X509Certificates;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic
 {
     public class QuicTransportOptions
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderMsQuicExtensions.cs b/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderMsQuicExtensions.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Connections;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Hosting
diff --git a/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj b/src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj
@@ -9,7 +9,7 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Microsoft.Extensions.Hosting" />
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="msquic.dll" Condition="Exists('msquic.dll')">
diff --git a/src/Servers/Kestrel/samples/QuicSampleApp/QuicSampleApp.csproj b/src/Servers/Kestrel/samples/QuicSampleApp/QuicSampleApp.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
diff --git a/src/Servers/Kestrel/samples/QuicSampleClient/Program.cs b/src/Servers/Kestrel/samples/QuicSampleClient/Program.cs
@@ -3,7 +3,7 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.Logging;
diff --git a/src/Servers/Kestrel/samples/QuicSampleClient/QuicSampleClient.csproj b/src/Servers/Kestrel/samples/QuicSampleClient/QuicSampleClient.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Quic" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using Microsoft.AspNetCore.Http.Features;`
`9`	`9`
`10`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
	`10`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal`
`11`	`11`	`{`
`12`	`12`	`internal class FakeTlsConnectionFeature : ITlsConnectionFeature`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using Microsoft.Extensions.Logging;`
`6`	`6`
`7`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
	`7`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal`
`8`	`8`	`{`
`9`	`9`	`internal interface IQuicTrace : ILogger`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using Microsoft.AspNetCore.Http.Features;`
`11`	`11`	`using Microsoft.Extensions.Logging;`
`12`	`12`
`13`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
	`13`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal`
`14`	`14`	`{`
`15`	`15`	`internal class QuicConnectionContext : TransportMultiplexedConnection, IProtocolErrorCodeFeature`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using Microsoft.AspNetCore.Http.Features;`
`13`	`13`	`using Microsoft.Extensions.Logging;`
`14`	`14`
`15`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
	`15`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal`
`16`	`16`	`{`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Listens for new Quic Connections.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using Microsoft.Extensions.Hosting;`
`5`	`5`
`6`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
	`6`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal`
`7`	`7`	`{`
`8`	`8`	`internal class QuicTransportContext`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using Microsoft.AspNetCore.Connections;`
`12`	`12`	`using Microsoft.AspNetCore.Http.Features;`
`13`		`-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal;`
	`13`	`+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal;`
`14`	`14`	`using Microsoft.Extensions.Logging;`
`15`	`15`	`using Microsoft.Extensions.Options;`
`16`	`16`
`17`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic`
	`17`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic`
`18`	`18`	`{`
`19`	`19`	`public class QuicConnectionFactory : IMultiplexedConnectionFactory`
`20`	`20`	`{`
`@@ -27,7 +27,7 @@ public QuicConnectionFactory(IOptions<QuicTransportOptions> options, ILoggerFact`
`27`	`27`	`throw new ArgumentNullException(nameof(options));`
`28`	`28`	`}`
`29`	`29`
`30`		`- var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Client");`
	`30`	`+ var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Client");`
`31`	`31`	`var trace = new QuicTrace(logger);`
`32`	`32`
`33`	`33`	`_transportContext = new QuicTransportContext(trace, options.Value);`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using Microsoft.AspNetCore.Connections;`
`9`	`9`	`using Microsoft.AspNetCore.Http.Features;`
`10`		`-using Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal;`
	`10`	`+using Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.Internal;`
`11`	`11`	`using Microsoft.Extensions.Logging;`
`12`	`12`	`using Microsoft.Extensions.Options;`
`13`	`13`
`14`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic`
	`14`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic`
`15`	`15`	`{`
`16`	`16`	`public class QuicTransportFactory : IMultiplexedConnectionListenerFactory`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Buffers;`
`6`	`6`	`using System.Security.Cryptography.X509Certificates;`
`7`	`7`
`8`		`-namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic`
	`8`	`+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic`
`9`	`9`	`{`
`10`	`10`	`public class QuicTransportOptions`
`11`	`11`	`{`