diff --git a/Serilog.sln b/Serilog.sln index c493ad2b8..df65c8a0d 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -31,14 +31,14 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.IOFile", "src EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.RollingFile", "src\Serilog.Sinks.RollingFile\Serilog.Sinks.RollingFile.xproj", "{A3E6E5B4-995F-4C3D-9673-A4B6000F4E21}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.SystemConsole", "src\Serilog.Sinks.SystemConsole\Serilog.Sinks.SystemConsole.xproj", "{50B24ACA-D8F0-4268-A477-871B0A92A04A}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.PeriodicBatching", "src\Serilog.Sinks.PeriodicBatching\Serilog.Sinks.PeriodicBatching.xproj", "{324C2F52-D9F7-4844-9BC4-9906E228D380}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Observable", "src\Serilog.Sinks.Observable\Serilog.Sinks.Observable.xproj", "{8D6C0BB9-D04D-49B6-9043-4A776AD275D5}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.IOTextWriter", "src\Serilog.Sinks.IOTextWriter\Serilog.Sinks.IOTextWriter.xproj", "{E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.ColoredConsole", "src\Serilog.Sinks.ColoredConsole\Serilog.Sinks.ColoredConsole.xproj", "{50B24ACA-D8F0-4268-A477-871B0A92A04A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -69,10 +69,6 @@ Global {A3E6E5B4-995F-4C3D-9673-A4B6000F4E21}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3E6E5B4-995F-4C3D-9673-A4B6000F4E21}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3E6E5B4-995F-4C3D-9673-A4B6000F4E21}.Release|Any CPU.Build.0 = Release|Any CPU - {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.Build.0 = Release|Any CPU {324C2F52-D9F7-4844-9BC4-9906E228D380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {324C2F52-D9F7-4844-9BC4-9906E228D380}.Debug|Any CPU.Build.0 = Debug|Any CPU {324C2F52-D9F7-4844-9BC4-9906E228D380}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -85,6 +81,10 @@ Global {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}.Release|Any CPU.Build.0 = Release|Any CPU + {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -97,9 +97,9 @@ Global {8849C92D-2120-4C82-8226-22DF40195237} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {57E0ED0E-0F45-48AB-A73D-6A92B7C32095} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {A3E6E5B4-995F-4C3D-9673-A4B6000F4E21} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} - {50B24ACA-D8F0-4268-A477-871B0A92A04A} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {324C2F52-D9F7-4844-9BC4-9906E228D380} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {8D6C0BB9-D04D-49B6-9043-4A776AD275D5} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} + {50B24ACA-D8F0-4268-A477-871B0A92A04A} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} EndGlobalSection EndGlobal diff --git a/src/Serilog.Sinks.SystemConsole/ColoredConsoleLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.ColoredConsole/ColoredConsoleLoggerConfigurationExtensions.cs similarity index 100% rename from src/Serilog.Sinks.SystemConsole/ColoredConsoleLoggerConfigurationExtensions.cs rename to src/Serilog.Sinks.ColoredConsole/ColoredConsoleLoggerConfigurationExtensions.cs diff --git a/src/Serilog.Sinks.SystemConsole/Serilog.Sinks.SystemConsole.xproj b/src/Serilog.Sinks.ColoredConsole/Serilog.Sinks.ColoredConsole.xproj similarity index 100% rename from src/Serilog.Sinks.SystemConsole/Serilog.Sinks.SystemConsole.xproj rename to src/Serilog.Sinks.ColoredConsole/Serilog.Sinks.ColoredConsole.xproj diff --git a/src/Serilog.Sinks.SystemConsole/Sinks/ColoredConsole/ColoredConsoleSink.cs b/src/Serilog.Sinks.ColoredConsole/Sinks/ColoredConsole/ColoredConsoleSink.cs similarity index 100% rename from src/Serilog.Sinks.SystemConsole/Sinks/ColoredConsole/ColoredConsoleSink.cs rename to src/Serilog.Sinks.ColoredConsole/Sinks/ColoredConsole/ColoredConsoleSink.cs diff --git a/src/Serilog.Sinks.SystemConsole/project.json b/src/Serilog.Sinks.ColoredConsole/project.json similarity index 100% rename from src/Serilog.Sinks.SystemConsole/project.json rename to src/Serilog.Sinks.ColoredConsole/project.json diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs index 77c4705c8..fae6d90bc 100644 --- a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs +++ b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs @@ -61,7 +61,7 @@ public void FindsConfigurationAssemblies() public void FindsEventEnrichersWithinAnAssembly() { var eventEnrichers = KeyValuePairSettings - .FindEventEnricherConfigurationMethods(new[] { typeof(RollingFileSink) + .FindEventEnricherConfigurationMethods(new[] { typeof(Log) #if DNXCORE50 .GetTypeInfo() #endif