Merge branch 'dev'

Author: nblumhardt

README.md

@@ -1,4 +1,6 @@
-# Serilog.Framework.Logging [![Build status](https://ci.appveyor.com/api/projects/status/865nohxfiq1rnby0/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-framework-logging/branch/master)
+# Serilog.Framework.Logging 
+[![Build status](https://ci.appveyor.com/api/projects/status/865nohxfiq1rnby0/branch/master?svg=true)](https://ci.appveyor.com/project/serilog/serilog-framework-logging/branch/master) [![NuGet Version](http://img.shields.io/nuget/v/Serilog.Framework.Logging.svg?style=flat)](https://www.nuget.org/packages/Serilog.Framework.Logging/) 
+
 
 A serilog provider for [Microsoft.Framework.Logging](https://www.nuget.org/packages/Microsoft.Framework.Logging), the logging subsystem used by ASP.NET 5.
 

global.json

@@ -1,6 +1,6 @@
 {
     "projects": [ "src", "test" ],
     "sdk": {
-        "version": "1.0.0-beta5"
+        "version": "1.0.0-beta6"
     }
 }

samples/Sample/Program.cs

@@ -19,7 +19,7 @@ public Program()
                 .Enrich.WithMachineName()
                 .Enrich.WithProcessId()
                 .Enrich.WithThreadId()
-                .WriteTo.LiterateConsole()
+                .WriteTo.ColoredConsole()
 #endif
                 .CreateLogger();
 

samples/Sample/project.json

@@ -7,19 +7,16 @@
     "licenseUrl": "",
 
     "dependencies": {
-        "Microsoft.Framework.Logging": "1.0.0-beta5",
-        "Serilog.Framework.Logging": "1.0.0-*",
-        "Serilog.Sinks.Literate": "1.0.6"
+        "Microsoft.Framework.Logging": "1.0.0-beta6",
+        "Serilog.Framework.Logging": "1.0.0-*"
     },
 
     "commands": {
         "Sample": "Sample"
     },
 
     "frameworks": {
-        "dnx451": {
-            "Serilog.Framework.Logging": "1.0.0-*"
-        },
+        "dnx451": {},
         "dnxcore50": {
             "dependencies": {
                 "System.Console": "4.0.0-beta-23019",