Fix failing test caused by a bad merge.

Keyhad · Nov 19, 2015 · cf6f7c2 · cf6f7c2
1 parent 6d659dc
commit cf6f7c2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/Serilog/Settings/AppSettings/AppSettingsSettings.cs b/src/Serilog/Settings/AppSettings/AppSettingsSettings.cs
@@ -29,6 +29,7 @@ class AppSettingsSettings : ILoggerSettings
         public AppSettingsSettings(string settingPrefix = null)
         {
             _settingPrefix = settingPrefix == null ? "serilog:" : $"{settingPrefix}:serilog:";
+            System.Console.WriteLine(_settingPrefix);
         }
 
         public void Configure(LoggerConfiguration loggerConfiguration)
@@ -41,9 +42,6 @@ public void Configure(LoggerConfiguration loggerConfiguration)
                 .Where(k => k.StartsWith(_settingPrefix))
                 .ToDictionary(k => k.Substring(_settingPrefix.Length), k => Environment.ExpandEnvironmentVariables(settings[k]));
 
-            // Add the FullNetFx assembly by default so that all built-in Serilog sinks are available without "using"
-            pairs.Add("using:_ImpliedSerilogFullNetFx", typeof(AppSettingsSettings).Assembly.FullName);
-
             var keyValuePairSettings = new KeyValuePairSettings(pairs);
             keyValuePairSettings.Configure(loggerConfiguration);
         }

diff --git a/test/Serilog.Tests/Core/LoggerTests.cs b/test/Serilog.Tests/Core/LoggerTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Xunit;
 using Serilog.Core;

diff --git a/test/Serilog.Tests/LoggerConfigurationTests.cs b/test/Serilog.Tests/LoggerConfigurationTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Xunit;
 using Serilog.Core;

diff --git a/test/Serilog.Tests/Settings/AppSettingsTests.cs b/test/Serilog.Tests/Settings/AppSettingsTests.cs
@@ -5,7 +5,7 @@
 using Serilog.Events;
 using Serilog.Tests.Support;
 
-namespace Serilog.Extras.AppSettings.Tests
+namespace Serilog.Tests.AppSettings.Tests
 {
     public class AppSettingsTests
     {
@@ -39,10 +39,12 @@ public void CanUseCustomPrefixToConfigureSettings()
             Assert.Equal("Error", ConfigurationManager.AppSettings[prefix2 + ":serilog:minimum-level"]);
 
             var log1 = new LoggerConfiguration()
+                .WriteTo.Observers(o => { })
                 .ReadFrom.AppSettings(prefix1)
                 .CreateLogger();
 
             var log2 = new LoggerConfiguration()
+                .WriteTo.Observers(o => { })
                 .ReadFrom.AppSettings(prefix2)
                 .CreateLogger();
 

diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
@@ -7,7 +7,7 @@
 using Serilog.Sinks.RollingFile;
 using Serilog.Tests.Support;
 
-namespace Serilog.Extras.AppSettings.Tests
+namespace Serilog.Tests.AppSettings.Tests
 {
     public class KeyValuePairSettingsTests
     {