Merge line ending normalization.

Author: nblumhardt

.gitignore

@@ -194,3 +194,4 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+*.orig

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/Program.cs.orig

@@ -0,0 +1,75 @@
+using System;
+<<<<<<< HEAD
+using Microsoft.Framework.Logging;
+using ILogger = Microsoft.Framework.Logging.ILogger;
+=======
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+>>>>>>> 16befd32de7d8bb67a17565271e1d2f87d1b4854
+using Serilog;
+
+namespace Sample
+{
+    public class Program
+    {
+        private readonly ILogger _logger;
+
+        public Program()
+        {
+            Log.Logger = new LoggerConfiguration()
+                .MinimumLevel.Debug()
+#if DNXCORE50
+                .WriteTo.TextWriter(Console.Out)
+#else
+                .Enrich.WithMachineName()
+                .Enrich.WithProcessId()
+                .Enrich.WithThreadId()
+                .WriteTo.ColoredConsole()
+#endif
+                .CreateLogger();
+
+            _logger = new LoggerFactory()
+                .AddSerilog()
+                .CreateLogger(typeof(Program).FullName);
+        }
+
+        public void Main(string[] args)
+        {
+            _logger.LogInformation("Starting");
+
+            var startTime = DateTimeOffset.UtcNow;
+            _logger.LogInformation(1, "Started at {StartTime} and 0x{Hello:X} is hex of 42", startTime, 42);
+
+            try
+            {
+                throw new Exception("Boom");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical("Unexpected critical error starting application", ex);
+                _logger.Log(LogLevel.Critical, 0, "Unexpected critical error", ex, null);
+                // This write should not log anything
+                _logger.Log(LogLevel.Critical, 0, null, null, null);
+                _logger.LogError("Unexpected error", ex);
+                _logger.LogWarning("Unexpected warning", ex);
+            }
+
+            using (_logger.BeginScope("Main"))
+            {
+                _logger.LogInformation("Waiting for user input");
+                var key = Console.Read();
+                _logger.LogInformation("User pressed {@KeyInfo}", new { Key = key, KeyChar = (char)key });
+            }
+
+            var endTime = DateTimeOffset.UtcNow;
+            _logger.LogInformation(2, "Stopping at {StopTime}", endTime);
+
+            _logger.LogInformation("Stopping");
+
+            _logger.LogInformation(Environment.NewLine);
+            _logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "RESULT", "START TIME", "END TIME", "DURATION(ms)");
+            _logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "------", "----- ----", "--- ----", "------------");
+            _logger.LogInformation("{Result,-10:l}{StartTime,15:mm:s tt}{EndTime,15:mm:s tt}{Duration,15}", "SUCCESS", startTime, endTime, (endTime - startTime).TotalMilliseconds);
+        }
+    }
+}

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"
       }
     }
   }