Merge branch 'rel/2.0.0-preview2' into dev

build/common.props

@@ -55,7 +55,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <MetaPackagePackageReference Include="Microsoft.AspNetCore.Certificates.Configuration" />
     <MetaPackagePackageReference Include="Microsoft.AspNetCore.Diagnostics" />
     <MetaPackagePackageReference Include="Microsoft.AspNetCore.Hosting" />
     <MetaPackagePackageReference Include="Microsoft.AspNetCore.Routing" />

src/Microsoft.AspNetCore/KestrelServerOptionsSetup.cs

@@ -1,110 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Certificates.Configuration;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace Microsoft.AspNetCore
-{
-    internal class KestrelServerOptionsSetup : IConfigureOptions<KestrelServerOptions>
-    {
-        private const string DefaultCertificateSubjectName = "CN=localhost";
-        private const string DevelopmentSSLCertificateName = "localhost";
-
-        private readonly IHostingEnvironment _hostingEnvironment;
-        private readonly IConfiguration _configurationRoot;
-        private readonly ILoggerFactory _loggerFactory;
-
-        public KestrelServerOptionsSetup(
-            IHostingEnvironment hostingEnvironment,
-            IConfiguration configurationRoot,
-            ILoggerFactory loggerFactory)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _configurationRoot = configurationRoot;
-            _loggerFactory = loggerFactory;
-        }
-
-        public void Configure(KestrelServerOptions options)
-        {
-            BindConfiguration(options);
-        }
-
-        private void BindConfiguration(KestrelServerOptions options)
-        {
-            var certificateLoader = new CertificateLoader(_configurationRoot.GetSection("Certificates"), _loggerFactory, _hostingEnvironment.EnvironmentName);
-
-            foreach (var endPoint in _configurationRoot.GetSection("Kestrel:EndPoints").GetChildren())
-            {
-                BindEndPoint(options, endPoint, certificateLoader);
-            }
-        }
-
-        private void BindEndPoint(
-            KestrelServerOptions options,
-            IConfigurationSection endPoint,
-            CertificateLoader certificateLoader)
-        {
-            var configAddress = endPoint.GetValue<string>("Address");
-            var configPort = endPoint.GetValue<string>("Port");
-
-            if (!IPAddress.TryParse(configAddress, out var address))
-            {
-                throw new InvalidOperationException($"Invalid IP address in configuration: {configAddress}");
-            }
-
-            if (!int.TryParse(configPort, out var port))
-            {
-                throw new InvalidOperationException($"Invalid port in configuration: {configPort}");
-            }
-
-            options.Listen(address, port, listenOptions =>
-            {
-                var certificateConfig = endPoint.GetSection("Certificate");
-                X509Certificate2 certificate = null;
-                if (certificateConfig.Exists())
-                {
-                    try
-                    {
-                        try
-                        {
-                            certificate = certificateLoader.Load(certificateConfig).FirstOrDefault();
-                        }
-                        catch (KeyNotFoundException) when (certificateConfig.Value.Equals(DevelopmentSSLCertificateName, StringComparison.Ordinal) && _hostingEnvironment.IsDevelopment())
-                        {
-                            var storeLoader = new CertificateStoreLoader();
-                            certificate = storeLoader.Load(DefaultCertificateSubjectName, "My", StoreLocation.CurrentUser, validOnly: false) ??
-                                storeLoader.Load(DefaultCertificateSubjectName, "My", StoreLocation.LocalMachine, validOnly: false);
-
-                            if (certificate == null)
-                            {
-                                var logger = _loggerFactory.CreateLogger("Microsoft.AspNetCore.KestrelOptionsSetup");
-                                logger.LogError("No HTTPS certificate was found for development. For information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.");
-                            }
-                        }
-
-                        if (certificate == null)
-                        {
-                            throw new InvalidOperationException($"No certificate found for endpoint '{endPoint.Key}'.");
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new InvalidOperationException("Unable to configure HTTPS endpoint. For information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.", ex);
-                    }
-
-                    listenOptions.UseHttps(certificate);
-                }
-            });
-        }
-    }
-}

src/Microsoft.AspNetCore/WebHost.cs

@@ -191,7 +191,6 @@ namespace Microsoft.AspNetCore
                 })
                 .ConfigureServices(services =>
                 {
-                    services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
                     services.ConfigureAspNetCoreDefaults();
                 });
 

test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs

@@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Tests
             {
                 File.WriteAllText("appsettings.json", @"
 {
-    ""Kestrel"": {
+    ""Microsoft:AspNetCore:Server:Kestrel"": {
         ""EndPoints"": {
             ""EndPoint"": {
                 ""Address"": """ + endPointAddress + @""",
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Tests
             {
                 File.WriteAllText("appsettings.json", @"
 {
-    ""Kestrel"": {
+    ""Microsoft:AspNetCore:Server:Kestrel"": {
         ""EndPoints"": {
             ""EndPoint"": {
                 ""Address"": ""127.0.0.1"",
@@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.Tests
             {
                 File.WriteAllText("appsettings.json", @"
 {
-    ""Kestrel"": {
+    ""Microsoft:AspNetCore:Server:Kestrel"": {
         ""EndPoints"": {
             ""EndPoint"": {
                 ""Address"": ""127.0.0.1"",