From e7845f3b37011067ea386e354f45f2752ab0a4e5 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Thu, 28 Apr 2016 12:35:27 -0700 Subject: [PATCH] Use fallback logic --- src/MusicStore.Standalone/Program.cs | 4 +++- src/MusicStore/Program.cs | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/MusicStore.Standalone/Program.cs b/src/MusicStore.Standalone/Program.cs index e4487c597d..eaeec66b87 100644 --- a/src/MusicStore.Standalone/Program.cs +++ b/src/MusicStore.Standalone/Program.cs @@ -1,3 +1,4 @@ +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Net.Http.Server; @@ -22,7 +23,8 @@ namespace MusicStore.Standalone .UseStartup("MusicStore.Standalone"); if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.WebListener", System.StringComparison.Ordinal) - && string.Equals(builder.GetSetting("environment"), "NtlmAuthentication", System.StringComparison.Ordinal)) + && string.Equals(builder.GetSetting("environment") ?? + Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"), "NtlmAuthentication", System.StringComparison.Ordinal)) { // Set up NTLM authentication for WebListener like below. // For IIS and IISExpress: Use inetmgr to setup NTLM authentication on the application vDir or diff --git a/src/MusicStore/Program.cs b/src/MusicStore/Program.cs index 70f3f59c79..0fc85507f3 100644 --- a/src/MusicStore/Program.cs +++ b/src/MusicStore/Program.cs @@ -24,10 +24,9 @@ namespace MusicStore if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.WebListener", System.StringComparison.Ordinal) && string.Equals(builder.GetSetting("environment"), "NtlmAuthentication", System.StringComparison.Ordinal)) { - // Set up NTLM authentication for WebListener like below. - // For IIS and IISExpress: Use inetmgr to setup NTLM authentication on the application vDir or - // modify the applicationHost.config to enable NTLM. - builder.UseWebListener(options => + if (string.Equals(builder.GetSetting("environment") ?? + Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"), + "NtlmAuthentication", System.StringComparison.Ordinal)) { options.Listener.AuthenticationManager.AuthenticationSchemes = AuthenticationSchemes.NTLM; });