Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

using System.Collections;
using System.Configuration;
using System.Diagnostics;
using System.Web.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Memory;
using Microsoft.Extensions.Hosting;

namespace Microsoft.AspNetCore.SystemWebAdapters.Hosting;

Expand Down Expand Up @@ -39,6 +42,41 @@ public static IConfigurationBuilder AddConfigurationManager(this IConfigurationB

return builder;
}
}

public static IConfigurationManager UseHostingEnvironmentFallback(this IConfigurationManager configuration)
{
List<KeyValuePair<string, string?>>? optionList = null;

if (configuration[HostDefaults.ApplicationKey] is null)
{
optionList = new();
optionList.Add(new KeyValuePair<string, string?>(HostDefaults.ApplicationKey, HostingEnvironment.SiteName));
}

if (configuration[HostDefaults.EnvironmentKey] is null && (HostingEnvironment.IsDevelopmentEnvironment || IsIISExpress()))
{
optionList ??= new();
optionList.Add(new KeyValuePair<string, string?>(HostDefaults.EnvironmentKey, Environments.Development));
}

if (configuration[HostDefaults.ContentRootKey] is null)
{
optionList ??= new();
optionList.Add(new KeyValuePair<string, string?>(HostDefaults.ContentRootKey, HostingEnvironment.ApplicationPhysicalPath));
}

if (optionList is not null)
{
configuration.AddInMemoryCollection(optionList);
}

static bool IsIISExpress()
Comment thread
twsouthwick marked this conversation as resolved.
{
using var currentProcess = Process.GetCurrentProcess();

return string.Equals(currentProcess.ProcessName, "iisexpress", StringComparison.Ordinal);
}

return configuration;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Web.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand All @@ -28,31 +26,25 @@ internal HttpApplicationHost(IHost host)
_current = this;
}

public static HttpApplicationHostBuilder CreateBuilder()
public static HttpApplicationHostBuilder CreateBuilder() => CreateBuilder(new HostApplicationBuilderSettings());

internal static HttpApplicationHostBuilder CreateBuilder(HostApplicationBuilderSettings settings)
{
var config = new ConfigurationManager();
if (settings is null)
{
throw new ArgumentNullException(nameof(settings));
}

config.AddConfigurationManager();
settings.Configuration ??= new ConfigurationManager();
settings.Configuration.AddConfigurationManager();
settings.Configuration.UseHostingEnvironmentFallback();

var builder = new HostApplicationBuilder(new HostApplicationBuilderSettings()
{
Configuration = config,
ApplicationName = HostingEnvironment.SiteName,
ContentRootPath = HostingEnvironment.ApplicationPhysicalPath,
EnvironmentName = HostingEnvironment.IsDevelopmentEnvironment || IsIISExpress() ? Environments.Development : Environments.Production
});
var builder = new HostApplicationBuilder(settings);

builder.Services.AddSingleton<IHostLifetime, HttpApplicationLifetime>();
builder.Services.AddConfigurationAccessor();

return new(builder);

static bool IsIISExpress()
{
using var currentProcess = Process.GetCurrentProcess();

return string.Equals(currentProcess.ProcessName, "iisexpress", StringComparison.Ordinal);
}
}

public static void RegisterHost(Action<HttpApplicationHostBuilder> configure)
Expand Down