Merge branch 'master' into fixes/long-publish-error-message

Author: StanleyGoldman

GitHub.Unity.sln.DotSettings

@@ -342,6 +342,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002ESettings_002EMigrations_002ERemoveBuildPolicyAlwaysMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionDefault/PlatformType/@EntryValue">x64</s:String>
 	</wpf:ResourceDictionary>

README.md

@@ -47,8 +47,8 @@ The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub int
 
 ### Requirements
 
-- Unity 5.4-5.6
-   - We've only tested the extension so far on Unity 5.4 to 5.6. There's currently an blocker issue opened for 5.3 support, so we know it doesn't run there. There are some issues for 2017.x, so it may or may not run well on that version. Personal edition is fine.
+- Unity 5.4-2017.1
+   - We've only tested the extension so far on Unity 5.4 to 2017.1. There's currently an blocker issue opened for 5.3 support, so we know it doesn't run there. There are some issues for 2017.2, so it may or may not run well on that version. Personal edition is fine.
 - Git and Git LFS 2.x
 
 #### Git on macOS

docs/contributing/how-to-build.md

@@ -9,14 +9,14 @@ This repository is LFS-enabled. To clone it, you should use a git client that su
 - Visual Studio 2015+ or Mono 4.x + bash shell (git bash).
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
-  - If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
+  - If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from `[Unity installation path]\Unity\Editor\Data\Managed` into the `lib` directory in order for the build to work
 
 ### MacOS
 
 - Mono 4.x required.
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
-  - If you've installed Unity in the default location of `/Applications/Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
+  - If you've installed Unity in the default location of `/Applications/Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from `[Unity installation path]/Unity.app/Contents/Managed` into the `lib` directory in order for the build to work
 
 ## How to Build
 
@@ -40,11 +40,11 @@ To be able to authenticate in GitHub for Unity, you'll need to:
 - [Register a new developer application](https://github.com/settings/developers) in your profile.
 - Copy [common/ApplicationInfo_Local.cs-example](../../common/ApplicationInfo_Local.cs-example) to `common/ApplicationInfo_Local.cs` and fill out the clientId/clientSecret fields for your application.
 
-The build needs to reference `UnityEngine.dll` and `UnityEditor.dll`. These DLLs are included with Unity. If you've installed Unity in the default location, the build will be able to find them automatically. If not, copy these DLLs from your Unity installation into the `lib` directory in order for the build to work.
+The build needs to reference `UnityEngine.dll` and `UnityEditor.dll`. These DLLs are included with Unity. If you've installed Unity in the default location, the build will be able to find them automatically. If not, copy these DLLs from `[your Unity installation path]\Unity\Editor\Data\Managed` into the `lib` directory in order for the build to work.
 
 ### Visual Studio
 
-To build with Visual Studio 2015 open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu.
+To build with Visual Studio 2015+, open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu.
 
 ### Mono and Bash (windows and mac)
 

src/GitHub.Api/Application/ApiClient.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Octokit;
 
@@ -27,14 +26,10 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
         private readonly IKeychain keychain;
         private readonly IGitHubClient githubClient;
         private readonly ILoginManager loginManager;
-        private static readonly SemaphoreSlim sem = new SemaphoreSlim(1);
 
         IList<Organization> organizationsCache;
         Octokit.User userCache;
 
-        string owner;
-        bool? isEnterprise;
-
         public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient)
         {
             Guard.ArgumentNotNull(hostUrl, nameof(hostUrl));

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -39,7 +39,7 @@ protected void Initialize()
             Logging.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(ProcessManager, TaskManager);
-            GitClient = new GitClient(Environment, ProcessManager, Platform.CredentialManager, TaskManager);
+            GitClient = new GitClient(Environment, ProcessManager, TaskManager);
             SetupMetrics();
         }
 
@@ -127,7 +127,7 @@ public void RestartRepository()
         {
             if (Environment.RepositoryPath != null)
             {
-                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, UsageTracker, GitClient, Environment.RepositoryPath);
+                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, Environment.RepositoryPath);
                 repositoryManager.Initialize();
                 Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -30,10 +30,8 @@ class RepositoryWatcher : IRepositoryWatcher
         private readonly CancellationToken cancellationToken;
         private readonly NPath[] ignoredPaths;
         private readonly ManualResetEventSlim pauseEvent;
-        private readonly bool disableNative;
         private NativeInterface nativeInterface;
         private bool running;
-        private Task task;
         private int lastCountOfProcessedEvents = 0;
         private bool processingEvents;
         private readonly ManualResetEventSlim signalProcessingEventsDone = new ManualResetEventSlim(false);
