Fix bug with .NET 4.5.1+ at .net core with settings

mwatson · mwatson · commit 1bd1157a5535 · 2017-05-22T13:03:58.000-05:00
diff --git a/Src/StackifyLib/Config.cs b/Src/StackifyLib/Config.cs
@@ -126,16 +126,17 @@ internal static string Get(string key, string defaultValue = null)
 				{
 
 
-#if NETSTANDARD1_3
+#if NETSTANDARD1_3 || NET451
                     if (_Configuration != null)
                     {
                         var appSettings = _Configuration.GetSection("Stackify");
                         v = appSettings[key.Replace("Stackify.", "")];
                     }
 #endif
 
-#if NET451 || NET45 || NET40s
-                    v = System.Configuration.ConfigurationManager.AppSettings[key];
+#if NET451 || NET45 || NET40
+                    if (string.IsNullOrEmpty(v))
+                        v = System.Configuration.ConfigurationManager.AppSettings[key];
 #endif
 
                     if (string.IsNullOrEmpty(v))

Original file line number	Diff line number	Diff line change
`@@ -126,16 +126,17 @@ internal static string Get(string key, string defaultValue = null)`
`126`	`126`	`{`
`127`	`127`
`128`	`128`
`129`		`-#if NETSTANDARD1_3`
	`129`	`+#if NETSTANDARD1_3 \|\| NET451`
`130`	`130`	`if (_Configuration != null)`
`131`	`131`	`{`
`132`	`132`	`var appSettings = _Configuration.GetSection("Stackify");`
`133`	`133`	`v = appSettings[key.Replace("Stackify.", "")];`
`134`	`134`	`}`
`135`	`135`	`#endif`
`136`	`136`
`137`		`-#if NET451 \|\| NET45 \|\| NET40s`
`138`		`- v = System.Configuration.ConfigurationManager.AppSettings[key];`
	`137`	`+#if NET451 \|\| NET45 \|\| NET40`
	`138`	`+ if (string.IsNullOrEmpty(v))`
	`139`	`+ v = System.Configuration.ConfigurationManager.AppSettings[key];`
`139`	`140`	`#endif`
`140`	`141`
`141`	`142`	`if (string.IsNullOrEmpty(v))`