diff --git a/Serilog.sln b/Serilog.sln index df65c8a0d..8b90e9d08 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -27,8 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sinks", "sinks", "{9EC69873 EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.DiagnosticTrace", "src\Serilog.Sinks.DiagnosticTrace\Serilog.Sinks.DiagnosticTrace.xproj", "{8849C92D-2120-4C82-8226-22DF40195237}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.IOFile", "src\Serilog.Sinks.IOFile\Serilog.Sinks.IOFile.xproj", "{57E0ED0E-0F45-48AB-A73D-6A92B7C32095}" -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.PeriodicBatching", "src\Serilog.Sinks.PeriodicBatching\Serilog.Sinks.PeriodicBatching.xproj", "{324C2F52-D9F7-4844-9BC4-9906E228D380}" @@ -39,6 +37,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.IOTextWriter" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.ColoredConsole", "src\Serilog.Sinks.ColoredConsole\Serilog.Sinks.ColoredConsole.xproj", "{50B24ACA-D8F0-4268-A477-871B0A92A04A}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.File", "src\Serilog.Sinks.File\Serilog.Sinks.File.xproj", "{57E0ED0E-0F45-48AB-A73D-6A92B7C32095}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,10 +61,6 @@ Global {8849C92D-2120-4C82-8226-22DF40195237}.Debug|Any CPU.Build.0 = Debug|Any CPU {8849C92D-2120-4C82-8226-22DF40195237}.Release|Any CPU.ActiveCfg = Release|Any CPU {8849C92D-2120-4C82-8226-22DF40195237}.Release|Any CPU.Build.0 = Release|Any CPU - {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Release|Any CPU.Build.0 = Release|Any CPU {A3E6E5B4-995F-4C3D-9673-A4B6000F4E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {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 @@ -85,6 +81,10 @@ Global {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 + {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57E0ED0E-0F45-48AB-A73D-6A92B7C32095}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -95,11 +95,11 @@ Global {866A028E-27DB-49A0-AC78-E5FEF247C099} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} = {037440DE-440B-4129-9F7A-09B42D00397E} {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} {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} + {57E0ED0E-0F45-48AB-A73D-6A92B7C32095} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} EndGlobalSection EndGlobal diff --git a/src/Serilog.Sinks.IOFile/IOFileLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs similarity index 98% rename from src/Serilog.Sinks.IOFile/IOFileLoggerConfigurationExtensions.cs rename to src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs index 3a1b49da6..488e5470d 100644 --- a/src/Serilog.Sinks.IOFile/IOFileLoggerConfigurationExtensions.cs +++ b/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs @@ -22,7 +22,7 @@ namespace Serilog { - public static class IOFileLoggerConfigurationExtensions + public static class FileLoggerConfigurationExtensions { /// /// Write log events to the specified file. diff --git a/src/Serilog.Sinks.IOFile/Properties/InternalsVisibleTo.cs b/src/Serilog.Sinks.File/Properties/InternalsVisibleTo.cs similarity index 100% rename from src/Serilog.Sinks.IOFile/Properties/InternalsVisibleTo.cs rename to src/Serilog.Sinks.File/Properties/InternalsVisibleTo.cs diff --git a/src/Serilog.Sinks.IOFile/Serilog.Sinks.IOFile.xproj b/src/Serilog.Sinks.File/Serilog.Sinks.File.xproj similarity index 100% rename from src/Serilog.Sinks.IOFile/Serilog.Sinks.IOFile.xproj rename to src/Serilog.Sinks.File/Serilog.Sinks.File.xproj diff --git a/src/Serilog.Sinks.IOFile/Sinks/IOFile/CharacterCountLimitedTextWriter.cs b/src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs similarity index 100% rename from src/Serilog.Sinks.IOFile/Sinks/IOFile/CharacterCountLimitedTextWriter.cs rename to src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs diff --git a/src/Serilog.Sinks.IOFile/Sinks/IOFile/FileSink.cs b/src/Serilog.Sinks.File/Sinks/File/FileSink.cs similarity index 100% rename from src/Serilog.Sinks.IOFile/Sinks/IOFile/FileSink.cs rename to src/Serilog.Sinks.File/Sinks/File/FileSink.cs diff --git a/src/Serilog.Sinks.IOFile/Sinks/IOFile/NullSink.cs b/src/Serilog.Sinks.File/Sinks/File/NullSink.cs similarity index 100% rename from src/Serilog.Sinks.IOFile/Sinks/IOFile/NullSink.cs rename to src/Serilog.Sinks.File/Sinks/File/NullSink.cs diff --git a/src/Serilog.Sinks.IOFile/project.json b/src/Serilog.Sinks.File/project.json similarity index 100% rename from src/Serilog.Sinks.IOFile/project.json rename to src/Serilog.Sinks.File/project.json diff --git a/src/Serilog.Sinks.RollingFile/project.json b/src/Serilog.Sinks.RollingFile/project.json index c9225d8cf..e1faa09ce 100644 --- a/src/Serilog.Sinks.RollingFile/project.json +++ b/src/Serilog.Sinks.RollingFile/project.json @@ -8,7 +8,7 @@ "iconUrl": "http://serilog.net/images/serilog-sink-nuget.png", "dependencies": { "Serilog": { "target": "project" }, - "Serilog.Sinks.IOFile": { "target": "project" } + "Serilog.Sinks.File": { "target": "project" } }, "compilationOptions": { "keyFile": "../../assets/Serilog.snk" diff --git a/src/Serilog/LoggerConfigurationExtensions.cs b/src/Serilog/LoggerConfigurationExtensions.cs index cd2b04f14..b266d9b89 100644 --- a/src/Serilog/LoggerConfigurationExtensions.cs +++ b/src/Serilog/LoggerConfigurationExtensions.cs @@ -37,7 +37,7 @@ namespace Serilog /// Extends to add Full .NET Framework /// capabilities. /// - public static class LoggerConfigurationFxExtensions + public static class LoggerConfigurationExtensions { //TODO: Need to confirm this is the best location for this default. Used in File, Trace, RollingFile. Do we move this to each sink? public const string DefaultOutputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"; diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json index 8b62dbacb..63a970bbd 100644 --- a/test/Serilog.Tests/project.json +++ b/test/Serilog.Tests/project.json @@ -13,7 +13,7 @@ "xunit.runner.dnx": "2.1.0-rc1-build204", "Serilog.Sinks.Console": { "target": "project" }, "Serilog.Sinks.DiagnosticTrace": { "target": "project" }, - "Serilog.Sinks.IOFile": { "target": "project" }, + "Serilog.Sinks.File": { "target": "project" }, "Serilog.Sinks.RollingFile": { "target": "project" }, "Serilog.Sinks.PeriodicBatching": { "target": "project" }, "Serilog.Sinks.Observable": { "target": "project" },