configsetting - Removed unnecessary dependency on Microsoft.Extension…

…s.Configuration.EnvironmentVariables
NLog · Sep 22, 2018 · c1de8a0 · c1de8a0
1 parent 7f99b71
commit c1de8a0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/NLog.Extensions.Configuration/ConfigSettingLayoutRenderer.cs b/src/NLog.Extensions.Configuration/ConfigSettingLayoutRenderer.cs
@@ -95,8 +95,7 @@ private IConfiguration TryGetConfigurationRoot()
         {
             if (DefaultConfiguration != null)
             {
-                var simpleLayout = FileName as SimpleLayout;
-                if (simpleLayout == null || string.IsNullOrEmpty(simpleLayout.Text) || ReferenceEquals(simpleLayout.Text, DefaultFileName))
+                if (IsDefaultConfiguration(FileName, DefaultFileName))
                 {
                     if (_configurationRoot != null)
                         _configurationRoot = null;
@@ -133,26 +132,38 @@ private IConfigurationRoot LoadFileConfiguration(string fileNames)
             }
         }
 
+        private static bool IsDefaultConfiguration(Layout fileName, string defaultFileName)
+        {
+            var layoutFileName = (fileName as SimpleLayout)?.Text;
+            return string.IsNullOrEmpty(layoutFileName) || ReferenceEquals(layoutFileName, defaultFileName);
+        }
+
         private static IConfigurationRoot BuildConfigurationRoot(string fileNames)
         {
             var configBuilder = new ConfigurationBuilder();
+
             string baseDir = null;
             foreach (var fileName in fileNames.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries))
             {
-                var fullPath = fileName;
-                if (!System.IO.Path.IsPathRooted(fullPath))
+                if (!System.IO.Path.IsPathRooted(fileName) && baseDir == null)
                 {
-                    if (baseDir == null)
-                        baseDir = new BaseDirLayoutRenderer().Render(LogEventInfo.CreateNullEvent()) ?? string.Empty;
-                    fullPath = System.IO.Path.Combine(baseDir, fileName);
+                    baseDir = AddConfigurationBasePath(configBuilder);
                 }
 
-                AddFileConfiguration(configBuilder, fullPath);
+                AddFileConfiguration(configBuilder, fileName);
             }
 
             return configBuilder.Build();
         }
 
+        private static string AddConfigurationBasePath(ConfigurationBuilder configBuilder)
+        {
+            string baseDir = new BaseDirLayoutRenderer().Render(LogEventInfo.CreateNullEvent()) ?? string.Empty;
+            if (!string.IsNullOrEmpty(baseDir))
+                configBuilder.SetBasePath(baseDir);
+            return baseDir;
+        }
+
         private static void AddFileConfiguration(ConfigurationBuilder configBuilder, string fullPath)
         {
             if (System.IO.File.Exists(fullPath))

diff --git a/src/NLog.Extensions.Configuration/NLog.Extensions.Configuration.csproj b/src/NLog.Extensions.Configuration/NLog.Extensions.Configuration.csproj
@@ -12,7 +12,10 @@
 
     <Company>NLog</Company>
     <Authors>Julian Verdurmen;CoCo Lin</Authors>
-    <Description>NLog extensions for Microsoft.Extensions.Configuration</Description>
+    <Description>NLog extensions for Microsoft.Extensions.Configuration
+
+Read appsettings.json on .NET Core using ${configsetting:name=MySetting}
+    </Description>
     <PackageProjectUrl>https://github.com/NLog/NLog.Extensions.Logging</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/NLog/NLog.Extensions.Logging/blob/master/LICENSE</PackageLicenseUrl>
     <PackageIconUrl>https://nlog-project.org/NConfig.png</PackageIconUrl>
@@ -57,7 +60,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -66,24 +68,20 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
   </ItemGroup>
 </Project>