Removed awkward namespace clashes; added simple in memory sink to enable phone/Win8 testing.

Author: nblumhardt

src/Serilog.FullNetFx/LoggerConfigurationFullNetFxExtensions.cs

@@ -16,11 +16,11 @@
 using Serilog.Configuration;
 using Serilog.Events;
 using Serilog.Formatting.Display;
+using Serilog.Sinks.DiagnosticTrace;
 using Serilog.Sinks.DumpFile;
-using Serilog.Sinks.File;
+using Serilog.Sinks.IOFile;
 using Serilog.Sinks.RollingFile;
 using Serilog.Sinks.SystemConsole;
-using Serilog.Sinks.Trace;
 
 namespace Serilog
 {

src/Serilog.FullNetFx/Serilog.FullNetFx.csproj

@@ -48,10 +48,10 @@
     <Compile Include="LoggerConfigurationFullNetFxExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Sinks\DumpFile\DumpFileSink.cs" />
-    <Compile Include="Sinks\File\FileSink.cs" />
+    <Compile Include="Sinks\IOFile\FileSink.cs" />
     <Compile Include="Sinks\RollingFile\RollingFileSink.cs" />
     <Compile Include="Sinks\SystemConsole\ConsoleSink.cs" />
-    <Compile Include="Sinks\Trace\DiagnosticTraceSink.cs" />
+    <Compile Include="Sinks\DiagnosticTrace\DiagnosticTraceSink.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\assets\Serilog.snk">

src/Serilog.FullNetFx/Sinks/Trace/DiagnosticTraceSink.cs src/Serilog.FullNetFx/Sinks/DiagnosticTrace/DiagnosticTraceSink.cs

@@ -13,12 +13,13 @@
 // limitations under the License.
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
 
-namespace Serilog.Sinks.Trace
+namespace Serilog.Sinks.DiagnosticTrace
 {
     class DiagnosticTraceSink : ILogEventSink
     {
@@ -35,7 +36,7 @@ public void Emit(LogEvent logEvent)
             if (logEvent == null) throw new ArgumentNullException("logEvent");
             var sr = new StringWriter();
             _textFormatter.Format(logEvent, sr);
-            System.Diagnostics.Trace.Write(sr.ToString());
+            Trace.Write(sr.ToString());
         }
     }
 }

src/Serilog.FullNetFx/Sinks/File/FileSink.cs src/Serilog.FullNetFx/Sinks/IOFile/FileSink.cs

@@ -18,7 +18,7 @@
 using Serilog.Events;
 using Serilog.Formatting;
 
-namespace Serilog.Sinks.File
+namespace Serilog.Sinks.IOFile
 {
     sealed class FileSink : ILogEventSink, IDisposable
     {
@@ -31,7 +31,7 @@ public FileSink(string path, ITextFormatter textFormatter)
             if (path == null) throw new ArgumentNullException("path");
             if (textFormatter == null) throw new ArgumentNullException("textFormatter");
             _textFormatter = textFormatter;
-            _output = new StreamWriter(System.IO.File.Open(path, FileMode.Append, FileAccess.Write, FileShare.Read));
+            _output = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write, FileShare.Read));
         }
 
         public void Emit(LogEvent logEvent)

src/Serilog.FullNetFx/Sinks/RollingFile/RollingFileSink.cs

@@ -16,7 +16,7 @@
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
-using Serilog.Sinks.File;
+using Serilog.Sinks.IOFile;
 
 namespace Serilog.Sinks.RollingFile
 {

src/Serilog/Configuration/LoggerSinkConfiguration.cs

@@ -13,8 +13,11 @@
 // limitations under the License.
 
 using System;
+using System.IO;
 using Serilog.Core;
 using Serilog.Events;
+using Serilog.Formatting.Display;
+using Serilog.Sinks.IOTextWriter;
 
 namespace Serilog.Configuration
 {
@@ -52,5 +55,22 @@ public LoggerConfiguration Sink(ILogEventSink logEventSink, LogEventLevel restri
             _addSink(sink);
             return _loggerConfiguration;
         }
+
+        /// <summary>
+        /// Write log events to the provided <see cref="TextWriter"/>.
+        /// </summary>
+        /// <param name="textWriter">The text writer to write log events to.</param>
+        /// <param name="outputTemplate">Message template describing the output format.</param>
+        /// <returns>Configuration object allowing method chaining.</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public LoggerConfiguration TextWriter(TextWriter textWriter, string outputTemplate = DefaultOutputTemplate)
+        {
+            if (textWriter == null) throw new ArgumentNullException("textWriter");
+            if (outputTemplate == null) throw new ArgumentNullException("outputTemplate");
+
+            var formatter = new MessageTemplateTextFormatter(outputTemplate);
+            _addSink(new TextWriterSink(textWriter, formatter));
+            return _loggerConfiguration;
+        }
     }
 }

src/Serilog/Serilog.csproj

@@ -94,16 +94,15 @@
     <Compile Include="Parsing\MessageTemplateParser.cs" />
     <Compile Include="Parsing\TextToken.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Sinks\IOTextWriter\TextWriterSink.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\assets\Serilog.snk">
       <Link>Serilog.snk</Link>
     </None>
     <None Include="Serilog.nuspec" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Sinks\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Serilog/Sinks/IOTextWriter/TextWriterSink.cs

@@ -0,0 +1,45 @@
+// Copyright 2013 Nicholas Blumhardt
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.IO;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting;
+
+namespace Serilog.Sinks.IOTextWriter
+{
+    class TextWriterSink : ILogEventSink
+    {
+        readonly TextWriter _textWriter;
+        readonly ITextFormatter _textFormatter;
+        readonly object _syncRoot = new object();
+
+        public TextWriterSink(TextWriter textWriter, ITextFormatter textFormatter)
+        {
+            if (textFormatter == null) throw new ArgumentNullException("textFormatter");
+            _textWriter = textWriter;
+            _textFormatter = textFormatter;
+        }
+
+        public void Emit(LogEvent logEvent)
+        {
+            if (logEvent == null) throw new ArgumentNullException("logEvent");
+            lock (_syncRoot)
+            {
+                _textFormatter.Format(logEvent, _textWriter);
+            }
+        }
+    }
+}

test/Serilog.Tests/Serilog.Tests.csproj

@@ -72,6 +72,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Sinks\File\FileSinkTests.cs" />
     <Compile Include="Sinks\RollingFile\RollingFileSinkTests.cs" />
+    <Compile Include="Sinks\TextWriter\TextWriterSinkTests.cs" />
     <Compile Include="Support\DelegatingEnricher.cs" />
     <Compile Include="Support\DelegatingSink.cs" />
     <Compile Include="Support\Extensions.cs" />

test/Serilog.Tests/Sinks/TextWriter/TextWriterSinkTests.cs

@@ -0,0 +1,26 @@
+using System.IO;
+using NUnit.Framework;
+using Serilog.Tests.Support;
+
+namespace Serilog.Tests.Sinks.TextWriter
+{
+    [TestFixture]
+    public class TextWriterSinkTests
+    {
+        [Test]
+        public void EventsAreWrittenToTheTextWriter()
+        {
+            var sw = new StringWriter();
+
+            var log = new LoggerConfiguration()
+                .WriteTo.TextWriter(sw)
+                .CreateLogger();
+
+            var mt = Some.String();
+            log.Information(mt);
+
+            var s = sw.ToString();
+            Assert.That(s.Contains(mt));
+        }
+    }
+}