Merge branch 'master' into fixes/create-branch-NRE

Author: StanleyGoldman

build.sh

@@ -34,6 +34,8 @@ fi
 
 xbuild GitHub.Unity.sln /property:Configuration=$Configuration /target:$Target
 
+cp -r unity/PackageProject/Assets/Editor/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Editor || true
+
 rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
 rm -f unity/PackageProject/Assets/Editor/GitHub/deleteme*
 rm -f unity/PackageProject/Assets/Editor/GitHub/*.xml

src/GitHub.Api/ApplicationManagerBase.cs

@@ -119,9 +119,28 @@ private async Task RunInternal()
             logger.Trace("Environment.GitExecutablePath \"{0}\" Exists:{1}", gitSetup.GitExecutablePath, gitSetup.GitExecutablePath.FileExists());
 
             await RestartRepository();
-        }
+
+            if (Environment.IsWindows)
+            {
+                string credentialHelper = null;
+                var gitConfigGetTask = new GitConfigGetTask(Environment, ProcessManager,
+                    new TaskResultDispatcher<string>(s => {
+                        credentialHelper = s;
+                    }), "credential.helper", GitConfigSource.Global);
 
 
+                await gitConfigGetTask.RunAsync(CancellationToken.None);
+
+                if (string.IsNullOrEmpty(credentialHelper))
+                {
+                    var gitConfigSetTask = new GitConfigSetTask(Environment, ProcessManager,
+                        new TaskResultDispatcher<string>(s => { }), "credential.helper", "wincred",
+                        GitConfigSource.Global);
+
+                    await gitConfigSetTask.RunAsync(CancellationToken.None);
+                }
+            }
+        }
 
         private async Task<string> LookForGitInstallationPath()
         {

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -18,6 +18,7 @@ class EntryPoint : ScriptableObject
         // this may run on the loader thread if it's an appdomain restart
         static EntryPoint()
         {
+            Logging.LoggerFactory = s => new UnityLogAdapter(s);
             if (System.Environment.GetEnvironmentVariable("GITHUB_UNITY_DISABLE") == "1")
             {
                 Debug.Log("GitHub for Unity " + ApplicationInfo.Version + " is disabled");
@@ -29,7 +30,6 @@ static EntryPoint()
                 return;
             }
             cctorCalled = true;
-            Logging.LoggerFactory = s => new UnityLogAdapter(s);
             Logging.Info("Initializing GitHub for Unity version " + ApplicationInfo.Version);
 
             ServicePointManager.ServerCertificateValidationCallback = ServerCertificateValidationCallback;