github · jcansdale · Nov 21, 2017 · Aug 25, 2017 · Aug 25, 2017 · Aug 25, 2017
diff --git a/.ncrunch/GitHub.Logging.v3.ncrunchproject b/.ncrunch/GitHub.Logging.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
diff --git a/GitHubVS.sln b/GitHubVS.sln
@@ -104,6 +104,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews.UnitTests", "test\GitHub.InlineReviews.UnitTests\GitHub.InlineReviews.UnitTests.csproj", "{17EB676B-BB91-48B5-AA59-C67695C647C2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{8D73575A-A89F-47CC-B153-B47DD06837F0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -403,6 +405,16 @@ Global
 		{17EB676B-BB91-48B5-AA59-C67695C647C2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17EB676B-BB91-48B5-AA59-C67695C647C2}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
 		{17EB676B-BB91-48B5-AA59-C67695C647C2}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
+		{8D73575A-A89F-47CC-B153-B47DD06837F0}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -94,6 +94,10 @@
       <Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
       <Name>GitHub.Extensions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
+      <Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
+      <Name>GitHub.Logging</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/src/GitHub.App/Api/ApiClient.cs b/src/GitHub.App/Api/ApiClient.cs
@@ -8,7 +8,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using GitHub.Primitives;
-using NLog;
 using Octokit;
 using Octokit.Reactive;
 using ReactiveUI;
@@ -18,14 +17,16 @@
 using System.Collections.Generic;
 using GitHub.Models;
 using GitHub.Extensions;
+using GitHub.Logging;
+using Serilog;
 
 namespace GitHub.Api
 {
     public partial class ApiClient : IApiClient
     {
         const string ScopesHeader = "X-OAuth-Scopes";
         const string ProductName = Info.ApplicationInfo.ApplicationDescription;
-        static readonly Logger log = LogManager.GetCurrentClassLogger();
+        static readonly ILogger log = LogManager.ForContext<ApiClient>();
 
         readonly IObservableGitHubClient gitHubClient;
         // There are two sets of authorization scopes, old and new:
@@ -187,7 +188,7 @@ static string GetSha256Hash(string input)
             }
             catch (Exception e)
             {
-                log.Error("IMPOSSIBLE! Generating Sha256 hash caused an exception.", e);
+                log.Error(e, "IMPOSSIBLE! Generating Sha256 hash caused an exception");
                 return null;
             }
         }
@@ -205,14 +206,14 @@ static string GetMachineNameSafe()
             }
             catch (Exception e)
             {
-                log.Info("Failed to retrieve host name using `DNS.GetHostName`.", e);
+                log.Information(e, "Failed to retrieve host name using `DNS.GetHostName`");
                 try
                 {
                     return Environment.MachineName;
                 }
                 catch (Exception ex)
                 {
-                    log.Info("Failed to retrieve host name using `Environment.MachineName`.", ex);
+                    log.Warning(ex, "Failed to retrieve host name using `Environment.MachineName`");
                     return "(unknown)";
                 }
             }
@@ -233,7 +234,7 @@ static string GetMachineIdentifier()
             }
             catch (Exception e)
             {
-                log.Info("Could not retrieve MAC address. Fallback to using machine name.", e);
+                log.Warning(e, "Could not retrieve MAC address. Fallback to using machine name");
                 return GetMachineNameSafe();
             }
         }

diff --git a/src/GitHub.App/Caches/ImageCache.cs b/src/GitHub.App/Caches/ImageCache.cs
@@ -11,16 +11,18 @@
 using GitHub.Extensions;
 using GitHub.Extensions.Reactive;
 using GitHub.Factories;
+using GitHub.Logging;
 using GitHub.Services;
 using Rothko;
