Merge pull request #30 from serilog/dev

2.2.0 Release

Author: nblumhardt

Diff for: .gitignore

@@ -194,3 +194,5 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+project.lock.json

Diff for: sample/Sample/appsettings.json

@@ -19,7 +19,7 @@
         "Name": "File",
         "Args": {
           "path": "%TEMP%\\Logs\\serilog-configuration-sample.txt",
-          "outputTemplate": "{Timestamp:o} [{Level,3:u}] ({Application}/{MachineName}/{ThreadId}) {Message}{NewLine}{Exception}"
+          "outputTemplate": "{Timestamp:o} [{Level:u3}] ({Application}/{MachineName}/{ThreadId}) {Message}{NewLine}{Exception}"
         }
       }
     ],

Diff for: sample/Sample/project.json

@@ -7,14 +7,14 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0",
     "Serilog.Settings.Configuration": {"target": "project"},
     "Serilog.Sinks.Literate": "2.0.0",
-    "Serilog.Sinks.File":  "2.1.0",
+    "Serilog.Sinks.RollingFile":  "3.0.0",
     "Serilog.Enrichers.Environment": "2.0.0",
     "Serilog.Enrichers.Thread":  "2.0.0"
   },
   "frameworks": {
     "net4.6": {
       "buildOptions": {
-        "preserveCompilationContext": true
+        "preserveCompilationContext": false
       }
     },
     "netcoreapp1.0": {