From 9c24d46ca16382b2d964f38badf899436270ba2d Mon Sep 17 00:00:00 2001 From: Matthew Erbs Date: Fri, 22 Jan 2016 15:24:19 +1000 Subject: [PATCH] Changed namespaces to match renamed sink projects --- Serilog.sln | 14 +++++++------- .../FileLoggerConfigurationExtensions.cs | 2 +- .../Sinks/File/CharacterCountLimitedTextWriter.cs | 2 +- src/Serilog.Sinks.File/Sinks/File/FileSink.cs | 4 ++-- src/Serilog.Sinks.File/Sinks/File/NullSink.cs | 2 +- .../Sinks/RollingFile/RollingFileSink.cs | 2 +- .../Sinks/TextWriter/TextWriterSink.cs | 6 +++--- .../TextWriterLoggerConfigurationExtensions.cs | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Serilog.sln b/Serilog.sln index e7a30d1ba..7621f069e 100644 --- a/Serilog.sln +++ b/Serilog.sln @@ -33,12 +33,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.PeriodicBatch 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.TextWriter", "src\Serilog.Sinks.IOTextWriter\Serilog.Sinks.TextWriter.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 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.File", "src\Serilog.Sinks.File\Serilog.Sinks.File.xproj", "{57E0ED0E-0F45-48AB-A73D-6A92B7C32095}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.TextWriter", "src\Serilog.Sinks.TextWriter\Serilog.Sinks.TextWriter.xproj", "{E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,10 +73,6 @@ Global {8D6C0BB9-D04D-49B6-9043-4A776AD275D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D6C0BB9-D04D-49B6-9043-4A776AD275D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {8D6C0BB9-D04D-49B6-9043-4A776AD275D5}.Release|Any CPU.Build.0 = Release|Any CPU - {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 @@ -85,6 +81,10 @@ Global {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 + {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -98,8 +98,8 @@ Global {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} + {E85ABEC7-9B4C-432C-9A04-AC5BE9205D9F} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9} EndGlobalSection EndGlobal diff --git a/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs index 488e5470d..59776ef68 100644 --- a/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs +++ b/src/Serilog.Sinks.File/FileLoggerConfigurationExtensions.cs @@ -18,7 +18,7 @@ using Serilog.Debugging; using Serilog.Events; using Serilog.Formatting.Display; -using Serilog.Sinks.IOFile; +using Serilog.Sinks.File; namespace Serilog { diff --git a/src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs b/src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs index 24687a487..f44431686 100644 --- a/src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs +++ b/src/Serilog.Sinks.File/Sinks/File/CharacterCountLimitedTextWriter.cs @@ -17,7 +17,7 @@ using System.Text; using System.Threading; -namespace Serilog.Sinks.IOFile +namespace Serilog.Sinks.File { sealed class CharacterCountLimitedTextWriter : TextWriter { diff --git a/src/Serilog.Sinks.File/Sinks/File/FileSink.cs b/src/Serilog.Sinks.File/Sinks/File/FileSink.cs index 4f0ad0d2b..fbe719a3a 100644 --- a/src/Serilog.Sinks.File/Sinks/File/FileSink.cs +++ b/src/Serilog.Sinks.File/Sinks/File/FileSink.cs @@ -20,7 +20,7 @@ using Serilog.Events; using Serilog.Formatting; -namespace Serilog.Sinks.IOFile +namespace Serilog.Sinks.File { /// /// Write log events to a disk file. @@ -51,7 +51,7 @@ public FileSink(string path, ITextFormatter textFormatter, long? fileSizeLimitBy TryCreateDirectory(path); - var file = File.Open(path, FileMode.Append, FileAccess.Write, FileShare.Read); + var file = System.IO.File.Open(path, FileMode.Append, FileAccess.Write, FileShare.Read); var outputWriter = new StreamWriter(file, encoding ?? Encoding.UTF8); if (fileSizeLimitBytes != null) { diff --git a/src/Serilog.Sinks.File/Sinks/File/NullSink.cs b/src/Serilog.Sinks.File/Sinks/File/NullSink.cs index 57789af1b..5e9bb2ca0 100644 --- a/src/Serilog.Sinks.File/Sinks/File/NullSink.cs +++ b/src/Serilog.Sinks.File/Sinks/File/NullSink.cs @@ -15,7 +15,7 @@ using Serilog.Core; using Serilog.Events; -namespace Serilog.Sinks.IOFile +namespace Serilog.Sinks.File { /// /// An instance of this sink may be substituted when an instance of the diff --git a/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs b/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs index f775b55cf..7c7de9502 100644 --- a/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs +++ b/src/Serilog.Sinks.RollingFile/Sinks/RollingFile/RollingFileSink.cs @@ -22,7 +22,7 @@ using Serilog.Debugging; using Serilog.Events; using Serilog.Formatting; -using Serilog.Sinks.IOFile; +using Serilog.Sinks.File; namespace Serilog.Sinks.RollingFile { diff --git a/src/Serilog.Sinks.TextWriter/Sinks/TextWriter/TextWriterSink.cs b/src/Serilog.Sinks.TextWriter/Sinks/TextWriter/TextWriterSink.cs index b218ad93e..e9f1f4944 100644 --- a/src/Serilog.Sinks.TextWriter/Sinks/TextWriter/TextWriterSink.cs +++ b/src/Serilog.Sinks.TextWriter/Sinks/TextWriter/TextWriterSink.cs @@ -18,15 +18,15 @@ using Serilog.Events; using Serilog.Formatting; -namespace Serilog.Sinks.IOTextWriter +namespace Serilog.Sinks.TextWriter { class TextWriterSink : ILogEventSink { - readonly TextWriter _textWriter; + readonly System.IO.TextWriter _textWriter; readonly ITextFormatter _textFormatter; readonly object _syncRoot = new object(); - public TextWriterSink(TextWriter textWriter, ITextFormatter textFormatter) + public TextWriterSink(System.IO.TextWriter textWriter, ITextFormatter textFormatter) { if (textFormatter == null) throw new ArgumentNullException(nameof(textFormatter)); _textWriter = textWriter; diff --git a/src/Serilog.Sinks.TextWriter/TextWriterLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.TextWriter/TextWriterLoggerConfigurationExtensions.cs index e0f6a76fe..0427ec541 100644 --- a/src/Serilog.Sinks.TextWriter/TextWriterLoggerConfigurationExtensions.cs +++ b/src/Serilog.Sinks.TextWriter/TextWriterLoggerConfigurationExtensions.cs @@ -4,7 +4,7 @@ using Serilog.Core; using Serilog.Events; using Serilog.Formatting.Display; -using Serilog.Sinks.IOTextWriter; +using Serilog.Sinks.TextWriter; namespace Serilog {