Merge pull request #886 from ldennington/dotnet-tool

ldennington · web-flow · commit 89b565ab8a60 · 2022-10-12T20:11:26.000-05:00
release: package gcm as dotnet tool
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -600,3 +600,29 @@ jobs:
               uploadDirectoryToRelease('linux-sign'),
               uploadDirectoryToRelease('linux-build/tar')
             ]);
+
+  create-dotnet-tool:
+    name: Publish dotnet tool
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # Indicate full history so Nerdbank.GitVersioning works.
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 6.0.201
+
+    - uses: dotnet/nbgv@master
+      with:
+        setCommonVars: true
+
+    - name: Package tool
+      run: |
+        src/shared/DotnetTool/pack-tool.sh
+
+    - name: Publish tool
+      run: |
+        dotnet nuget push ./out/nupkg/*.nupkg \
+          --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs
@@ -113,7 +113,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
         {
             var targetUri = new Uri("https://bitbucket.org");
 
-            var helperPath = "/usr/bin/test-helper";
+            var command = "/usr/bin/test-helper";
+            var args = "";
             var expectedUserName = "jsquire";
             var expectedPassword = "password";
             var resultDict = new Dictionary<string, string>
@@ -128,7 +129,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
             context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection
 
             var authMock = new Mock<BitbucketAuthentication>(context) { CallBase = true };
-            authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+            authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
                 .Returns(true);
             authMock.Setup(x => x.InvokeHelperAsync(It.IsAny<string>(), It.IsAny<string>(), null, CancellationToken.None))
                 .ReturnsAsync(resultDict);
@@ -140,7 +141,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
             Assert.Equal(result.Credential.Account, expectedUserName);
             Assert.Equal(result.Credential.Password, expectedPassword);
 
-            authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+            authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
                 Times.Once);
         }
 
@@ -149,7 +150,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
         {
             var targetUri = new Uri("https://bitbucket.org");
 
-            var helperPath = "/usr/bin/test-helper";
+            var command = "/usr/bin/test-helper";
+            var args = "";
             var expectedUserName = "jsquire";
             var expectedPassword = "password";
             var resultDict = new Dictionary<string, string>
@@ -164,7 +166,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
             context.SessionManager.IsDesktopSession = true; // Enable UI helper selection
 
             var authMock = new Mock<BitbucketAuthentication>(context) { CallBase = true };
-            authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+            authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
                 .Returns(true);
             authMock.Setup(x => x.InvokeHelperAsync(It.IsAny<string>(), It.IsAny<string>(), null, CancellationToken.None))
                 .ReturnsAsync(resultDict);
@@ -176,7 +178,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
             Assert.Equal(result.Credential.Account, expectedUserName);
             Assert.Equal(result.Credential.Password, expectedPassword);
 
-            authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+            authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
                 Times.Once);
         }
 
@@ -185,7 +187,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
         {
             var targetUri = new Uri("https://example.com/bitbucket");
 
-            var helperPath = "/usr/bin/test-helper";
+            var command = "/usr/bin/test-helper";
+            var args = "";
             var expectedUserName = "jsquire";
             var expectedPassword = "password";
             var resultDict = new Dictionary<string, string>
@@ -200,7 +203,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
             context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection
 
             var authMock = new Mock<BitbucketAuthentication>(context) { CallBase = true };
-            authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+            authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
                 .Returns(true);
             authMock.Setup(x => x.InvokeHelperAsync(It.IsAny<string>(), It.IsAny<string>(), null, CancellationToken.None))
                 .ReturnsAsync(resultDict);
@@ -212,7 +215,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
             Assert.Equal(result.Credential.Account, expectedUserName);
             Assert.Equal(result.Credential.Password, expectedPassword);
 
-            authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+            authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
                 Times.Once);
         }
     }
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs b/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs
@@ -93,30 +93,31 @@ public async Task<CredentialsPromptResult> GetCredentialsAsync(Uri targetUri, st
 
             // Shell out to the UI helper and show the Bitbucket u/p prompt
             if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&
-                TryFindHelperExecutablePath(out string helperPath))
+                TryFindHelperCommand(out string helperCommand, out string args))
             {
-                var cmdArgs = new StringBuilder("prompt");
+                var promptArgs = new StringBuilder(args);
+                promptArgs.Append("prompt");
                 if (!BitbucketHelper.IsBitbucketOrg(targetUri))
                 {
-                    cmdArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));
+                    promptArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));
                 }
 
                 if (!string.IsNullOrWhiteSpace(userName))
                 {
-                    cmdArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
+                    promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
                 }
 
                 if ((modes & AuthenticationModes.Basic) != 0)
                 {
-                    cmdArgs.Append(" --show-basic");
+                    promptArgs.Append(" --show-basic");
                 }
 
                 if ((modes & AuthenticationModes.OAuth) != 0)
                 {
-                    cmdArgs.Append(" --show-oauth");
+                    promptArgs.Append(" --show-oauth");
                 }
 
-                IDictionary<string, string> output = await InvokeHelperAsync(helperPath, cmdArgs.ToString());
+                IDictionary<string, string> output = await InvokeHelperAsync(helperCommand, promptArgs.ToString());
 
                 if (output.TryGetValue("mode", out string mode) &&
                     StringComparer.OrdinalIgnoreCase.Equals(mode, "oauth"))
@@ -223,13 +224,14 @@ public string GetRefreshTokenServiceName(InputArguments input)
             return client.GetRefreshTokenServiceName(input);
         }
 
-        protected internal virtual bool TryFindHelperExecutablePath(out string path)
+        protected internal virtual bool TryFindHelperCommand(out string command, out string args)
         {
-            return TryFindHelperExecutablePath(
+            return TryFindHelperCommand(
                 BitbucketConstants.EnvironmentVariables.AuthenticationHelper,
                 BitbucketConstants.GitConfiguration.Credential.AuthenticationHelper,
                 BitbucketConstants.DefaultAuthenticationHelper,
-                out path);
+                out command,
+                out args);
         }
 
         private HttpClient _httpClient;
diff --git a/src/shared/Core/Authentication/AuthenticationBase.cs b/src/shared/Core/Authentication/AuthenticationBase.cs
@@ -110,58 +110,111 @@ protected void ThrowIfTerminalPromptsDisabled()
             }
         }
 
-        protected bool TryFindHelperExecutablePath(string envar, string configName, string defaultValue, out string path)
+        protected bool TryFindHelperCommand(string envar, string configName, string defaultValue, out string command, out string args)
         {
-            bool isOverride = false;
+            command = null;
+            args = null;
+
+            //
+            // Search for UI helpers with the following precedence and logic..
+            //
+            // 1. (unset): use the default helper name that's in the source code and go to #3
+            // 2. <absolute>: use the absolute path only and exactly as entered
+            // 3. <relative>: search for..
+            //     a. <appdir>/<relative>(.exe) - run this directly
+            //     b. <appdir>/<relative>(.dll) - use `dotnet exec` to run
+            //     c. Search PATH for <relative>(.exe) - run this directly
+            //        NOTE: do NOT search PATH for <relative>(.dll) as we don't know if this is a dotnet executable..
+            //
+            // We print warning messages for missing helpers specified by the user, not the in-box ones.
+            //
             if (Context.Settings.TryGetPathSetting(
-                envar, Constants.GitConfiguration.Credential.SectionName, configName, out string helperName))
+                   envar, Constants.GitConfiguration.Credential.SectionName, configName, out string helperName))
             {
+                // If the user set the helper override to the empty string then they are signalling not to use a helper
+                if (string.IsNullOrEmpty(helperName))
+                {
+                    Context.Trace.WriteLine("UI helper override specified as the empty string.");
+                    return false;
+                }
+
                 Context.Trace.WriteLine($"UI helper override specified: '{helperName}'.");
-                isOverride = true;
             }
             else
             {
-                // Use the default helper if none was specified.
-                // On Windows append ".exe" for the default helpers only. If a user has specified their own
-                // helper they should append the correct extension.
-                helperName = PlatformUtils.IsWindows() ? $"{defaultValue}.exe" : defaultValue;
+                Context.Trace.WriteLine($"Using default UI helper: '{defaultValue}'.");
+                helperName = defaultValue;
             }
 
-            // If the user set the helper override to the empty string then they are signalling not to use a helper
-            if (string.IsNullOrEmpty(helperName))
+            //
+            // Check for an absolute path.. run this directly without intermediaries or modification
+            //
+            if (Path.IsPathRooted(helperName))
             {
-                path = null;
+                if (Context.FileSystem.FileExists(helperName))
+                {
+                    Context.Trace.WriteLine($"UI helper found at '{helperName}'.");
+                    command = helperName;
+                    return true;
+                }
+
+                Context.Trace.WriteLine($"UI helper was not found at '{helperName}'.");
+                Context.Streams.Error.WriteLine($"warning: could not find configured UI helper '{helperName}'");
                 return false;
             }
 
-            if (Path.IsPathRooted(helperName))
-            {
-                path = helperName;
-            }
-            else
+            //
+            // Search the installation directory for an in-box helper
+            //
+            string appDir = Path.GetDirectoryName(Context.ApplicationPath);
+            string inBoxExePath = Path.Combine(appDir, PlatformUtils.IsWindows() ? $"{helperName}.exe" : helperName);
+            string inBoxDllPath = Path.Combine(appDir, $"{helperName}.dll");
+
+            // Look for in-box native executables
+            if (Context.FileSystem.FileExists(inBoxExePath))
             {
-                string executableDirectory = Path.GetDirectoryName(Context.ApplicationPath);
-                path = Path.Combine(executableDirectory!, helperName);
+                Context.Trace.WriteLine($"Found in-box native UI helper: '{inBoxExePath}'");
+                command = inBoxExePath;
+                return true;
             }
 
-            if (!Context.FileSystem.FileExists(path))
+            // Look for in-box .NET framework-dependent executables
+            if (Context.FileSystem.FileExists(inBoxDllPath))
             {
-                // Only warn for missing helpers specified by the user, not in-box ones
-                if (isOverride)
+                string dotnetName = PlatformUtils.IsWindows() ? "dotnet.exe" : "dotnet";
+                if (!Context.Environment.TryLocateExecutable(dotnetName, out string dotnetPath))
                 {
-                    Context.Trace.WriteLine($"UI helper '{helperName}' was not found at '{path}'.");
-                    Context.Streams.Error.WriteLine($"warning: could not find configured UI helper '{helperName}'");
+                    Context.Trace.WriteLine($"Unable to run UI helper '{inBoxDllPath}' without the .NET CLI.");
+                    Context.Streams.Error.WriteLine($"warning: could not find .NET CLI to run UI helper '{inBoxDllPath}'");
+                    return false;
                 }
 
-                return false;
+                Context.Trace.WriteLine($"Found in-box framework-dependent UI helper: '{inBoxDllPath}'");
+                command = dotnetPath;
+                args = $"exec {QuoteCmdArg(inBoxDllPath)} ";
+                return true;
+            }
+
+            //
+            // Search the PATH for a native executable (do NOT search for out-of-box .NET framework-dependent DLLs)
+            //
+            if (Context.Environment.TryLocateExecutable(helperName, out command))
+            {
+                Context.Trace.WriteLine($"Found UI helper on PATH: '{helperName}'");
+                return true;
             }
 
-            return true;
+            //
+            // No helper found!
+            //
+            Context.Trace.WriteLine($"UI helper '{helperName}' was not found.");
+            Context.Streams.Error.WriteLine($"warning: could not find UI helper '{helperName}'");
+            return false;
         }
 
         public static string QuoteCmdArg(string str)
         {
-            char[] needsQuoteChars = {'"', ' ', '\\', '\n', '\r', '\t'};
+            char[] needsQuoteChars = { '"', ' ', '\\', '\n', '\r', '\t' };
             bool needsQuotes = str.Any(x => needsQuoteChars.Contains(x));
 
             if (!needsQuotes)
diff --git a/src/shared/Core/Authentication/BasicAuthentication.cs b/src/shared/Core/Authentication/BasicAuthentication.cs
@@ -35,9 +35,9 @@ public async Task<ICredential> GetCredentialsAsync(string resource, string userN
             ThrowIfUserInteractionDisabled();
 
             if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&
-                TryFindHelperExecutablePath(out string helperPath))
+                TryFindHelperCommand(out string command, out string args))
             {
-                return await GetCredentialsByUiAsync(helperPath, resource, userName);
+                return await GetCredentialsByUiAsync(command, args, resource, userName);
             }
 
             ThrowIfTerminalPromptsDisabled();
@@ -66,9 +66,10 @@ private ICredential GetCredentialsByTty(string resource, string userName)
             return new GitCredential(userName, password);
         }
 
-        private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, string resource, string userName)
+        private async Task<ICredential> GetCredentialsByUiAsync(string command, string args, string resource, string userName)
         {
-            var promptArgs = new StringBuilder("basic");
+            var promptArgs = new StringBuilder(args);
+            promptArgs.Append("basic");
 
             if (!string.IsNullOrWhiteSpace(resource))
             {
@@ -80,7 +81,7 @@ private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, strin
                 promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
             }
 
-            IDictionary<string, string> resultDict = await InvokeHelperAsync(helperPath, promptArgs.ToString(), null);
+            IDictionary<string, string> resultDict = await InvokeHelperAsync(command, promptArgs.ToString(), null);
 
             if (!resultDict.TryGetValue("username", out userName))
             {
@@ -95,13 +96,14 @@ private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, strin
             return new GitCredential(userName, password);
         }
 
-        private bool TryFindHelperExecutablePath(out string path)
+        private bool TryFindHelperCommand(out string command, out string args)
         {
-            return TryFindHelperExecutablePath(
+            return TryFindHelperCommand(
                 Constants.EnvironmentVariables.GcmUiHelper,
                 Constants.GitConfiguration.Credential.UiHelper,
                 Constants.DefaultUiHelper,
-                out path);
+                out command,
+                out args);
         }
     }
 }
diff --git a/src/shared/DotnetTool/DotnetTool.csproj b/src/shared/DotnetTool/DotnetTool.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <PackAsTool>true</PackAsTool>
+    <NuSpecFile>dotnet-tool.nuspec</NuSpecFile>
+    <!-- Inject correct properties into NuSpec -->
+    <NuspecProperties>
+      version=$(PackageVersion);
+      publishDir=$(PublishDir);
+    </NuspecProperties>
+    <NoBuild>true</NoBuild>
+    <OutputPath>../../../out/nupkg</OutputPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/shared/DotnetTool/DotnetToolSettings.xml b/src/shared/DotnetTool/DotnetToolSettings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DotNetCliTool Version="1">
+  <Commands>
+    <Command Name="git-credential-manager-core" EntryPoint="git-credential-manager-core.dll" Runner="dotnet" Version="6.0" />
+  </Commands>
+</DotNetCliTool>
diff --git a/src/shared/DotnetTool/dotnet-tool.nuspec b/src/shared/DotnetTool/dotnet-tool.nuspec
@@ -0,0 +1,15 @@
+
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+    <metadata>
+        <id>GitCredentialManager.Cli</id>
+        <version>$version$</version>
+        <description>Secure, cross-platform Git credential storage with authentication to Azure Repos, GitHub, and other popular Git hosting services.</description>
+        <authors>Git Credential Manager</authors>
+        <packageTypes>
+            <packageType name="DotnetTool" />
+        </packageTypes>
+  </metadata>
+  <files>
+    <file src="$publishdir$" target="tools/net6.0/any" />
+  </files>
+</package>
diff --git a/src/shared/DotnetTool/pack-tool.sh b/src/shared/DotnetTool/pack-tool.sh
diff --git a/src/shared/GitHub/GitHubAuthentication.cs b/src/shared/GitHub/GitHubAuthentication.cs
diff --git a/src/shared/GitLab/GitLabAuthentication.cs b/src/shared/GitLab/GitLabAuthentication.cs

Original file line number	Diff line number	Diff line change
`@@ -93,30 +93,31 @@ public async Task<CredentialsPromptResult> GetCredentialsAsync(Uri targetUri, st`
`93`	`93`
`94`	`94`	`// Shell out to the UI helper and show the Bitbucket u/p prompt`
`95`	`95`	`if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&`
`96`		`- TryFindHelperExecutablePath(out string helperPath))`
	`96`	`+ TryFindHelperCommand(out string helperCommand, out string args))`
`97`	`97`	`{`
`98`		`- var cmdArgs = new StringBuilder("prompt");`
	`98`	`+ var promptArgs = new StringBuilder(args);`
	`99`	`+ promptArgs.Append("prompt");`
`99`	`100`	`if (!BitbucketHelper.IsBitbucketOrg(targetUri))`
`100`	`101`	`{`
`101`		`- cmdArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));`
	`102`	`+ promptArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`if (!string.IsNullOrWhiteSpace(userName))`
`105`	`106`	`{`
`106`		`- cmdArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));`
	`107`	`+ promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`if ((modes & AuthenticationModes.Basic) != 0)`
`110`	`111`	`{`
`111`		`- cmdArgs.Append(" --show-basic");`
	`112`	`+ promptArgs.Append(" --show-basic");`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`if ((modes & AuthenticationModes.OAuth) != 0)`
`115`	`116`	`{`
`116`		`- cmdArgs.Append(" --show-oauth");`
	`117`	`+ promptArgs.Append(" --show-oauth");`
`117`	`118`	`}`
`118`	`119`
`119`		`- IDictionary<string, string> output = await InvokeHelperAsync(helperPath, cmdArgs.ToString());`
	`120`	`+ IDictionary<string, string> output = await InvokeHelperAsync(helperCommand, promptArgs.ToString());`
`120`	`121`
`121`	`122`	`if (output.TryGetValue("mode", out string mode) &&`
`122`	`123`	`StringComparer.OrdinalIgnoreCase.Equals(mode, "oauth"))`
`@@ -223,13 +224,14 @@ public string GetRefreshTokenServiceName(InputArguments input)`
`223`	`224`	`return client.GetRefreshTokenServiceName(input);`
`224`	`225`	`}`
`225`	`226`
`226`		`- protected internal virtual bool TryFindHelperExecutablePath(out string path)`
	`227`	`+ protected internal virtual bool TryFindHelperCommand(out string command, out string args)`
`227`	`228`	`{`
`228`		`- return TryFindHelperExecutablePath(`
	`229`	`+ return TryFindHelperCommand(`
`229`	`230`	`BitbucketConstants.EnvironmentVariables.AuthenticationHelper,`
`230`	`231`	`BitbucketConstants.GitConfiguration.Credential.AuthenticationHelper,`
`231`	`232`	`BitbucketConstants.DefaultAuthenticationHelper,`
`232`		`- out path);`
	`233`	`+ out command,`
	`234`	`+ out args);`
`233`	`235`	`}`
`234`	`236`
`235`	`237`	`private HttpClient _httpClient;`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ public async Task<ICredential> GetCredentialsAsync(string resource, string userN`
`35`	`35`	`ThrowIfUserInteractionDisabled();`
`36`	`36`
`37`	`37`	`if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&`
`38`		`- TryFindHelperExecutablePath(out string helperPath))`
	`38`	`+ TryFindHelperCommand(out string command, out string args))`
`39`	`39`	`{`
`40`		`- return await GetCredentialsByUiAsync(helperPath, resource, userName);`
	`40`	`+ return await GetCredentialsByUiAsync(command, args, resource, userName);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`ThrowIfTerminalPromptsDisabled();`
`@@ -66,9 +66,10 @@ private ICredential GetCredentialsByTty(string resource, string userName)`
`66`	`66`	`return new GitCredential(userName, password);`
`67`	`67`	`}`
`68`	`68`
`69`		`- private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, string resource, string userName)`
	`69`	`+ private async Task<ICredential> GetCredentialsByUiAsync(string command, string args, string resource, string userName)`
`70`	`70`	`{`
`71`		`- var promptArgs = new StringBuilder("basic");`
	`71`	`+ var promptArgs = new StringBuilder(args);`
	`72`	`+ promptArgs.Append("basic");`
`72`	`73`
`73`	`74`	`if (!string.IsNullOrWhiteSpace(resource))`
`74`	`75`	`{`
`@@ -80,7 +81,7 @@ private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, strin`
`80`	`81`	`promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));`
`81`	`82`	`}`
`82`	`83`
`83`		`- IDictionary<string, string> resultDict = await InvokeHelperAsync(helperPath, promptArgs.ToString(), null);`
	`84`	`+ IDictionary<string, string> resultDict = await InvokeHelperAsync(command, promptArgs.ToString(), null);`
`84`	`85`
`85`	`86`	`if (!resultDict.TryGetValue("username", out userName))`
`86`	`87`	`{`
`@@ -95,13 +96,14 @@ private async Task<ICredential> GetCredentialsByUiAsync(string helperPath, strin`
`95`	`96`	`return new GitCredential(userName, password);`
`96`	`97`	`}`
`97`	`98`
`98`		`- private bool TryFindHelperExecutablePath(out string path)`
	`99`	`+ private bool TryFindHelperCommand(out string command, out string args)`
`99`	`100`	`{`
`100`		`- return TryFindHelperExecutablePath(`
	`101`	`+ return TryFindHelperCommand(`
`101`	`102`	`Constants.EnvironmentVariables.GcmUiHelper,`
`102`	`103`	`Constants.GitConfiguration.Credential.UiHelper,`
`103`	`104`	`Constants.DefaultUiHelper,`
`104`		`- out path);`
	`105`	`+ out command,`
	`106`	`+ out args);`
`105`	`107`	`}`
`106`	`108`	`}`
`107`	`109`	`}`