From 4bae3968e02d2fc7dcfc3cf4223170151d823240 Mon Sep 17 00:00:00 2001
From: Pure Krome <pure.krome@world-domination.com.au>
Date: Mon, 11 Jan 2021 00:53:54 +1100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Fixed=20how=20Serilog=20loads=20?=
 =?UTF-8?q?appsettings=20files.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...eHosting.SampleWebApplication.Tests.csproj |  2 +-
 src/WorldDomination.SimpleHosting/Program.cs  |  4 +-
 .../WorldDomination.SimpleHosting.csproj      | 92 +++++++++----------
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/WorldDomination.SimpleHosting.SampleWebApplication.Tests/WorldDomination.SimpleHosting.SampleWebApplication.Tests.csproj b/src/WorldDomination.SimpleHosting.SampleWebApplication.Tests/WorldDomination.SimpleHosting.SampleWebApplication.Tests.csproj
index 881a289..755ec87 100644
--- a/src/WorldDomination.SimpleHosting.SampleWebApplication.Tests/WorldDomination.SimpleHosting.SampleWebApplication.Tests.csproj
+++ b/src/WorldDomination.SimpleHosting.SampleWebApplication.Tests/WorldDomination.SimpleHosting.SampleWebApplication.Tests.csproj
@@ -21,7 +21,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/WorldDomination.SimpleHosting/Program.cs b/src/WorldDomination.SimpleHosting/Program.cs
index 4ff0f30..96d8dc7 100644
--- a/src/WorldDomination.SimpleHosting/Program.cs
+++ b/src/WorldDomination.SimpleHosting/Program.cs
@@ -154,7 +154,9 @@ private static IConfiguration GetConfigurationBuilder()
 
             // Check any 'Environment' json files, like appsettings.Development.json.
             // REF: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/host/generic-host?#environmentname
-            var environment = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Production";
+            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ??
+                Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ??
+                "Production";
 
             return builder
                 .AddJsonFile($"appsettings.{environment}.json", optional: true)
diff --git a/src/WorldDomination.SimpleHosting/WorldDomination.SimpleHosting.csproj b/src/WorldDomination.SimpleHosting/WorldDomination.SimpleHosting.csproj
index bbeb33d..91b0457 100644
--- a/src/WorldDomination.SimpleHosting/WorldDomination.SimpleHosting.csproj
+++ b/src/WorldDomination.SimpleHosting/WorldDomination.SimpleHosting.csproj
@@ -1,53 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <PackageId>WorldDomination.SimpleHosting</PackageId>
-    <Authors>Pure Krome</Authors>
-    <Company>World Domination Technologies</Company>
-    <Product>Simple : Hosting</Product>
-    <Description>Making it simple to customize Hosting for your .NET Core 5.x+ application</Description>
-    <Copyright>2020</Copyright>
-    <OutputType>Library</OutputType>
-    <PackageProjectUrl>https://github.com/PureKrome/SimpleHosting</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <RepositoryUrl>https://github.com/PureKrome/SimpleHosting</RepositoryUrl>
-    <RepositoryType>.net c# .net-core</RepositoryType>
-    <PackageTags>.net dotnet c# netcore aspnetcore aspnet-core hosting world-domination unicorn magicalunicorn magical-unicorn</PackageTags> 
-
-    <!-- Microsoft.NET.Sdk.Web aren't ment for packaging into dll's. You usually publish a website.
-         As such, we need to specify that this is ok to do -->
-    <IsPackable>true</IsPackable>
-
-    <!-- Source Link. REF: https://github.com/dotnet/sourcelink -->
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <PackageIcon>icon.jpg</PackageIcon>
-    <PackageIconUrl />
-
-  </PropertyGroup>
-
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <PackageId>WorldDomination.SimpleHosting</PackageId>
+    <Authors>Pure Krome</Authors>
+    <Company>World Domination Technologies</Company>
+    <Product>Simple : Hosting</Product>
+    <Description>Making it simple to customize Hosting for your .NET Core 5.x+ application</Description>
+    <Copyright>2020</Copyright>
+    <OutputType>Library</OutputType>
+    <PackageProjectUrl>https://github.com/PureKrome/SimpleHosting</PackageProjectUrl>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <RepositoryUrl>https://github.com/PureKrome/SimpleHosting</RepositoryUrl>
+    <RepositoryType>.net c# .net-core</RepositoryType>
+    <PackageTags>.net dotnet c# netcore aspnetcore aspnet-core hosting world-domination unicorn magicalunicorn magical-unicorn</PackageTags> 
+
+    <!-- Microsoft.NET.Sdk.Web aren't ment for packaging into dll's. You usually publish a website.
+         As such, we need to specify that this is ok to do -->
+    <IsPackable>true</IsPackable>
+
+    <!-- Source Link. REF: https://github.com/dotnet/sourcelink -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageIcon>icon.jpg</PackageIcon>
+    <PackageIconUrl />
+
+  </PropertyGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\LICENSE.txt">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
+    </PackageReference>
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\..\LICENSE.txt">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
     </None>
     <None Include="..\..\icon.jpg">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
-</Project>
+    </None>
+  </ItemGroup>
+
+</Project>