From d4814a963cf30971c74bf786671e2ddd45574366 Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Sat, 23 Jan 2016 14:33:56 +1000 Subject: [PATCH] Renamed Serilog.Sinks.DiagnosticTrace to Serilog.Sinks.Trace --- Serilog.sln | 14 +++++++------- .../Serilog.Sinks.Trace.xproj} | 0 .../Sinks/Trace/TraceSink.cs} | 4 ++-- .../TraceLoggerConfigurationExtensions.cs} | 4 ++-- .../project.json | 0 test/Serilog.Tests/project.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/{Serilog.Sinks.DiagnosticTrace/Serilog.Sinks.DiagnosticTrace.xproj => Serilog.Sinks.Trace/Serilog.Sinks.Trace.xproj} (100%) rename src/{Serilog.Sinks.DiagnosticTrace/Sinks/DiagnosticTrace/DiagnosticTraceSink.cs => Serilog.Sinks.Trace/Sinks/Trace/TraceSink.cs} (93%) rename src/{Serilog.Sinks.DiagnosticTrace/DiagnosticTraceLoggerConfigurationExtensions.cs => Serilog.Sinks.Trace/TraceLoggerConfigurationExtensions.cs} (92%) rename src/{Serilog.Sinks.DiagnosticTrace => Serilog.Sinks.Trace}/project.json (100%) diff --git a/Serilog.sln b/Serilog.sln index 7621f069e..e86050cf4 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -25,8 +25,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Console", "sr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sinks", "sinks", "{9EC69873-5A97-4C25-AB5A-31DDE589B2D9}" 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.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.File", "src\S EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.TextWriter", "src\Serilog.Sinks.TextWriter\Serilog.Sinks.TextWriter.xproj", "{E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Trace", "src\Serilog.Sinks.Trace\Serilog.Sinks.Trace.xproj", "{8849C92D-2120-4C82-8226-22DF40195237}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,10 +57,6 @@ Global {866A028E-27DB-49A0-AC78-E5FEF247C099}.Debug|Any CPU.Build.0 = Debug|Any CPU {866A028E-27DB-49A0-AC78-E5FEF247C099}.Release|Any CPU.ActiveCfg = Release|Any CPU {866A028E-27DB-49A0-AC78-E5FEF247C099}.Release|Any CPU.Build.0 = Release|Any CPU - {8849C92D-2120-4C82-8226-22DF40195237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 {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 {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 + {8849C92D-2120-4C82-8226-22DF40195237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -94,12 +94,12 @@ Global {3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0} {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} {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} {50B24ACA-D8F0-4268-A477-871B0A92A04A} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {57E0ED0E-0F45-48AB-A73D-6A92B7C32095} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} + {8849C92D-2120-4C82-8226-22DF40195237} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} EndGlobalSection EndGlobal diff --git a/src/Serilog.Sinks.DiagnosticTrace/Serilog.Sinks.DiagnosticTrace.xproj b/src/Serilog.Sinks.Trace/Serilog.Sinks.Trace.xproj similarity index 100% rename from src/Serilog.Sinks.DiagnosticTrace/Serilog.Sinks.DiagnosticTrace.xproj rename to src/Serilog.Sinks.Trace/Serilog.Sinks.Trace.xproj diff --git a/src/Serilog.Sinks.DiagnosticTrace/Sinks/DiagnosticTrace/DiagnosticTraceSink.cs b/src/Serilog.Sinks.Trace/Sinks/Trace/TraceSink.cs similarity index 93% rename from src/Serilog.Sinks.DiagnosticTrace/Sinks/DiagnosticTrace/DiagnosticTraceSink.cs rename to src/Serilog.Sinks.Trace/Sinks/Trace/TraceSink.cs index 46deeb7e0..287872493 100644 --- a/src/Serilog.Sinks.DiagnosticTrace/Sinks/DiagnosticTrace/DiagnosticTraceSink.cs +++ b/src/Serilog.Sinks.Trace/Sinks/Trace/TraceSink.cs @@ -21,11 +21,11 @@ namespace Serilog.Sinks.DiagnosticTrace { - class DiagnosticTraceSink : ILogEventSink + class TraceSink : ILogEventSink { readonly ITextFormatter _textFormatter; - public DiagnosticTraceSink(ITextFormatter textFormatter) + public TraceSink(ITextFormatter textFormatter) { if (textFormatter == null) throw new ArgumentNullException(nameof(textFormatter)); _textFormatter = textFormatter; diff --git a/src/Serilog.Sinks.DiagnosticTrace/DiagnosticTraceLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.Trace/TraceLoggerConfigurationExtensions.cs similarity index 92% rename from src/Serilog.Sinks.DiagnosticTrace/DiagnosticTraceLoggerConfigurationExtensions.cs rename to src/Serilog.Sinks.Trace/TraceLoggerConfigurationExtensions.cs index 473f1a83a..ebb1a357c 100644 --- a/src/Serilog.Sinks.DiagnosticTrace/DiagnosticTraceLoggerConfigurationExtensions.cs +++ b/src/Serilog.Sinks.Trace/TraceLoggerConfigurationExtensions.cs @@ -22,7 +22,7 @@ namespace Serilog { - public static class DiagnosticTraceLoggerConfigurationExtensions + public static class TraceLoggerConfigurationExtensions { /// /// Write log events to the . @@ -46,7 +46,7 @@ public static LoggerConfiguration Trace( if (sinkConfiguration == null) throw new ArgumentNullException(nameof(sinkConfiguration)); if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate)); var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider); - return sinkConfiguration.Sink(new DiagnosticTraceSink(formatter), restrictedToMinimumLevel, levelSwitch); + return sinkConfiguration.Sink(new TraceSink(formatter), restrictedToMinimumLevel, levelSwitch); } } } \ No newline at end of file diff --git a/src/Serilog.Sinks.DiagnosticTrace/project.json b/src/Serilog.Sinks.Trace/project.json similarity index 100% rename from src/Serilog.Sinks.DiagnosticTrace/project.json rename to src/Serilog.Sinks.Trace/project.json diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json index 9f685c92d..206132437 100644 --- a/test/Serilog.Tests/project.json +++ b/test/Serilog.Tests/project.json @@ -12,7 +12,7 @@ "xunit.runner.visualstudio": "2.1.0", "xunit.runner.dnx": "2.1.0-rc1-build204", "Serilog.Sinks.Console": { "target": "project" }, - "Serilog.Sinks.DiagnosticTrace": { "target": "project" }, + "Serilog.Sinks.Trace": { "target": "project" }, "Serilog.Sinks.File": { "target": "project" }, "Serilog.Sinks.RollingFile": { "target": "project" }, "Serilog.Sinks.PeriodicBatching": { "target": "project" },