Merge branch 'dev'

# Conflicts:
#	src/Serilog.Extensions.Logging/project.json

Author: nblumhardt

README.md

@@ -1,5 +1,5 @@
 # Serilog.Extensions.Logging 
-[![Build status](https://ci.appveyor.com/api/projects/status/865nohxfiq1rnby0/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-extensions-logging/branch/master) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Extensions.Logging.svg?style=flat)](https://www.nuget.org/packages/Serilog.Extensions.Logging/) 
+[![Build status](https://ci.appveyor.com/api/projects/status/865nohxfiq1rnby0/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-framework-logging/history) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Extensions.Logging.svg?style=flat)](https://www.nuget.org/packages/Serilog.Extensions.Logging/) 
 
 
 A Serilog provider for [Microsoft.Extensions.Logging](https://www.nuget.org/packages/Microsoft.Extensions.Logging), the logging subsystem used by ASP.NET Core.
@@ -11,8 +11,8 @@ This package routes ASP.NET log messages through Serilog, so you can get informa
 **First**, install the _Serilog.Extensions.Logging_ [NuGet package](https://www.nuget.org/packages/Serilog.Extensions.Logging) into your web or console app. You will need a way to view the log messages - _Serilog.Sinks.Literate_ writes these to the console.
 
 ```powershell
-Install-Package Serilog.Extensions.Logging
-Install-Package Serilog.Sinks.Literate
+Install-Package Serilog.Extensions.Logging -Pre -DependencyVersion Highest
+Install-Package Serilog.Sinks.Literate -Pre
 ```
 
 **Next**, in your application's `Startup` method, configure Serilog first:
@@ -25,13 +25,15 @@ public class Startup
   public Startup(IHostingEnvironment env)
   {
     Log.Logger = new LoggerConfiguration()
+      .Enrich.FromLogContext()
       .WriteTo.LiterateConsole()
       .CreateLogger();
 
     // Other startup code
 ```
 
-**Finally**, in your `Startup` class's `Configure()` method, call `AddSerilog()` on the provided `loggerFactory`.
+**Finally**, in your `Startup` class's `Configure()` method, remove the existing logger configuration entries and
+call `AddSerilog()` on the provided `loggerFactory`.
 
 ```csharp
   public void Configure(IApplicationBuilder app,
@@ -56,19 +58,6 @@ That's it! With the level bumped up a little you should see log output like:
 2015-05-15 22:14:45.741 +10:00 [DBG] Handled. Status code: 304 File: /css/site.css
 ```
 
-### Levels
-
-If you want to get more information from the log you'll need to bump up the level.
-
-Two things:
-
- * You need to set `MinimumLevel` on **both** the Serilog `LoggerConfiguration` and the `ILoggerFactory`
- * Serilog and ASP.NET assign different priorities to the `Debug` and `Verbose` levels; Serilog's `Debug` is ASP.NET's `Verbose`, and vice-versa
-
-### Building from source
-
-To build the `dev` branch, which tracks the `dev` branch of _Microsoft.Extensions.Logging_, you must add https://www.myget.org/F/aspnetvnext/ to your package sources.
-
 ### Credits
 
 This package evolved from an earlier package _Microsoft.Framework.Logging.Serilog_ [provided by the ASP.NET team](https://github.com/aspnet/Logging/pull/182).

appveyor.yml

@@ -3,9 +3,9 @@ image: Visual Studio 2015
 configuration: Release
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" -OutFile ".\build\installcli.ps1"
+  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath'
+  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-002823'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
 - ps: ./Build.ps1

samples/Sample/project.json

@@ -5,15 +5,12 @@
   },
   "dependencies": {
     "Serilog.Extensions.Logging": { "target": "project" },
-    "Serilog.Sinks.Literate": "2.0.0-rc-25"
+    "Serilog.Sinks.Literate": "2.0.0-rc-25",
+    "Microsoft.Extensions.Logging": "1.0.0-rc2-final"
   },
 
   "frameworks": {
-    "net4.6": {
-      "frameworkAssemblies": {
-        "System.Runtime": ""
-      }
-    },
+    "net4.6": {},
     "netcoreapp1.0": {
       "define": [ "ASYNCLOCAL" ],
       "dependencies": {

samples/WebSample/Controllers/HomeController.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Serilog;
 
 namespace WebSample.Controllers
 {
@@ -17,6 +18,8 @@ public IActionResult About()
         {
             ViewData["Message"] = "Your application description page.";
 
+            Log.Information("This is a Serilog-native event from the About action");
+
             return View();
         }
 

samples/WebSample/Startup.cs

@@ -22,6 +22,7 @@ public Startup(IHostingEnvironment env)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
+                .Enrich.FromLogContext()
                 .WriteTo.Seq("http://localhost:5341")
                 .CreateLogger();
 

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs

@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Serilog.Core;
 using Serilog.Events;
 using FrameworkLogger = Microsoft.Extensions.Logging.ILogger;
@@ -16,7 +15,6 @@ namespace Serilog.Extensions.Logging
     class SerilogLogger : FrameworkLogger
     {
         readonly SerilogLoggerProvider _provider;
-        readonly string _name;
         readonly ILogger _logger;
 
         static readonly MessageTemplateParser _messageTemplateParser = new MessageTemplateParser();
@@ -28,13 +26,12 @@ public SerilogLogger(
         {
             if (provider == null) throw new ArgumentNullException(nameof(provider));
             _provider = provider;
-            _name = name;
             _logger = logger;
 
             // If a logger was passed, the provider has already added itself as an enricher
             _logger = _logger ?? Serilog.Log.Logger.ForContext(new[] { provider });
 
-            if (_name != null)
+            if (name != null)
             {
                 _logger = _logger.ForContext(Constants.SourceContextPropertyName, name);
             }
@@ -47,7 +44,7 @@ public bool IsEnabled(LogLevel logLevel)
 
         public IDisposable BeginScope<TState>(TState state)
         {
-            return _provider.BeginScope(_name, state);
+            return _provider.BeginScope(state);
         }
 
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
@@ -61,6 +58,8 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             var logger = _logger;
             string messageTemplate = null;
 
+            var properties = new List<LogEventProperty>();
+
             var structure = state as IEnumerable<KeyValuePair<string, object>>;
             if (structure != null)
             {
@@ -72,11 +71,15 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                     }
                     else if (property.Key.StartsWith("@"))
                     {
-                        logger = logger.ForContext(property.Key.Substring(1), property.Value, destructureObjects: true);
+                        LogEventProperty destructured;
+                        if (logger.BindProperty(property.Key.Substring(1), property.Value, true, out destructured))
+                            properties.Add(destructured);
                     }
                     else
                     {
-                        logger = logger.ForContext(property.Key, property.Value);
+                        LogEventProperty bound;
+                        if (logger.BindProperty(property.Key, property.Value, false, out bound))
+                            properties.Add(bound);
                     }                    
                 }
 
@@ -86,24 +89,28 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 if (messageTemplate == null && !stateTypeInfo.IsGenericType)
                 {
                     messageTemplate = "{" + stateType.Name + ":l}";
-                    logger = logger.ForContext(stateType.Name, AsLoggableValue(state, formatter));
+                    LogEventProperty stateTypeProperty;
+                    if (logger.BindProperty(stateType.Name, AsLoggableValue(state, formatter), false, out stateTypeProperty))
+                        properties.Add(stateTypeProperty);
                 }
             }
 
             if (messageTemplate == null && state != null)
             {
                 messageTemplate = "{State:l}";
-                logger = logger.ForContext("State", AsLoggableValue(state, formatter));
+                LogEventProperty stateProperty;
+                if (logger.BindProperty("State", AsLoggableValue(state, formatter), false, out stateProperty))
+                    properties.Add(stateProperty);
             }
 
             if (string.IsNullOrEmpty(messageTemplate))
                 return;
 
-            if (eventId.Id != 0)
-                logger = logger.ForContext("EventId", eventId);
+            if (eventId.Id != 0 || eventId.Name != null)
+                properties.Add(CreateEventIdProperty(eventId));
 
             var parsedTemplate = _messageTemplateParser.Parse(messageTemplate);
-            var evt = new LogEvent(DateTimeOffset.Now, level, exception, parsedTemplate, Enumerable.Empty<LogEventProperty>());
+            var evt = new LogEvent(DateTimeOffset.Now, level, exception, parsedTemplate, properties);
             logger.Write(evt);
         }
 
@@ -135,5 +142,22 @@ static LogEventLevel ConvertLevel(LogLevel logLevel)
                     return LogEventLevel.Verbose;
             }
         }
+
+        static LogEventProperty CreateEventIdProperty(EventId eventId)
+        {
+            var properties = new List<LogEventProperty>(2);
+
+            if (eventId.Id != 0)
+            {
+                properties.Add(new LogEventProperty("Id", new ScalarValue(eventId.Id)));
+            }
+
+            if (eventId.Name != null)
+            {
+                properties.Add(new LogEventProperty("Name", new ScalarValue(eventId.Name)));
+            }
+
+            return new LogEventProperty("EventId", new StructureValue(properties));
+        }
     }
 }

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs

@@ -2,8 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
+#if ASYNCLOCAL
 using System.Threading;
+#else
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+#endif
 using Microsoft.Extensions.Logging;
 using Serilog.Core;
 using Serilog.Events;
@@ -15,8 +19,6 @@ class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher
     {
         public const string OriginalFormatPropertyName = "{OriginalFormat}";
 
-        readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
-
         // May be null; if it is, Log.Logger will be lazily used
         readonly ILogger _logger;
 
@@ -31,30 +33,22 @@ public FrameworkLogger CreateLogger(string name)
             return new SerilogLogger(this, _logger, name);
         }
 
-        public IDisposable BeginScope<T>(string name, T state)
+        public IDisposable BeginScope<T>(T state)
         {
-            return new SerilogLoggerScope(this, name, state);
+            return new SerilogLoggerScope(this, state);
         }
 
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
         {
             for (var scope = CurrentScope; scope != null; scope = scope.Parent)
             {
-                var stateStructure = scope.State as IEnumerable<KeyValuePair<string, object>>;
-                if (stateStructure != null)
-                {
-                    foreach (var keyValue in stateStructure)
-                    {
-                        if (keyValue.Key == OriginalFormatPropertyName && keyValue.Value is string)
-                            continue;
-
-                        var property = propertyFactory.CreateProperty(keyValue.Key, keyValue.Value);
-                        logEvent.AddPropertyIfAbsent(property);
-                    }
-                }
+                scope.Enrich(logEvent, propertyFactory);
             }
         }
 
+#if ASYNCLOCAL
+        readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
+
         public SerilogLoggerScope CurrentScope
         {
             get
@@ -66,6 +60,22 @@ public SerilogLoggerScope CurrentScope
                 _value.Value = value;
             }
         }
+#else
+        readonly string _currentScopeKey = nameof(SerilogLoggerScope) + "#" + Guid.NewGuid().ToString("n");
+
+        public SerilogLoggerScope CurrentScope
+        {
+            get
+            {
+                var objectHandle = CallContext.LogicalGetData(_currentScopeKey) as ObjectHandle;
+                return objectHandle?.Unwrap() as SerilogLoggerScope;
+            }
+            set
+            {
+                CallContext.LogicalSetData(_currentScopeKey, new ObjectHandle(value));
+            }
+        }
+#endif
 
         public void Dispose() { }
     }