Merge Kestrel.Https into Kestrel.Core. Fix sample.

Author: Tratcher

samples/SampleApp/SampleApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
   </PropertyGroup>

samples/SampleApp/testCert.pfx

@@ -465,4 +465,19 @@
   <data name="UnableToConfigureHttpsBindings" xml:space="preserve">
     <value>Unable to configure default https bindings because no IDefaultHttpsProvider service was provided.</value>
   </data>
+  <data name="AuthenticationFailed" xml:space="preserve">
+    <value>Failed to authenticate HTTPS connection.</value>
+  </data>
+  <data name="AuthenticationTimedOut" xml:space="preserve">
+    <value>Authentication of the HTTPS connection timed out.</value>
+  </data>
+  <data name="InvalidServerCertificateEku" xml:space="preserve">
+    <value>Certificate {thumbprint} cannot be used as an SSL server certificate. It has an Extended Key Usage extension but the usages do not include Server Authentication (OID 1.3.6.1.5.5.7.3.1).</value>
+  </data>
+  <data name="PositiveTimeSpanRequired1" xml:space="preserve">
+    <value>Value must be a positive TimeSpan.</value>
+  </data>
+  <data name="ServiceCertificateRequired" xml:space="preserve">
+    <value>The server certificate parameter is required.</value>
+  </data>
 </root>

src/Kestrel.Https/ClientCertificateMode.cs renamed to src/Kestrel.Core/ClientCertificateMode.cs

@@ -73,7 +73,7 @@ public TimeSpan HandshakeTimeout
             {
                 if (value <= TimeSpan.Zero && value != Timeout.InfiniteTimeSpan)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(value), HttpsStrings.PositiveTimeSpanRequired);
+                    throw new ArgumentOutOfRangeException(nameof(value), CoreStrings.PositiveTimeSpanRequired);
                 }
                 _handshakeTimeout = value != Timeout.InfiniteTimeSpan ? value : TimeSpan.MaxValue;
             }

src/Kestrel.Core/CoreStrings.resx

@@ -43,7 +43,7 @@ public HttpsConnectionAdapter(HttpsConnectionAdapterOptions options, ILoggerFact
 
             if (options.ServerCertificate == null)
             {
-                throw new ArgumentException(HttpsStrings.ServiceCertificateRequired, nameof(options));
+                throw new ArgumentException(CoreStrings.ServiceCertificateRequired, nameof(options));
             }
 
             // capture the certificate now so it can be switched after validation
@@ -148,13 +148,13 @@ await sslStream.AuthenticateAsServerAsync(_serverCertificate, certificateRequire
             }
             catch (OperationCanceledException)
             {
-                _logger?.LogInformation(2, HttpsStrings.AuthenticationTimedOut);
+                _logger?.LogInformation(2, CoreStrings.AuthenticationTimedOut);
                 sslStream.Dispose();
                 return _closedAdaptedConnection;
             }
             catch (IOException ex)
             {
-                _logger?.LogInformation(1, ex, HttpsStrings.AuthenticationFailed);
+                _logger?.LogInformation(1, ex, CoreStrings.AuthenticationFailed);
                 sslStream.Dispose();
                 return _closedAdaptedConnection;
             }
@@ -218,7 +218,7 @@ private static void EnsureCertificateIsAllowedForServerAuth(X509Certificate2 cer
 
             if (hasEkuExtension)
             {
-                throw new InvalidOperationException(HttpsStrings.FormatInvalidServerCertificateEku(certificate.Thumbprint));
+                throw new InvalidOperationException(CoreStrings.FormatInvalidServerCertificateEku(certificate.Thumbprint));
             }
         }
 

src/Kestrel.Https/HttpsConnectionAdapterOptions.cs renamed to src/Kestrel.Core/HttpsConnectionAdapterOptions.cs

@@ -18,10 +18,4 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="HttpsStrings.resx">
-      <Generator></Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

src/Kestrel.Https/Internal/ClosedStream.cs renamed to src/Kestrel.Core/Internal/ClosedStream.cs

@@ -2,7 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
 
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-
+[assembly: TypeForwardedTo(typeof(ClientCertificateMode))]
+[assembly: TypeForwardedTo(typeof(HttpsConnectionAdapter))]
+[assembly: TypeForwardedTo(typeof(HttpsConnectionAdapterOptions))]
+[assembly: TypeForwardedTo(typeof(ListenOptionsHttpsExtensions))]