#700 #727 Add environment variables by default and remove UseDefaultH…

…ostingConfiguration
aspnet · Apr 27, 2016 · 1f61593 · 1f61593
1 parent 3853d98
commit 1f61593
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 31 deletions.
diff --git a/samples/SampleStartups/StartupBlockingOnStart.cs b/samples/SampleStartups/StartupBlockingOnStart.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
@@ -28,8 +29,10 @@ public void Configure(IApplicationBuilder app)
         // Entry point for the application.
         public static void Main(string[] args)
         {
+            var config = new ConfigurationBuilder().AddCommandLine(args).Build();
+
             var host = new WebHostBuilder()
-                .UseDefaultHostingConfiguration(args)
+                .UseConfiguration(config)
                 .UseStartup<StartupBlockingOnStart>()
                 .Build();
 

diff --git a/samples/SampleStartups/StartupConfigureAddresses.cs b/samples/SampleStartups/StartupConfigureAddresses.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
@@ -27,8 +28,10 @@ public void Configure(IApplicationBuilder app)
         // Entry point for the application.
         public static void Main(string[] args)
         {
+            var config = new ConfigurationBuilder().AddCommandLine(args).Build();
+
             var host = new WebHostBuilder()
-                .UseDefaultHostingConfiguration(args)
+                .UseConfiguration(config)
                 .UseStartup<StartupConfigureAddresses>()
                 .UseUrls("http://localhost:5000", "http://localhost:5001")
                 .Build();

diff --git a/samples/SampleStartups/StartupHelloWorld.cs b/samples/SampleStartups/StartupHelloWorld.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
@@ -27,8 +28,10 @@ public void Configure(IApplicationBuilder app)
         // Entry point for the application.
         public static void Main(string[] args)
         {
+            var config = new ConfigurationBuilder().AddCommandLine(args).Build();
+
             var host = new WebHostBuilder()
-                .UseDefaultHostingConfiguration(args)
+                .UseConfiguration(config)
                 .UseStartup<StartupHelloWorld>()
                 .Build();
 

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHostConfiguration.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHostConfiguration.cs
@@ -1,7 +1,6 @@
 // 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.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.AspNetCore.Hosting.Internal
@@ -18,8 +17,7 @@ public static IConfiguration GetDefault(string[] args)
             // Setup the default locations for finding hosting configuration options
             // hosting.json, ASPNETCORE_ prefixed env variables and command line arguments
             var configBuilder = new ConfigurationBuilder()
-                .AddJsonFile(WebHostDefaults.HostingJsonFile, optional: true)
-                .AddEnvironmentVariables(prefix: WebHostDefaults.EnvironmentVariablesPrefix);
+                .AddJsonFile(WebHostDefaults.HostingJsonFile, optional: true);
 
             if (args != null)
             {

diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -29,7 +29,11 @@ public class WebHostBuilder : IWebHostBuilder
         private readonly List<Action<IServiceCollection>> _configureServicesDelegates;
         private readonly List<Action<ILoggerFactory>> _configureLoggingDelegates;
 
-        private IConfiguration _config = new ConfigurationBuilder().AddInMemoryCollection().Build();
+        private IConfiguration _config = new ConfigurationBuilder()
+            .AddInMemoryCollection()
+            .AddEnvironmentVariables(prefix: WebHostDefaults.EnvironmentVariablesPrefix)
+            .Build();
+
         private ILoggerFactory _loggerFactory;
         private WebHostOptions _options;
 

diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,27 +14,6 @@ public static class WebHostBuilderExtensions
     {
         private static readonly string ServerUrlsSeparator = ";";
 
-        /// <summary>
-        /// Use the default hosting configuration settings on the web host.
-        /// </summary>
-        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to configure.</param>
-        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-        public static IWebHostBuilder UseDefaultHostingConfiguration(this IWebHostBuilder hostBuilder)
-        {
-            return hostBuilder.UseDefaultHostingConfiguration(args: null);
-        }
-
-        /// <summary>
-        /// Use the default hosting configuration settings on the web host and allow for override by command line arguments.
-        /// </summary>
-        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to configure.</param>
-        /// <param name="args">The command line arguments used to override default settings.</param>
-        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-        public static IWebHostBuilder UseDefaultHostingConfiguration(this IWebHostBuilder hostBuilder, string[] args)
-        {
-            return hostBuilder.UseConfiguration(WebHostConfiguration.GetDefault(args));
-        }
-
         /// <summary>
         /// Use the given configuration settings on the web host.
         /// </summary>

diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -190,10 +190,9 @@ public void MultipleConfigureLoggingInvokedInOrder()
         }
 
         [Fact]
-        public void DefaultHostingConfigurationDoesNotCaptureStartupErrors()
+        public void DoesNotCaptureStartupErrorsByDefault()
         {
             var hostBuilder = new WebHostBuilder()
-                .UseDefaultHostingConfiguration()
                 .UseServer(new TestServer())
                 .UseStartup<StartupBoom>();