+
Git Credential Manager - Authentication Failed
diff --git a/src/shared/GitHub/UI/Commands/CredentialsCommand.cs b/src/shared/GitHub/UI/Commands/CredentialsCommand.cs
index f14b3cb3ec..45c6cfd7fe 100644
--- a/src/shared/GitHub/UI/Commands/CredentialsCommand.cs
+++ b/src/shared/GitHub/UI/Commands/CredentialsCommand.cs
@@ -38,7 +38,7 @@ protected CredentialsCommand(ICommandContext context)
this.SetHandler(ExecuteAsync, url, userName, basic, browser, device, pat, all);
}
- private async Task ExecuteAsync(string userName, string enterpriseUrl,
+ private async Task ExecuteAsync(string enterpriseUrl, string userName,
bool basic, bool browser, bool device, bool pat, bool all)
{
var viewModel = new CredentialsViewModel(Context.SessionManager, Context.ProcessManager)
diff --git a/src/shared/GitLab/UI/Commands/CredentialsCommand.cs b/src/shared/GitLab/UI/Commands/CredentialsCommand.cs
index 1c1995a8db..02a0f78180 100644
--- a/src/shared/GitLab/UI/Commands/CredentialsCommand.cs
+++ b/src/shared/GitLab/UI/Commands/CredentialsCommand.cs
@@ -35,7 +35,7 @@ protected CredentialsCommand(ICommandContext context)
this.SetHandler(ExecuteAsync, url, userName, basic, browser, pat, all);
}
- private async Task ExecuteAsync(string userName, string url, bool basic, bool browser, bool pat, bool all)
+ private async Task ExecuteAsync(string url, string userName, bool basic, bool browser, bool pat, bool all)
{
var viewModel = new CredentialsViewModel(Context.SessionManager)
{
diff --git a/src/shared/TestInfrastructure/Objects/TestFileSystem.cs b/src/shared/TestInfrastructure/Objects/TestFileSystem.cs
index 11dff8f1f2..57a75f2b83 100644
--- a/src/shared/TestInfrastructure/Objects/TestFileSystem.cs
+++ b/src/shared/TestInfrastructure/Objects/TestFileSystem.cs
@@ -11,6 +11,7 @@ public class TestFileSystem : IFileSystem
public string UserHomePath { get; set; }
public string UserDataDirectoryPath { get; set; }
public IDictionary Files { get; set; } = new Dictionary();
+ public ISet ExecutableFiles { get; } = new HashSet();
public ISet Directories { get; set; } = new HashSet();
public string CurrentDirectory { get; set; } = Path.GetTempPath();
public bool IsCaseSensitive { get; set; } = false;
@@ -36,6 +37,18 @@ bool IFileSystem.FileExists(string path)
return Files.ContainsKey(path);
}
+ bool IFileSystem.FileIsExecutable(string path)
+ {
+ if (!Files.ContainsKey(path))
+ throw new FileNotFoundException("File not found", path);
+
+ // On Windows, all files are considered executable.
+ if (!PlatformUtils.IsPosix())
+ return true;
+
+ return ExecutableFiles.Contains(path);
+ }
+
bool IFileSystem.DirectoryExists(string path)
{
return Directories.Contains(TrimSlash(path));
@@ -130,6 +143,20 @@ string[] IFileSystem.ReadAllLines(string path)
#endregion
+ ///
+ /// Mark a test file as executable. File must exist in already.
+ ///
+ public void SetExecutable(string path, bool isExecutable = true)
+ {
+ if (!Files.ContainsKey(path))
+ throw new FileNotFoundException("File not found", path);
+
+ if (isExecutable)
+ ExecutableFiles.Add(path);
+ else
+ ExecutableFiles.Remove(path);
+ }
+
///
/// Trim trailing slashes from a path.
///
diff --git a/src/windows/Installer.Windows/Installer.Windows.csproj b/src/windows/Installer.Windows/Installer.Windows.csproj
index ace93b63ed..b625be44df 100644
--- a/src/windows/Installer.Windows/Installer.Windows.csproj
+++ b/src/windows/Installer.Windows/Installer.Windows.csproj
@@ -43,7 +43,7 @@
diff --git a/src/windows/Installer.Windows/layout.ps1 b/src/windows/Installer.Windows/layout.ps1
index 3b1624896c..53646764a4 100644
--- a/src/windows/Installer.Windows/layout.ps1
+++ b/src/windows/Installer.Windows/layout.ps1
@@ -3,7 +3,10 @@ param ([Parameter(Mandatory)] $Configuration, [Parameter(Mandatory)] $Output, $R
# Trim trailing slashes from output paths
$Output = $Output.TrimEnd('\','/')
-$SymbolOutput = $SymbolOutput.TrimEnd('\','/')
+
+if ($SymbolOutput) {
+ $SymbolOutput = $SymbolOutput.TrimEnd('\','/')
+}
Write-Output "Output: $Output"