Merge branch 'dev'

# Conflicts:
#	global.json
#	samples/Sample/Program.cs
#	samples/Sample/project.lock.json
#	src/Serilog.Framework.Logging/SerilogLogger.cs
#	src/Serilog.Framework.Logging/project.lock.json
#	test/Serilog.Framework.Logging.Tests/project.lock.json

Author: nblumhardt

global.json

@@ -1,6 +1,6 @@
 {
     "projects": [ "src", "test" ],
     "sdk": {
-        "version": "1.0.0-beta8"
+        "version": "1.0.0-rc1-final"
     }
 }

samples/Sample/Program.cs

@@ -1,6 +1,6 @@
 using System;
-using Microsoft.Framework.Logging;
-using ILogger = Microsoft.Framework.Logging.ILogger;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 using Serilog;
 
 namespace Sample

samples/Sample/project.json

@@ -7,7 +7,6 @@
   "licenseUrl": "",
 
   "dependencies": {
-    "Microsoft.Framework.Logging": "1.0.0-beta8",
     "Serilog.Framework.Logging": "1.0.0-*"
   },
 
@@ -19,11 +18,11 @@
     "dnx451": {},
     "dnxcore50": {
       "dependencies": {
-        "System.Console": "4.0.0-beta-23019",
-        "System.Collections": "4.0.10-beta-23019",
-        "System.Linq": "4.0.0-beta-23019",
-        "System.Threading": "4.0.10-beta-23019",
-        "Microsoft.CSharp": "4.0.0-beta-23019"
+        "System.Console": "4.0.0-beta-23516",
+        "System.Collections": "4.0.0",
+        "System.Linq": "4.0.0",
+        "System.Threading": "4.0.0",
+        "Microsoft.CSharp": "4.0.0"
       }
     }
   }