Skip to content

Commit

Permalink
Changed namespaces to match renamed sink projects
Browse files Browse the repository at this point in the history
  • Loading branch information
merbla committed Jan 22, 2016
1 parent 539ac6f commit 9c24d46
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions Serilog.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
using Serilog.Debugging;
using Serilog.Events;
using Serilog.Formatting.Display;
using Serilog.Sinks.IOFile;
using Serilog.Sinks.File;

namespace Serilog
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using System.Text;
using System.Threading;

namespace Serilog.Sinks.IOFile
namespace Serilog.Sinks.File
{
sealed class CharacterCountLimitedTextWriter : TextWriter
{
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Sinks.File/Sinks/File/FileSink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
using Serilog.Events;
using Serilog.Formatting;

namespace Serilog.Sinks.IOFile
namespace Serilog.Sinks.File
{
/// <summary>
/// Write log events to a disk file.
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Sinks.File/Sinks/File/NullSink.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using Serilog.Core;
using Serilog.Events;

namespace Serilog.Sinks.IOFile
namespace Serilog.Sinks.File
{
/// <summary>
/// An instance of this sink may be substituted when an instance of the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Serilog.Core;
using Serilog.Events;
using Serilog.Formatting.Display;
using Serilog.Sinks.IOTextWriter;
using Serilog.Sinks.TextWriter;

namespace Serilog
{
Expand Down

0 comments on commit 9c24d46

Please sign in to comment.