Merge pull request #577 from github-for-unity/fixes/names-are-hard

GitHub.Logging naming fixes

Author: StanleyGoldman

script

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
@@ -20,7 +20,7 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
                 new GitHubClient(ApplicationConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
         }
 
-        private static readonly ILogging logger = Logging.GetLogger<ApiClient>();
+        private static readonly ILogging logger = LogHelper.GetLogger<ApiClient>();
         public HostAddress HostAddress { get; }
         public UriString OriginalUrl { get; }
 

src/GitHub.Api/Application/ApiClient.cs

@@ -3,13 +3,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
     abstract class ApplicationManagerBase : IApplicationManager
     {
-        protected static ILogging Logger { get; } = Logging.GetLogger<IApplicationManager>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<IApplicationManager>();
 
         private RepositoryManager repositoryManager;
 
@@ -36,7 +36,7 @@ protected void Initialize()
             LocalSettings.Initialize();
             SystemSettings.Initialize();
 
-            Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
+            LogHelper.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(ProcessManager, TaskManager);
             GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
@@ -23,7 +23,7 @@ class Keychain : IKeychain
     {
         const string ConnectionFile = "connections.json";
 
-        private readonly ILogging logger = Logging.GetLogger<Keychain>();
+        private readonly ILogging logger = LogHelper.GetLogger<Keychain>();
 
         private readonly ICredentialManager credentialManager;
         private readonly NPath cachePath;

src/GitHub.Api/Authentication/Keychain.cs

@@ -2,7 +2,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using Octokit;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
@@ -20,7 +20,7 @@ public enum LoginResultCodes
     /// </summary>
     class LoginManager : ILoginManager
     {
-        private readonly ILogging logger = Logging.GetLogger<LoginManager>();
+        private readonly ILogging logger = LogHelper.GetLogger<LoginManager>();
 
         private readonly string[] scopes = { "user", "repo", "gist", "write:public_key" };
         private readonly IKeychain keychain;

src/GitHub.Api/Authentication/LoginManager.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using sfw.net;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
@@ -294,7 +294,7 @@ public void Dispose()
             Dispose(true);
         }
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<RepositoryWatcher>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<RepositoryWatcher>();
 
         private enum EventType
         {

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -1,4 +1,4 @@
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -402,7 +402,7 @@ public ITask<string> Unlock(string file, bool force,
                 .Configure(processManager);
         }
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<GitClient>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<GitClient>();
     }
 
     public struct GitUser

src/GitHub.Api/Git/GitClient.cs

@@ -1,4 +1,4 @@
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -7,7 +7,7 @@ namespace GitHub.Unity
 {
     class GitCredentialManager : ICredentialManager
     {
-        private static ILogging Logger { get; } = Logging.GetLogger<GitCredentialManager>();
+        private static ILogging Logger { get; } = LogHelper.GetLogger<GitCredentialManager>();
 
         private ICredential credential;
         private string credHelper = null;

src/GitHub.Api/Git/GitCredentialManager.cs

@@ -1,4 +1,4 @@
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -626,7 +626,7 @@ public bool IsGitHub
             "{0} Owner: {1} Name: {2} CloneUrl: {3} LocalPath: {4} Branch: {5} Remote: {6}", GetHashCode(), Owner, Name,
             CloneUrl, LocalPath, CurrentBranch, CurrentRemote);
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<Repository>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<Repository>();
     }
 
     public interface IUser
@@ -751,7 +751,7 @@ private void UpdateUserAndEmail()
                      }).Start();
         }
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<User>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<User>();
     }
 
     [Serializable]

src/GitHub.Api/Git/Repository.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Octokit;
-using GitHub.Unity.Logs;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
@@ -595,6 +595,6 @@ private set
             }
         }
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<RepositoryManager>();
+        protected static ILogging Logger { get; } = LogHelper.GetLogger<RepositoryManager>();
     }
 }