diff --git a/MetaPackages.sln b/MetaPackages.sln
index bac992e..9d03645 100644
--- a/MetaPackages.sln
+++ b/MetaPackages.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26524.0
+VisualStudioVersion = 15.0.26507.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}"
EndProject
@@ -47,8 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimDeps", "tools\TrimDeps\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjectionApp", "test\TestSites\DependencyInjectionApp\DependencyInjectionApp.csproj", "{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Tests", "test\Microsoft.AspNetCore.Tests\Microsoft.AspNetCore.Tests.csproj", "{914D3FAD-8B94-4353-B24F-B264F675481C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -103,10 +101,6 @@ Global
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.Build.0 = Release|Any CPU
- {914D3FAD-8B94-4353-B24F-B264F675481C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {914D3FAD-8B94-4353-B24F-B264F675481C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {914D3FAD-8B94-4353-B24F-B264F675481C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {914D3FAD-8B94-4353-B24F-B264F675481C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -126,6 +120,5 @@ Global
{302400A0-98BB-4C04-88D4-C32DC2D4B945} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
{67E4C92F-6D12-4C52-BB79-B8D11BFC6B82} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4}
- {914D3FAD-8B94-4353-B24F-B264F675481C} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C}
EndGlobalSection
EndGlobal
diff --git a/build/common.props b/build/common.props
index f47dadd..1c78f05 100644
--- a/build/common.props
+++ b/build/common.props
@@ -69,7 +69,6 @@
-
@@ -208,6 +207,7 @@
+
diff --git a/src/Microsoft.AspNetCore/AspNetCoreExtensions.cs b/src/Microsoft.AspNetCore/AspNetCoreExtensions.cs
deleted file mode 100644
index ce27042..0000000
--- a/src/Microsoft.AspNetCore/AspNetCoreExtensions.cs
+++ /dev/null
@@ -1,32 +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 Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Infrastructure;
-
-namespace Microsoft.AspNetCore
-{
- ///
- /// Exposes extension method for establishing configuration defaults.
- ///
- public static class AspNetCoreExtensions
- {
- ///
- /// Allows features to do some default setup for their options, i.e. binding against the default configuration.
- ///
- /// The to modify.
- /// The service collection.
- public static IServiceCollection ConfigureAspNetCoreDefaults(this IServiceCollection services)
- {
- services.AddTransient(typeof(IConfigureOptions<>), typeof(ConfigureDefaults<>));
- services.AddTransient(typeof(IConfigureNamedOptions<>), typeof(ConfigureDefaults<>));
- return services;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore/WebHost.cs b/src/Microsoft.AspNetCore/WebHost.cs
index 7914be6..5833404 100644
--- a/src/Microsoft.AspNetCore/WebHost.cs
+++ b/src/Microsoft.AspNetCore/WebHost.cs
@@ -13,7 +13,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Infrastructure;
namespace Microsoft.AspNetCore
{
@@ -188,10 +187,6 @@ public static IWebHostBuilder CreateDefaultBuilder(string[] args)
.UseDefaultServiceProvider((context, options) =>
{
options.ValidateScopes = context.HostingEnvironment.IsDevelopment();
- })
- .ConfigureServices(services =>
- {
- services.ConfigureAspNetCoreDefaults();
});
return builder;
diff --git a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index 58b96d5..c769193 100644
--- a/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -97,119 +97,6 @@ await ExecuteTestApp(applicationName, async (deploymentResult, logger) =>
}, setTestEnvVars: true, environment: environment);
}
- [Theory]
- [InlineData("127.0.0.1", "127.0.0.1")]
- [InlineData("::1", "[::1]")]
- public async Task BindsKestrelHttpEndPointFromConfiguration(string endPointAddress, string requestAddress)
- {
- try
- {
- File.WriteAllText("appsettings.json", @"
-{
- ""Microsoft:AspNetCore:Server:Kestrel"": {
- ""EndPoints"": {
- ""EndPoint"": {
- ""Address"": """ + endPointAddress + @""",
- ""Port"": 0
- }
- }
- }
-}
-");
- using (var webHost = WebHost.Start(context => context.Response.WriteAsync("Hello, World!")))
- {
- var port = GetWebHostPort(webHost);
-
- Assert.NotEqual(0, port);
-
- using (var client = new HttpClient())
- {
- var response = await client.GetAsync($"http://{requestAddress}:{port}");
- response.EnsureSuccessStatusCode();
- }
- }
- }
- finally
- {
- File.Delete("appsettings.json");
- }
- }
-
- [Fact]
- public async Task BindsKestrelHttpsEndPointFromConfiguration_ReferencedCertificateFile()
- {
- try
- {
- File.WriteAllText("appsettings.json", @"
-{
- ""Microsoft:AspNetCore:Server:Kestrel"": {
- ""EndPoints"": {
- ""EndPoint"": {
- ""Address"": ""127.0.0.1"",
- ""Port"": 0,
- ""Certificate"": ""TestCert""
- }
- }
- },
- ""Certificates"": {
- ""TestCert"": {
- ""Source"": ""File"",
- ""Path"": ""testCert.pfx"",
- ""Password"": ""testPassword""
- }
- }
-}
-");
- using (var webHost = WebHost.Start(context => context.Response.WriteAsync("Hello, World!")))
- {
- var port = GetWebHostPort(webHost);
-
- var response = await HttpClientSlim.GetStringAsync($"https://127.0.0.1:{port}", validateCertificate: false);
- Assert.Equal("Hello, World!", response);
- }
- }
- finally
- {
- File.Delete("appsettings.json");
- }
- }
-
- [Fact]
- public async Task BindsKestrelHttpsEndPointFromConfiguration_InlineCertificateFile()
- {
- try
- {
- File.WriteAllText("appsettings.json", @"
-{
- ""Microsoft:AspNetCore:Server:Kestrel"": {
- ""EndPoints"": {
- ""EndPoint"": {
- ""Address"": ""127.0.0.1"",
- ""Port"": 0,
- ""Certificate"": {
- ""Source"": ""File"",
- ""Path"": ""testCert.pfx"",
- ""Password"": ""testPassword""
- }
- }
- }
- }
-}
-");
- using (var webHost = WebHost.Start(context => context.Response.WriteAsync("Hello, World!")))
- {
- var port = GetWebHostPort(webHost);
-
- var response = await HttpClientSlim.GetStringAsync($"https://127.0.0.1:{port}", validateCertificate: false);
- Assert.Equal("Hello, World!", response);
- }
- }
- finally
- {
- File.Delete("appsettings.json");
- }
- }
-
[Fact]
public void LoggingConfigurationSectionPassedToLoggerByDefault()
{
diff --git a/test/Microsoft.AspNetCore.Tests/ConfigurationTests.cs b/test/Microsoft.AspNetCore.Tests/ConfigurationTests.cs
deleted file mode 100644
index 2e5362e..0000000
--- a/test/Microsoft.AspNetCore.Tests/ConfigurationTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Infrastructure;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Tests
-{
- public class ConfigurationTests
- {
- private class TestOptions
- {
- public string Message { get; set; }
- }
-
- private class ConfigureTestDefault : ConfigureDefaultOptions
- {
- public ConfigureTestDefault(IConfiguration config) :
- base(options => config.GetSection("Test").Bind(options))
- { }
- }
-
- [Fact]
- public void ConfigureAspNetCoreDefaultsEnablesBindAgainstDefaultConfig()
- {
- var dic = new Dictionary
- {
- { "Test:Message", "yadayada"}
- };
- var configurationBuilder = new ConfigurationBuilder();
- configurationBuilder.AddInMemoryCollection(dic);
- var config = configurationBuilder.Build();
- var services = new ServiceCollection()
- .AddSingleton(config)
- .AddOptions()
- .AddTransient, ConfigureTestDefault>()
- .ConfigureAspNetCoreDefaults();
- var sp = services.BuildServiceProvider();
-
- var options = sp.GetRequiredService>().Value;
- Assert.Equal("yadayada", options.Message);
- }
-
- [Fact]
- public void DefaultConfigIgnoredWithoutConfigureAspNetCoreDefaults()
- {
- var dic = new Dictionary
- {
- { "Test:Message", "yadayada"}
- };
- var configurationBuilder = new ConfigurationBuilder();
- configurationBuilder.AddInMemoryCollection(dic);
- var config = configurationBuilder.Build();
- var services = new ServiceCollection()
- .AddSingleton(config)
- .AddOptions()
- .AddTransient, ConfigureTestDefault>();
- var sp = services.BuildServiceProvider();
-
- var options = sp.GetRequiredService>().Value;
- Assert.Null(options.Message);
- }
-
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj b/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj
deleted file mode 100644
index 5a3a180..0000000
--- a/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- netcoreapp2.0;net461
- netcoreapp2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-