+using Serilog;
 
 namespace GitHub.Caches
 {
     [Export(typeof(IImageCache))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public sealed class ImageCache : IImageCache
     {
-        static readonly NLog.Logger log = NLog.LogManager.GetCurrentClassLogger();
+        static readonly ILogger log = LogManager.ForContext<ImageCache>();
 
         public const string ImageCacheFileName = "images.cache.db";
         readonly IObservable<IBlobCache> cacheFactory;
@@ -159,7 +161,7 @@ static IObservable<Unit> VacuumIfNecessary(IBlobCache blobCache, bool force = fa
                 .SelectMany(Observable.Defer(() => blobCache.Insert(key, new byte[] { 1 })))
                 .Catch<Unit, Exception>(ex =>
                 {
-                    log.Error("Could not vacuum image cache", ex);
+                    log.Error(ex, "Could not vacuum image cache");
                     return Observable.Return(Unit.Default);
                 })
                 .AsCompletion();

diff --git a/src/GitHub.App/Caches/SharedCache.cs b/src/GitHub.App/Caches/SharedCache.cs
@@ -4,7 +4,8 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using Akavache;
-using NLog;
+using GitHub.Logging;
+using Serilog;
 
 namespace GitHub.Caches
 {
@@ -16,7 +17,7 @@ namespace GitHub.Caches
     public class SharedCache : ISharedCache
     {
         const string enterpriseHostApiBaseUriCacheKey = "enterprise-host-api-base-uri";
-        static readonly Logger log = LogManager.GetCurrentClassLogger();
+        static readonly ILogger log = LogManager.ForContext<SharedCache>();
 
         static SharedCache()
         {
@@ -26,7 +27,7 @@ static SharedCache()
             }
             catch (Exception e)
             {
-                log.Error("Error while running the static inializer for SharedCache", e);
+                log.Error(e, "Error while running the static inializer for SharedCache");
             }
         }
 
@@ -87,7 +88,7 @@ static IBlobCache GetBlobCacheWithFallback(Func<IBlobCache> blobCacheFunc, strin
             }
             catch (Exception e)
             {
-                log.Error(string.Format(CultureInfo.InvariantCulture, "Failed to set the {0} cache.", cacheName), e);
+                log.Error(e, "Failed to set the {CacheName} cache", cacheName);
                 return new InMemoryBlobCache();
             }
         }

diff --git a/src/GitHub.App/Controllers/UIController.cs b/src/GitHub.App/Controllers/UIController.cs
@@ -16,6 +16,7 @@
 using System.Reactive.Subjects;
 using System.Reactive.Threading.Tasks;
 using System.Windows;
+using GitHub.Logging;
 
 namespace GitHub.Controllers
 {
@@ -167,12 +168,12 @@ public UIController(IGitHubServiceProvider gitHubServiceProvider,
                 var waitDispatcher = RxApp.MainThreadScheduler as WaitForDispatcherScheduler;
                 if (waitDispatcher != null)
                 {
-                    Debug.Assert(DispatcherScheduler.Current.Dispatcher == Application.Current.Dispatcher,
+                    Log.Assert(DispatcherScheduler.Current.Dispatcher == Application.Current.Dispatcher,
                        "DispatcherScheduler is set correctly");
                 }
                 else
                 {
-                    Debug.Assert(((DispatcherScheduler)RxApp.MainThreadScheduler).Dispatcher == Application.Current.Dispatcher,
+                    Log.Assert(((DispatcherScheduler)RxApp.MainThreadScheduler).Dispatcher == Application.Current.Dispatcher,
                         "The MainThreadScheduler is using the wrong dispatcher");
                 }
             }
@@ -218,7 +219,7 @@ public void Start()
                 if (selectedFlow != UIControllerFlow.Authentication)
                     gitHubServiceProvider.AddService(this, connection);
                 else // sanity check: it makes zero sense to pass a connection in when calling the auth flow
-                    Debug.Assert(false, "Calling the auth flow with a connection makes no sense!");
+                    Log.Assert(false, "Calling the auth flow with a connection makes no sense!");
 
                 hosts.EnsureInitialized().ToObservable()
                     .ObserveOn(RxApp.MainThreadScheduler)

diff --git a/src/GitHub.App/Factories/ApiClientFactory.cs b/src/GitHub.App/Factories/ApiClientFactory.cs
@@ -18,11 +18,10 @@ public class ApiClientFactory : IApiClientFactory
         readonly ProductHeaderValue productHeader;
 
         [ImportingConstructor]
-        public ApiClientFactory(IKeychain keychain, IProgram program, ILoggingConfiguration config)
+        public ApiClientFactory(IKeychain keychain, IProgram program)
         {
             Keychain = keychain;
             productHeader = program.ProductHeader;
-            config.Configure();
         }
 
         public Task<IGitHubClient> CreateGitHubClient(HostAddress hostAddress)

diff --git a/src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs b/src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs
@@ -1,20 +1,21 @@
 using Akavache;
 using Akavache.Sqlite3;
-using NLog;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Extensions;
+using GitHub.Logging;
+using Serilog;
 
 namespace GitHub.Factories
 {
     [Export(typeof(IBlobCacheFactory))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class SqlitePersistentBlobCacheFactory : IBlobCacheFactory
     {
-        static readonly Logger log = LogManager.GetCurrentClassLogger();
+        static readonly ILogger log = LogManager.ForContext<SqlitePersistentBlobCacheFactory>();
         Dictionary<string, IBlobCache> cache = new Dictionary<string, IBlobCache>();
 
         public IBlobCache CreateBlobCache(string path)
@@ -31,7 +32,7 @@ public IBlobCache CreateBlobCache(string path)
             }
             catch(Exception ex)
             {
-                log.Error("Error while creating SQLitePersistentBlobCache for {0}. {1}", path, ex);
+                log.Error(ex, "Error while creating SQLitePersistentBlobCache for {Path}", path);
                 return new InMemoryBlobCache();
             }
         }

diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -77,11 +77,12 @@
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
       <Private>True</Private>
@@ -140,7 +141,6 @@
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
     <Compile Include="Factories\UIFactory.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Infrastructure\LoggingConfiguration.cs" />
     <Compile Include="Models\PullRequestFileModel.cs" />
     <Compile Include="Models\PullRequestModel.cs" />
     <Compile Include="Resources.Designer.cs">
@@ -190,7 +190,6 @@
     <Compile Include="SampleData\SampleViewModels.cs" />
     <Compile Include="Api\ApiClient.cs" />
     <Compile Include="Factories\ApiClientFactory.cs" />
-    <None Include="Services\Browser.cs" />
     <Compile Include="Services\EnterpriseProbe.cs" />
     <Compile Include="Services\ErrorMap.cs" />
     <Compile Include="Services\ErrorMessage.cs" />
@@ -294,6 +293,10 @@
       <Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
       <Name>GitHub.Extensions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
+      <Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
+      <Name>GitHub.Logging</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
       <Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
       <Name>GitHub.UI.Reactive</Name>
@@ -305,6 +308,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\SerilogAnalyzer.0.12.0.0\analyzers\dotnet\cs\SerilogAnalyzer.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/src/GitHub.App/Infrastructure/LoggingConfiguration.cs b/src/GitHub.App/Infrastructure/LoggingConfiguration.cs
diff --git a/src/GitHub.App/Models/RepositoryHost.cs b/src/GitHub.App/Models/RepositoryHost.cs
@@ -2,16 +2,20 @@
 using System.Diagnostics;
 using GitHub.Api;
 using GitHub.Extensions;
+using GitHub.Logging;
 using GitHub.Primitives;
 using GitHub.Services;
 using ReactiveUI;
+using Serilog;
 using static System.FormattableString;
 
 namespace GitHub.Models
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class RepositoryHost : ReactiveObject, IRepositoryHost
     {
+        static readonly ILogger log = LogManager.ForContext<RepositoryHosts>();
+
         readonly IConnection connection;
 
         public RepositoryHost(