Merge branch 'enhancements/async-git-setup' into enhancements/git-setup-download

# Conflicts:
#	src/tests/IntegrationTests/BasePlatformIntegrationTest.cs

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -110,90 +110,6 @@ public void Run(bool firstRun)
             }) );
         }
 
-        private ITask SetupGit()
-        {
-            return BuildDetermineGitPathTask()
-                .Then((b, path) => {
-                    Logger.Trace("Setting GitExecutablePath: {0}", path);
-                    Environment.GitExecutablePath = path;
-                })
-                .Then(() => {
-                    if (Environment.GitExecutablePath == null)
-                    {
-                        if (Environment.IsWindows)
-                        {
-                            GitClient.GetConfig("credential.helper", GitConfigSource.Global).Then(
-                                (b, credentialHelper) => {
-                                    if (!string.IsNullOrEmpty(credentialHelper))
-                                    {
-                                        Logger.Trace("Windows CredentialHelper: {0}", credentialHelper);
-                                    }
-                                    else
-                                    {
-                                        Logger.Warning(
-                                            "No Windows CredentialHeloper found: Setting to wincred");
-
-                                        GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global).Start().Wait();
-                                    }
-                                });
-                        }
-                    }
-                })
-                .ThenInUI(() => {
-                    Environment.User.Initialize(GitClient);
-                });
-        }
-
-        private TaskBase<NPath> BuildDetermineGitPathTask()
-        {
-            TaskBase<NPath> determinePath = new FuncTask<NPath>(CancellationToken, () => {
-                if (Environment.GitExecutablePath != null)
-                {
-                    return Environment.GitExecutablePath;
-                }
-
-                var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
-                if (gitExecutablePath != null && gitExecutablePath.FileExists())
-                {
-                    Logger.Trace("Using git install path from settings");
-                    return gitExecutablePath;
-                }
-
-                return null;
-            });
-
-            var environmentIsWindows = Environment.IsWindows;
-            if (environmentIsWindows)
-            {
-                var applicationDataPath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
-                var installDetails = new GitInstallDetails(applicationDataPath, true);
-                var installTask = new PortableGitInstallTask(CancellationToken, Environment, installDetails);
-
-                determinePath = determinePath.Then(new ShortCircuitTask<NPath>(CancellationToken, installTask));
-            }
-
-            if (!environmentIsWindows)
-            {
-                determinePath = determinePath.Then(new ShortCircuitTask<NPath>(CancellationToken, () => {
-                    var p = new NPath("/usr/local/bin/git");
-
-                    if (p.FileExists())
-                    {
-                        return p;
-                    }
-
-                    return null;
-                }));
-
-                var findExecTask = new FindExecTask("git", CancellationToken);
-                findExecTask.Configure(ProcessManager);
-
-                determinePath = determinePath.Then(new ShortCircuitTask<NPath>(CancellationToken, findExecTask));
-            }
-
-            return determinePath;
-        }
-
         public ITask InitializeRepository()
         {
             Logger.Trace("Running Repository Initialize");

src/tests/IntegrationTests/BasePlatformIntegrationTest.cs

@@ -38,10 +38,10 @@ protected void InitializePlatform(NPath repoPath, NPath environmentPath, bool en
 
                 //var gitInstallTask = new PortableGitInstallTask(CancellationToken.None, Environment, gitArchivePath, gitLfsArchivePath, installDetails);
 
-                var installPath = gitInstallTask.Start().Result;
-                Environment.GitExecutablePath = installPath;
-
-                GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
+                //var installPath = gitInstallTask.Start().Result;
+                //Environment.GitExecutablePath = installPath;
+                
+                //GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
             }
         }
     }