@@ -68,8 +66,7 @@ public void Initialize()
 
             try
             {
-                if (!disableNative)
-                    nativeInterface = new NativeInterface(pathsRepositoryPath);
+                nativeInterface = new NativeInterface(pathsRepositoryPath);
             }
             catch (Exception ex)
             {
@@ -79,12 +76,6 @@ public void Initialize()
 
         public void Start()
         {
-            if (disableNative)
-            {
-                Logger.Trace("Native interface is disabled");
-                return;
-            }
-
             if (nativeInterface == null)
             {
                 Logger.Warning("NativeInterface is null");
@@ -95,7 +86,7 @@ public void Start()
 
             running = true;
             pauseEvent.Reset();
-            task = Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
+            Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
         }
 
         public void Stop()

src/GitHub.Api/Git/GitClient.cs

@@ -23,6 +23,8 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
+        ITask<string[]> GetConfigUserAndEmail();
+
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
 
@@ -87,16 +89,13 @@ class GitClient : IGitClient
     {
         private readonly IEnvironment environment;
         private readonly IProcessManager processManager;
-        private readonly ICredentialManager credentialManager;
         private readonly ITaskManager taskManager;
         private readonly CancellationToken cancellationToken;
 
-        public GitClient(IEnvironment environment, IProcessManager processManager,
-            ICredentialManager credentialManager, ITaskManager taskManager)
+        public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager)
         {
             this.environment = environment;
             this.processManager = processManager;
-            this.credentialManager = credentialManager;
             this.taskManager = taskManager;
             this.cancellationToken = taskManager.Token;
         }
@@ -242,7 +241,7 @@ public ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null)
 
         public ITask<string> GetConfig(string key, GitConfigSource configSource, IOutputProcessor<string> processor = null)
         {
-            Logger.Trace("GetConfig");
+            Logger.Trace("GetConfig: {0}", key);
 
             return new GitConfigGetTask(key, configSource, cancellationToken, processor)
                 .Configure(processManager);
@@ -256,6 +255,28 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
+        public ITask<string[]> GetConfigUserAndEmail()
+        {
+            string username = null;
+            string email = null;
+
+            return GetConfig("user.name", GitConfigSource.User).Then((success, value) => {
+                if (success)
+                {
+                    username = value;
+                }
+
+            }).Then(GetConfig("user.email", GitConfigSource.User).Then((success, value) => {
+                if (success)
+                {
+                    email = value;
+                }
+            })).Then(success => {
+                Logger.Trace("user.name:{1} user.email:{2}", success, username, email);
+                return new[] { username, email };
+            });
+        }
+
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             Logger.Trace("ListLocks");

src/GitHub.Api/Git/GitConfig.cs

@@ -216,16 +216,16 @@ public string GetString(string key)
             public int GetInt(string key)
             {
                 var value = this[key];
-                var result = 0;
-                var success = int.TryParse(value, out result);
+                int result = 0;
+                int.TryParse(value, out result);
                 return result;
             }
 
             public float GetFloat(string key)
             {
                 var value = this[key];
-                var result = 0F;
-                var success = float.TryParse(value, out result);
+                float result = 0F;
+                float.TryParse(value, out result);
                 return result;
             }
 

src/GitHub.Api/Git/GitCredentialManager.cs

@@ -11,14 +11,12 @@ class GitCredentialManager : ICredentialManager
         private ICredential credential;
         private string credHelper = null;
 
-        private readonly IEnvironment environment;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
 
-        public GitCredentialManager(IEnvironment environment, IProcessManager processManager,
+        public GitCredentialManager(IProcessManager processManager,
             ITaskManager taskManager)
         {
-            this.environment = environment;
             this.processManager = processManager;
             this.taskManager = taskManager;
         }

src/GitHub.Api/Git/Repository.cs

@@ -85,7 +85,7 @@ public ITask SetupRemote(string remote, string remoteUrl)
         public ITask<List<GitLogEntry>> Log()
         {
             if (repositoryManager == null)
-                return new FuncListTask<GitLogEntry>(TaskHelpers.GetCompletedTask(new List<GitLogEntry>()));
+                return new FuncListTask<GitLogEntry>(new NotReadyException().ToTask<List<GitLogEntry>>());
 
             return repositoryManager.Log();
         }
@@ -123,7 +123,7 @@ public ITask Revert(string changeset)
         public ITask ListLocks()
         {
             if (repositoryManager == null)
-                return new ActionTask(TaskExtensions.CompletedTask);
+                return new ActionTask(new NotReadyException().ToTask<bool>());
             return repositoryManager.ListLocks(false);
         }